调整

microserviceUserH5/static/js/vender/vue/api.js

@@ -61,6 +61,26 @@ function getCheck(token) {
   
   })
 }
+//获取标签列表
+function getTagList() {
+  return service({
+    url: `/api/public/v4/actFissionTag/indexTags`,
+    method: 'get'
+  
+  })
+}
+//根据标签获取裂变活动攻略
+function getQueryByTag(token, data) {
+  return service({
+    url: `/api/public/v4/actFissionStrategy/queryByTagId`,
+    method: 'post',
+    headers:{
+      'Authorization': token
+    },
+    data
+  })
+}
+
 //获取攻略列表
 function getStrategy(id) {
   return service({

microserviceUserH5/vcloud/actFission.html

@@ -15,24 +15,25 @@
 
 	<style>
 		.container {
-			background: #0671F1;
+			background-color: #1F1A3A;
 		}
 
 		.top-banner {
 			background: url("../static/offImg/bg.png") no-repeat;
 			width: 100%;
-			height: 11.6rem;
+			height: 13.1rem;
 			background-size: 100% 100%;
 			position: relative;
 
 		}
 
 		.top-banner .hongbao {
-			width: 1.46rem;
-			height: 1.42rem;
+			width: 5.24rem;
+			height: 1.55rem;
 			position: absolute;
-			bottom: 1.4rem;
-			left: 0.7rem;
+			top: 1rem;
+			left: 50%;
+			transform: translateX(-50%);
 		}
 
 		.bottom-btn {
@@ -61,19 +62,30 @@
 		.list {
 			width: 100%;
 			height: 14.42rem;
-			background: #0671F1;
+			background-color: #1F1A3A;
 			padding: 0 0.3rem;
 
 		}
 
-		.nav-box,
+		.nav-box {
+			margin-top: 0.44rem;
+			width: 100%;
+			height: 5.7rem;
+			background: url("../static/offImg/share.png") no-repeat;
+			background-size: 100% 100%;
+			border-radius: 0.2rem;
+			position: relative;
+			padding-top: 0.01rem;
+
+		}
+
 		.rule-box {
 			margin-top: 0.44rem;
 			width: 100%;
 			height: 5.7rem;
-			background: #C3E5FF;
+			background: url("../static/offImg/rule.png") no-repeat;
+			background-size: 100% 100%;
 			border-radius: 0.2rem;
-			border: 0.02rem solid #F5FAFF;
 			position: relative;
 
 		}
@@ -86,9 +98,10 @@
 			top: -0.17rem;
 			display: flex;
 			justify-content: center;
+			
 		}
 
-		.rule-box .title-box .img-box,
+		/* .rule-box .title-box .img-box,
 		.nav-box .title-box .img-box {
 			background: url("../static/offImg/title-bg.png") no-repeat;
 			background-size: 100% 100%;
@@ -99,14 +112,13 @@
 			font-size: 0.32rem;
 			font-family: PingFangSC-Medium, PingFang SC;
 			color: #FFFFFF;
-
-		}
+		} */
 
 		.outer-box {
-			margin-top: 0.48rem;
-			padding: 0.3rem 0.4rem;
+			margin-top: 1rem;
+			padding: 0.1rem 0.4rem;
 			overflow-y: scroll;
-			height: 5.1rem;
+			height: 4.4rem;
 		}
 
 		.list-nav {
@@ -130,7 +142,7 @@
 			font-size: 0.24rem;
 			margin-bottom: 0.08rem;
 			font-family: PingFangSC-Regular, PingFang SC;
-			color: #272624;
+			color: #ffffff;
 			width: 2.6rem;
 			display: block;
 			overflow: hidden;
@@ -143,7 +155,7 @@
 		.list-nav .user .text p+p {
 			font-size: 0.24rem;
 			font-family: PingFangSC-Regular, PingFang SC;
-			color: #999999;
+			color: #CCCCCC;
 		}
 
 		.right-nav {
@@ -155,16 +167,16 @@
 			font-size: 0.24rem;
 			font-family: PingFangSC-Medium, PingFang SC;
 			font-weight: 500;
-			color: #FF8E00;
+			color: #F2AE45;
 			margin-right: 0.3rem;
 		}
 
 		.right-nav .btn {
 			width: 1.14rem;
-			height: 0.52rem;
-			line-height: 0.52rem;
-			background: #3B7FFF;
-			border-radius: 0.08rem;
+			height: 0.44rem;
+			line-height: 0.44rem;
+			background: #F2AE45;
+			border-radius: 0.22rem;
 			text-align: center;
 			font-size: 0.24rem;
 			font-family: PingFangSC-Regular, PingFang SC;
@@ -192,8 +204,9 @@
 		}
 
 		.isdisabled {
-			background: #E3E7EE !important;
-			color: #AAADB3 !important;
+			background: #F2AE45 !important;
+			color: #ffffff !important;
+			opacity: 0.3;
 		}
 
 		.notice-swipe {
@@ -203,10 +216,18 @@
 
 		.top-notice {
 			width: 100%;
-			padding: 2rem 0.3rem 0 0.3rem;
+			padding: 3rem 0.3rem 0 0.3rem;
 			height: 0.82rem;
 		}
 
+		.select-content{
+			position: absolute;
+			bottom: 0.2rem;
+			color: #FFFFFF;
+			left: 50%;
+			transform: translateX(-50%);
+		}
+
 		.van-notice-bar {
 			width: 100%;
 			height: 0.82rem;
@@ -253,13 +274,36 @@
 			font-family: PingFangSC-Regular, PingFang SC;
 			color: #666666;
 		}
+		.select-list{
+			display: flex;
+			justify-content: center;
+		}
+		.select-title{
+			margin-bottom: 0.2rem;
+			text-align: center;
+		}
+		.icon{
+			width: 1.66rem;
+			height: 1.66rem;
+			margin: 0 0.1rem;
+		}
+		.join-wrap{
+			background-color: #1F1A3A;
+			display: flex;
+			justify-content: center;
+		}
+		.join{
+			width: 6.8rem;
+			height: 4.1rem;
+		}
 	</style>
 </head>
 
 <body>
 	<div id="app" v-cloak class="app container">
 		<div class="top-banner">
-			<img src="../static//offImg/hongbao.png" class="hongbao" alt="">
+			<!-- <img src="../static/offImg/hongbao.png" class="hongbao" alt=""> -->
+			<img src="../static/offImg/title.png" class="hongbao" alt="">
 			<div class="top-notice">
 				<van-notice-bar :scrollable="false">
 					<van-swipe vertical class="notice-swipe" :autoplay="2000" :show-indicators="false">
@@ -269,21 +313,30 @@
 							<p>{{item.sharerSurfaceName}}</p>
 							<p>已领取分享奖励</p>
 						</van-swipe-item>
-
 					</van-swipe>
 				</van-notice-bar>
 			</div>
-			<div class="bottom-btn">
-				<div class="time-box" @click='goReward()' :class="{'no-start':actStatus==0}"></div>
-
+			<div class="select-content">
+				<div class="select-title">选择你要分享的内容</div>
+				<div class="select-list">
+					<div v-for="(item,index) in tagList" :key="index" @click="toDetail(item)">
+						<img :src="fileCenterApi + `/file-center/fileOperate/getImage?id=${item.cover}`" class="icon" alt="">
+					</div>
+				</div>
 			</div>
+			<!-- <div class="bottom-btn">
+				<div class="time-box" @click='goReward()' :class="{'no-start':actStatus==0}"></div>
+			</div> -->
+		</div>
+		<div class="join-wrap">
+			<img src="../static/offImg/join.png" class="join" alt="">
 		</div>
 		<div class="list">
 			<div class="nav-box">
 				<!-- <img src="../static/offImg/title-bg.png" alt=""></img> -->
-				<div class="title-box">
+				<!-- <div class="title-box">
 					<div class="img-box">活动奖励</div>
-				</div>
+				</div> -->
 				<div class="outer-box" v-if='rewardList&&rewardList.length>0'>
 					<van-list v-model="loading" :finished-text="finishedText" :finished="finished"
 						:immediate-check=false @load="onLoad">
@@ -314,16 +367,16 @@
 
 			<div class="rule-box">
 				<!-- <img src="../static/offImg/title-bg.png" alt=""></img> -->
-				<div class="title-box">
+				<!-- <div class="title-box">
 					<div class="img-box">活动规则</div>
-				</div>
-				<div class="rule">
+				</div> -->
+				<!-- <div class="rule">
 					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ，好友注册成功后，分享者即可获得3天{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}套餐时长，被分享者可获得{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}7天卡激活码。</p>
 					<p>2.用户通过该分享链接获取的激活码，只针对新注册用户有效领取并兑换一次。</p>
 					<p>3.分享者每日最多分享给10位好友领取激活码并获得注册奖励，且奖励为当日有效，奖励过期不补发。</p>
 					<p>4.分享者若没有云机，需要先创建{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云机才可继续领取奖励。</p>
 					<p>5.新用户领取的激活码需在有效期内使用，若超过有效期则激活码失效。</p>
-				</div>
+				</div> -->
 			</div>
 
 		</div>
@@ -342,8 +395,6 @@
 			el: '#app',
 			data: {
 				isshow: false,
-				token: GetRequest().token ? GetRequest().token :
-					'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyYW5kb20iOiI3MDY1NSIsImNsaWVudCI6IjUiLCJleHAiOjE2NDExOTA0MzMsInVzZXJuYW1lX2FwcGxldCI6Im5naEN0MTYzMTYwNDY4OSJ9.cXj7Ks5XYCnGFANZ0uHAkDn8MJtWrMm4I3qqvikewGg',
 				rewardList: [],
 				queryParams: {
 					pageNum: 1,
@@ -362,16 +413,39 @@
 				phoneType: '',
 				marqueeList: [],
 				timer: null,
+				tagList: []
 			},
 			created() {
 				this.getAwardPage(); //获取奖励列表
+				
 			},
 			mounted() {
 				this.getActDetailList(); //获取活动上下架
 				this.getMarquee(); //跑马灯
 				this.goReward('look');
+				this.getTagList();//获取标签列表
 			},
 			methods: {
+				toDetail(item){
+					location.href = `./actFissionList.html?id=${item.id}&title=${encodeURI(item.tagName)}&token=${GetRequest().token}`;
+				},
+				getTagList(){
+					this.$toast.loading({
+						duration: 0,
+						message: '加载中...',
+						forbidClick: true,
+						loadingType: 'spinner',
+					});
+					// 获取标签列表
+					getTagList(GetRequest().token).then(res => {
+						this.$toast.clear();
+						if (res.status === 0) {
+							this.tagList = res.data;
+						} else {
+							this.$toast(res.msg);
+						}
+					})
+				},
 				goReward(type) {
 
 					this.$toast.loading({

microserviceUserH5/vcloud/actFissionList.html

@@ -0,0 +1,156 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+	<meta name="description" content="活动">
+	<title>免费领机</title>
+	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
+	<link rel="stylesheet" href="../static/css/index.css?v=1.0.0.6">
+	<link rel="stylesheet" href="../static/css/vant.css" />
+	<script src="../static/js/vender/vue/vue.min.js"></script>
+	<script src="../static/js/vender/vue/vant.min.js"></script>
+	<script src="../static/js/vender/config.js"></script>
+
+	<style>
+		.header{
+			display: flex;
+			height: 0.88rem;
+			align-items: center;
+			box-shadow: 0 0.01rem 0.14rem 0 rgba(184, 184, 184, 0.47);
+		}
+		.page-title{
+			flex: 1;
+			text-align: center;
+			font-size: 0.36rem;
+			color: #333333;
+		}
+		.back{
+			width: 0.2rem;
+			height: 0.34rem;
+			margin-left: 0.2rem;
+		}
+		.item{
+			display: flex;
+			align-items: center;
+			margin: 0.32rem 0 0 0.58rem;
+		}
+		.right{
+			flex: 1;
+			margin-left: 0.43rem;
+		}
+		.icon{
+			width: 1.8rem;
+			height: 1.36rem;
+		}
+		.titles{
+			font-size: 0.3rem;
+			color: #333333;
+		}
+		.contents{
+			margin-top: 0.2rem;
+			font-size: 0.24rem;
+			color: #999999;
+			text-overflow: -o-ellipsis-lastline;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			line-clamp: 2;
+			-webkit-box-orient: vertical;
+		}
+	</style>
+</head>
+
+<body>
+	<div id="app" v-cloak class="app container">
+		<div class="header">
+			<img src="../static/offImg/back.png" class="back" @click="back">
+			<div class="page-title">{{title}}</div>
+		</div>
+		<div v-for="(item,index) in tagList" :key="index" class="item" @click="toDetail(item)">
+			<img :src="fileCenterApi + `/file-center/fileOperate/getImage?id=${item.fileId}`" class="icon" alt="">
+			<div class="right">
+				<div class="titles">{{item.strategyTitle}}</div>
+				<div class="contents">{{getContent(index,item.content)}}</div>
+			</div>
+		</div>
+	</div>
+	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
+	<script src="../static/js/vender/vue/axios.min.js"></script>
+	<script src="../static/js/vender/vue/config.js"></script>
+	<script src="../static/js/vender/vue/api.js"></script>
+
+	<script type="text/javascript">
+		var u = navigator.userAgent,
+			app = navigator.appVersion;
+		var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //g
+		var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+		new Vue({
+			el: '#app',
+			data: {
+				title: '',
+				tagList: []
+			},
+			mounted() {
+				this.title = decodeURIComponent(GetRequest().title);
+				setTimeout(() => {
+					this.getQueryByTag();//获取标签列表
+				})
+			},
+			methods: {
+				getQueryByTag(){
+					this.$toast.loading({
+						duration: 0,
+						message: '加载中...',
+						forbidClick: true,
+						loadingType: 'spinner',
+					});
+					// 获取标签列表
+					getQueryByTag(GetRequest().token, {
+						tagId: +GetRequest().id,
+						pageNum: 1,
+						pageSize: 10
+					}).then(res => {
+						this.$toast.clear();
+						if (res.status === 0) {
+							this.tagList = res.data.actFissionStrategyList;
+						} else {
+							this.$toast(res.msg);
+						}
+					})
+				},
+				getContent(index, content){
+					this.$nextTick(() => {
+						let dom = document.getElementsByClassName('contents')[index];
+						console.log(dom)
+						if(dom){
+							dom.innerHTML = content;
+						}
+					})
+				},
+				back(){
+					location.href = `./actFission.html?token=${GetRequest().token}`;
+				},
+				toDetail(item){
+					location.href = `./actFissionShare.html?strategyId=${item.id}&type=1`;
+				},
+				stopManyClick(fn) { //防抖
+					if (this.flag) {
+						fn();
+					}
+					this.flag = false;
+					if (this.timer) {
+						clearTimeout(this.timer);
+					}
+					this.timer = setTimeout(() => {
+						this.flag = true
+					}, 1500);
+				},
+			}
+		})
+	</script>
+</body>
+
+</html>

microserviceUserH5/vcloud/actFissionShare.html

@@ -399,6 +399,13 @@
             width: 100vw;
         }
 
+        .share_btn{
+            width: 2.4rem;
+            height: 0.88rem;
+            display: flex;
+            justify-content: center;
+        }
+
         @media (max-width: 480px) and (min-width: 241px) {
             #toast-container>div {
                 min-width: 80px !important;
@@ -415,13 +422,15 @@
 
         <div v-if='isshow&&topic!=null' style="margin: 0 auto;">
             <div class="footer">
-                <div class="download-btn">
+                <div class="download-btn" v-if="type == 1">
                     <div class="left-nav">
                         <p>激活码：</p>
                         <p>AS4*********SD3</p>
                     </div>
-                    <!-- @click='createCopy()' -->
-                    <div class="button-download " @click='copyHandle()'>点击复制并下载</div>
+                    <div class="button-download" @click='copyHandle()'>点击复制并下载</div>
+                </div>
+                <div v-else>
+                    <img @click="share" src="../static/offImg/share_btn.png" class="share_btn" alt="" />
                 </div>
             </div>
             <div class="top-banner">
@@ -439,7 +448,6 @@
             </div>
             <div class="top-content">
                 <div v-html="topic" class="topic-info"></div>
-
             </div>
 
         </div>
@@ -449,26 +457,40 @@
                 <p>{{msg}}，敬请期待</p>
             </div>
         </div>
-    </div>
-    <div class="mask">
-        <div class="dialog">
-            <div class="imgs-block">
-                <img class="imgs" src="../static/img/icon-copy.png" />
+        <div class="mask">
+            <div class="dialog">
+                <div class="imgs-block">
+                    <img class="imgs" src="../static/img/icon-copy.png" />
                 <div class="imgs-text">复制成功</div>
-                <img class="imgs" src="../static/img/icon-copy.png" />
-            </div>
-            <div class="copy-tip">温馨提示：激活码使用教程</div>
-            <div class="point1">1、在双子星APP的工具栏，点击 <span class="my">[我的]</span></div>
-            <img class="point-img" src="../static/img/point1.png" />
-            <div class="point1 point2">2、找到 我的工具 -  <span class="my">[激活码] </span>，点击激活码
-                即可兑换使用激活码啦。</div>
-            <img class="point-img" src="../static/img/point2.png" />
-            <div class="get-success-block">
-                <div class="get-success">下载APP</div>
+                    <img class="imgs" src="../static/img/icon-copy.png" />
+                </div>
+                <div class="copy-tip">温馨提示：激活码使用教程</div>
+                <div class="point1">1、在双子星APP的工具栏，点击 <span class="my">[我的]</span></div>
+                <img class="point-img" src="../static/img/point1.png" />
+                <div class="point1 point2">2、找到 我的工具 -  <span class="my">[激活码] </span>，点击激活码
+                    即可兑换使用激活码啦。</div>
+                <img class="point-img" src="../static/img/point2.png" />
+                <div class="get-success-block" v-if="!isWechat">
+                    <div class="get-success">下载APP</div>
+                </div>
+                <div v-else>
+                    <wx-open-launch-weapp
+                    id="launch-btn"
+                    username="gh_f414d72f418a"
+                    path="pages/home/home"
+                    >
+                    <script type="text/wxtag-template">
+                        <div class="get-success-block">
+                            <div class="get-success">打开小程序并复制激活码</div>
+                        </div>
+                    </script>
+                    </wx-open-launch-weapp>
+                </div>
+                <img class="close" src="img/close.png" />
             </div>
-            <img class="close" src="img/close.png" />
         </div>
     </div>
+    
 	<script src="../static/js/vender/verify.js"></script>
     <script src="../static/js/vender/vue/vue.min.js"></script>
     <script src="../static/js/vender/vue/vue-clipboard.min.js"></script>
@@ -482,6 +504,7 @@
 		toastr.options.positionClass = 'toast-center-center';
 		toastr.options.timeOut = '1500';
 	</script>
+	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
     <script type="text/javascript">
         // var meta_description = document.getElementsByTagName('meta')['description']
         // document.title = '更新标题'
@@ -507,7 +530,17 @@
             if(isIOS){
                 copyUrl();
             }else{
-                download();
+                if (u.match(/MicroMessenger/i) == "micromessenger") {
+                    var btn = document.getElementById('launch-btn');
+                    btn.addEventListener('launch', function (e) {
+                        console.log('success');
+                    });
+                    btn.addEventListener('error', function (e) {
+                        console.log('fail', e.detail);
+                    });
+                }else{
+                    download();
+                }
             }
 		});
         function download() {
@@ -575,7 +608,10 @@
                 uuid: '',
                 flag: true,
                 timer: null,
-                phoneType: ''
+                isWechat: true,
+                phoneType: '',
+                type: GetRequest().type,
+                dataObj: {}
             },
             created() {
                 // window.location.href = 'investigate.html'
@@ -736,6 +772,7 @@
                             if (res.data) {
                                 this.isshow = true;
                                 this.topic = res.data.content;
+                                this.dataObj = res.data;
                                 // this.tagId = res.data.tagId;
                                 console.log(this.topic)
                             } else {
@@ -785,6 +822,10 @@
 				        $('.imgs-block').eq(0).css('display', 'none');
 			            $('.get-success').eq(0).text('下载APP并复制激活码');
                     }
+                    if(u.match(/MicroMessenger/i)=="micromessenger"){
+			            // $('.get-success').eq(0).text('打开小程序并复制激活码');
+                        this.isWechat = true;
+                    }
                     $('.dialog').animate({top: '1.8rem'},"fast");
                     $('.mask').show();
                     document.documentElement.style.overflow='hidden';
@@ -825,6 +866,22 @@
                         textbox.focus();
                     }
                 },
+                share(){
+                    if (isAndroid) {
+                        window.native.share(this.dataObj.strategyTitle, this.dataObj.contentText, 
+                        `${baseUrl}/h5/microserviceUserH5/vcloud/actFissionShare.html?strategyId=${this.dataObj.id}&type=2`, `${baseUrl}/file-center/fileOperate/getImage?id=${this.dataObj.fileId}`);
+                    } else if (isiOS) {
+                        window.webkit.messageHandlers.share.postMessage({
+                            title: this.dataObj.strategyTitle,
+                            content: this.dataObj.contentText,
+                            gotoUrl: `${baseUrl}/h5/microserviceUserH5/vcloud/actFissionShare.html?strategyId=${this.dataObj.id}&type=2`,
+                            shareImg: `${baseUrl}/file-center/fileOperate/getImage?id=${this.dataObj.fileId}`
+                        });
+                    } else {
+                        code = window.Location.href;
+                        copyUrl();
+                    }
+                },
                 stopManyClick(fn) { //防抖
                     if (this.flag) {
                         fn();