Merge branch 'dev-4.9.3' of http://192.168.32.253:3000/Software/android-cloud-H5 into dev-4.9.3

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>
@@ -295,7 +295,7 @@
 								</div>
 							</div>
 							<div class="right-nav">
-								<p>星耀天卡</p>
+								<p>星曜天卡</p>
 								<p class="btn" @click='goGetReward(item.id)' v-if='item.receiveStatus==0'>领取</p>
 								<p class="btn isdisabled" v-if='item.receiveStatus==1'>已领取</p>
 
@@ -317,10 +317,10 @@
 					<div class="img-box">活动规则</div>
 				</div>
 				<div class="rule">
-					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ，好友注册成功后，分享者即可获得1小时星耀套餐时长。</p>
+					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ，好友注册成功后，分享者即可获得1小时星曜套餐时长。</p>
 					<p>2.用户通过该分享链接获取的激活码，只针对新注册用户有效领取并兑换一次。</p>
 					<p>3.分享者每日最多分享给10位好友领取激活码并获得注册奖励，且奖励为当日有效，奖励过期不补发。</p>
-					<p>4.分享者若没有云机，需要先创建星耀云机才可继续领取奖励。</p>
+					<p>4.分享者若没有云机，需要先创建星曜云机才可继续领取奖励。</p>
 					<p>5.新用户领取的激活码需在有效期内使用，若超过有效期则激活码失效。</p>
 				</div>
 			</div>

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.3">
+    <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/jquery-3.4.1.min.js"></script>
     <!-- <script src="../static/js/vender/vue/vue.min.js"></script>
@@ -31,7 +31,7 @@
         }
 
         .top-banner {
-            width: 6.8rem;
+            width: 6.9rem;
             height: 0.82rem;
             background: url("../static/offImg/share-top.png") no-repeat;
             background-size: 100% 100%;
@@ -73,7 +73,6 @@
             color: #FFFFFF;
         }
 
