Merge remote-tracking branch 'origin/dev-4.9.3' into uat

microserviceUserH5/static/css/doubleChristmasActivity.css

@@ -554,7 +554,7 @@ input:focus{
   margin: 0 0.2rem 0 0.5rem;
 }
 .time-content-day{
-  width: 1rem;
+  width: 1.2rem;
   text-align: right;
 }
 .rule-container{

microserviceUserH5/static/js/vender/vue/config.js

@@ -11,7 +11,8 @@ var base_url = baseUrl; //测试服务器
 //var base_url = 'http://**********'; //正式服务器
 
 
-const fileCenterApi = 'https://wjzx.androidscloud.com:9091'
+//const fileCenterApi = 'https://wjzx.androidscloud.com:9091'
+const fileCenterApi = 'https://per.cs.se.androidscloud.com/'
 // https://per.cs.se.androidscloud.com/
 // https://per.cs.se.androidscloud.com/
 axios.defaults.headers['Content-Type'] = 'application/json';

microserviceUserH5/vcloud/actFission.html

@@ -7,7 +7,7 @@
 	<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.5">
+	<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>
@@ -342,7 +342,7 @@
 			data: {
 				isshow: false,
 				token: GetRequest().token ? GetRequest().token :
-					'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyYW5kb20iOiI3ODM0NyIsImNsaWVudCI6IjUiLCJleHAiOjE2NDA4NDkxMjUsInVzZXJuYW1lX2FwcGxldCI6Iko4VENqMTYzODk0MTc2MyJ9.J4vY-mSQnxh0K9DxNVKbelL1IXMx0GGVTClRKqfbyLo',
+					'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyYW5kb20iOiIxNzU4NCIsImNsaWVudCI6IjUiLCJleHAiOjE2NDA5MzEwOTcsInVzZXJuYW1lX2FwcGxldCI6IlJtSWhvMTYzOTEyODEwOCJ9.vA1yHns6KLFyK_ZmQgC6-4O7vGbs08DBVAaveO6yBFo',
 				rewardList: [],
 				queryParams: {
 					pageNum: 1,
@@ -372,44 +372,67 @@
 			},
 			methods: {
 				goReward() {
-					this.getActDetailList();
-					if (this.actStatus != 1) {
-						return
-					}
-					this.stopManyClick(() => {
-						systemBuriedPoint({
-							pointName: 'dt_裂变_h5_分享攻略'
-						}).then(res => {
-
-						})
-						const {
-							title,
-							content,
-							gotoUrl,
-							shareImg
-						} = this.shareInfo;
-						console.log({
-							title: title,
-							content: content,
-							gotoUrl: gotoUrl,
-							shareImg: shareImg
-						});
-						if (isAndroid) {
-							window.native.share(title, content, gotoUrl, shareImg)
-						} else if (isIOS) {
-							window.webkit.messageHandlers.share.postMessage({
-								title: title,
-								content: content,
-								gotoUrl: gotoUrl,
-								shareImg: shareImg
-							});
+					
+					this.$toast.loading({
+						duration: 0,
+						message: '加载中...',
+						forbidClick: true,
+						loadingType: 'spinner',
+					});
+					getActDetailList(this.token).then(res => {
+						this.$toast.clear();
+						if (res.status === 0) {
+							this.actStatus = res.data.actStatus;
+							this.shareInfo = res.data;
+							if (this.actStatus != 1) {
+								return
+							}
+							// this.stopManyClick(() => {
+								this.getShare();
+							// })
+
+						} else {
+							this.$toast(res.msg);
 						}
 					})
 
+            
+
+
 				},
 				standarImg(id) {
 					return `${fileCenterApi}/file-center/fileOperate/getImage?id=${id}`;
 				},
+				getShare() {
+
+					systemBuriedPoint({
+						pointName: 'dt_裂变_h5_分享攻略'
+					}).then(res => {
+
+					})
+					const {
+						title,
+						content,
+						gotoUrl,
+						shareImg
+					} = this.shareInfo;
+					console.log({
+						title: title,
+						content: content,
+						gotoUrl: gotoUrl,
+						shareImg: shareImg
+					});
+					if (isAndroid) {
+						window.native.share(title, content, gotoUrl, shareImg)
+					} else if (isIOS) {
+						window.webkit.messageHandlers.share.postMessage({
+							title: title,
+							content: content,
+							gotoUrl: gotoUrl,
+							shareImg: shareImg
+						});
+					}
+				},
 				getActDetailList() { //获取活动状态
 					this.$toast.loading({
 						duration: 0,
@@ -427,7 +450,6 @@
 						}
 					})
 				},
-
 				getAwardPage() { //获取活动列表
 					getAwardPage(this.token, this.queryParams).then(res => {
 						if (res.status == 0) {

microserviceUserH5/vcloud/actFissionShare.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <meta name="description" content="双子星邀请你免费领取云手机">
     <link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
-    <link rel="stylesheet" href="../static/css/index.css?v=1.0.0.9">
+    <link rel="stylesheet" href="../static/css/index.css?v=1.0.0.3">
     <link rel="stylesheet" href="../static/css/vant.css" />
     <script src="../static/js/vender/jquery-3.4.1.min.js"></script>
     <!-- <script src="../static/js/vender/vue/vue.min.js"></script>
@@ -457,10 +457,10 @@
                         // var oInput = document.createElement('input'); //创建一个input
                         // oInput.setAttribute("readonly", "readonly"); //设置只读，否则移动端使用复制功能时可能会造成软件盘弹出
                         // this.$nextTick();
+                        var oInput = document.createElement('input'); //创建一个input
+                        oInput.setAttribute("readonly",
+                            "readonly"); //设置只读，否则移动端使用复制功能时可能会造成软件盘弹出
                         setTimeout(() => {
-                            var oInput = document.createElement('input'); //创建一个input
-                            oInput.setAttribute("readonly",
-                                "readonly"); //设置只读，否则移动端使用复制功能时可能会造成软件盘弹出
                             oInput.value = this.code;
                             $('.ipt')[0].appendChild(oInput); //将input插入到body
                             // oInput.select(); // 选择对象 ios不支持
@@ -476,7 +476,7 @@
                             oInput.style.display = 'none'; // 将input隐藏
                             oInput.blur();
                             oInput.remove(); // 将input销毁
-                        }, 100)
+                        }, 500)
 
                     })