-
         .download-btn .left-nav p:first-of-type {
             font-size: 0.24rem;
             font-family: PingFangSC-Regular, PingFang SC;
@@ -264,7 +263,7 @@
                         <p>激活码：</p>
                         <p>AS4*********SD3</p>
                     </div>
-                    <div class="button-download copybtn" @click='createCopy()'>点击复制并下载</div>
+                    <div class="button-download " @click='createCopy()'>点击复制并下载</div>
                 </div>
             </div>
             <div class="top-banner">
@@ -274,7 +273,7 @@
                             <img :src="standarImg(item.headImgUrl)" :onerror="defaultImg" alt="">
                             <p class="hide">双子星邀请你免费领取云手机</p>
                             <p>{{item.surfaceName}}</p>
-                            <p>已获得星动云手机套餐</p>
+                            <p>已获得星曜云手机套餐</p>
                         </van-swipe-item>
 
                     </van-swipe>
@@ -295,6 +294,7 @@
     </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/vue.min.js"></script>
+    <script src="../static/js/vender/vue/vue-clipboard.min.js"></script>
     <script src="../static/js/vender/vue/vant.min.js"></script>
     <script src="../static/js/vender/config.js"></script>
     <script src="../static/js/vender/uuid.js"></script>
@@ -306,12 +306,13 @@
         // var meta_description = document.getElementsByTagName('meta')['description']
         // document.title = '更新标题'
         // meta_description.content = '更新描述'; // Android iOS
-
+        var oInput = document.createElement('input'); //创建一个input
+        oInput.setAttribute("readonly", "readonly"); //设置只读，否则移动端使用复制功能时可能会造成软件盘弹出
         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终端
-
+        var clipboard = new ClipboardJS('.copybtn') //此处为点击的dom的类名
         new Vue({
             el: '#app',
             data: {
@@ -378,39 +379,40 @@
                     //     message: '加载中...',
                     //     forbidClick: true,
                     //     loadingType: 'spinner',
-                    // });
-                    systemBuriedPoint({
-                        pointName: 'dt_裂变_h5_复制激活码'
-                    }).then(res => {})
-                    // var clipboard = new ClipboardJS('.copybtn')
-                    getActivationCode(this.username, this.tagId, this.uuid).then(res => {
-                        this.$toast.clear();
-                        if (res.status === 0) {
-                            //此处为点击的dom的类名
-                            this.code = res.data;
-                            console.log(this.code);
-                            this.copyUrl(this.code);
-                        } else {
-                            this.$dialog.alert({
-                                message: res.msg
-                            });
-                            setTimeout(() => {
-                                this.$dialog.close();
-                            }, 2000)
-                        }
+                    this.stopManyClick(() => {
+                        getActivationCode(this.username, this.tagId, this.uuid).then(res => {
+                            this.$toast.clear();
+                            if (res.status === 0) {
+                                //此处为点击的dom的类名
+                                this.code = res.data;
+                                console.log(this.code);
+                                this.copyUrl(this.code);
+                            } else {
+                                this.$dialog.alert({
+                                    message: res.msg
+                                });
+                                setTimeout(() => {
+                                    this.$dialog.close();
+                                }, 2000)
+                            }
+
+                        }).catch((error) => {
+                            this.download();
+                            console.log(error)
+                            this.$toast('复制失败');
+                            this.download()
+
+                        });
+                    })
 
-                    }).catch((error) => {
-                        console.log(error)
-                        this.$toast('复制失败');
-                    });
 
                 },
                 download() {
                     if (isAndroid) {
                         console.log(isAndroid);
-                        window.location.href = 'http://www.androidscloud.com//suanchou';
+                        document.location.href = 'http://www.androidscloud.com/suanchou?timestamp=' + Math.random();
                     } else if (isIOS) {
-                        window.location.href = 'https://www.pgyer.com/gemini6';
+                        document.location.href = 'https://www.pgyer.com/gemini6?timestamp=' + Math.random();
                     }
                 },
                 standarImg(id) {
@@ -434,7 +436,7 @@
                     });
                     getStrategy().then(res => {
                         this.$toast.clear();
-                        if (res.status == 0) {
+                        if (res.status === 0) {
                             if (res.data) {
                                 this.isshow = true;
                                 this.topic = res.data.content;
@@ -446,39 +448,33 @@
                             }
                         }
                         console.log(res)
-
                     }).catch((error) => {
                         console.log(error)
                         this.$toast('网络异常');
                     });
                 },
-                copyUrl() {
-                    this.stopManyClick(() => {
-                        // var oInput = document.createElement('input'); //创建一个input
-                        // oInput.setAttribute("readonly", "readonly"); //设置只读，否则移动端使用复制功能时可能会造成软件盘弹出
-                        // this.$nextTick();
-                        var oInput = document.createElement('input'); //创建一个input
-                        oInput.setAttribute("readonly",
-                            "readonly"); //设置只读，否则移动端使用复制功能时可能会造成软件盘弹出
+                copyUrl(actStatus) {
+                    var oInput = document.createElement('input'); //创建一个input
+                    oInput.setAttribute("readonly", "readonly"); //设置只读，否则移动端使用复制功能时可能会造成软件盘弹出
+                    setTimeout(() => {
+                        oInput.value = this.code;
+                        // $('.ipt')[0].appendChild(oInput); //将input插入到body
+                        // oInput.select(); // 选择对象 ios不支持
+                        document.body.appendChild(oInput)
+                        this.selectText(oInput, 0, oInput.value.length);
+                        document.execCommand("Copy"); // 执行浏览器复制命令
+                        this.$dialog.alert({
+                            message: `复制成功`
+                        })
+                        oInput.style.display = 'none'; // 将input隐藏
+                        oInput.blur();
+                        oInput.remove(); // 将input销毁
                         setTimeout(() => {
-                            oInput.value = this.code;
-                            $('.ipt')[0].appendChild(oInput); //将input插入到body
-                            // oInput.select(); // 选择对象 ios不支持
-                            this.selectText(oInput, 0, oInput.value.length);
-                            document.execCommand("Copy"); // 执行浏览器复制命令
-                            this.$dialog.alert({
-                                message: '复制成功'
-                            })
-                            setTimeout(() => {
-                                this.$dialog.close();
-                                this.download();
-                            }, 2000)
-                            oInput.style.display = 'none'; // 将input隐藏
-                            oInput.blur();
-                            oInput.remove(); // 将input销毁
-                        }, 500)
+                            this.$dialog.close();
+                            this.download();
+                        }, 2000)
+                    }, 400)
 
-                    })
 
                 },
                 selectText(textbox, startIndex, stopIndex) {