heyang преди 3 години
родител
ревизия
aaab067599

+ 2 - 2
microserviceUserH5/static/js/vender/config.js

@@ -1,7 +1,7 @@
 var url = window.location.href;
 url = url.split('/');
-// var baseUrl = url[0] + '//' + url[2];
-var baseUrl = 'https://per.cs.se.androidscloud.com'
+var baseUrl = url[0] + '//' + url[2];
+// var baseUrl = 'http://14.215.128.96'
 // var baseUrl = 'http://vclusters.imwork.net:2221'
 
 

+ 1 - 1
microserviceUserH5/static/js/vender/vue/config.js

@@ -2,7 +2,7 @@
 // var base_url = 'http://jakehou92.ticp.io'; //测试服务器
 // var base_url = 'http://192.168.100.137:3001'; //测试服务器
 // var base_url = 'http://192.168.100.98:3001'; //测试服务器
-var base_url = 'https://per.cs.se.androidscloud.com'; //测试服务器
+var base_url = baseUrl; //测试服务器
 //http://test.androidscloud.com
 // var base_url = 'https://per.cs.se.androidscloud.com/';
 //var base_url = 'https://per.cs.se.androidscloud.com/'

+ 63 - 21
microserviceUserH5/vcloud/actFissionShare.html

@@ -282,7 +282,7 @@
             transform: translateX(-50%);
             padding: 0 0.4rem;
             top: -6.96rem;
-            /* overflow: hidden; */
+            overflow: hidden;
         }
 
         .imgs-block{
@@ -412,6 +412,21 @@
                 width: auto;
             }
         }
+        .miniprogram-wrap{
+            position: relative;
+        }
+        .miniprogram{
+            width: 6.25rem;
+            height: 8.01rem;
+            margin-left: -0.39rem;
+        }
+        .down-btn{
+            width: 4.6rem;
+            height: 0.9rem;
+            position: absolute;
+            bottom: 0.42rem;
+            left: 0.42rem;
+        }
     </style>
 </head>
 
@@ -460,21 +475,27 @@
     </div>
     <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 class="miniprogram-wrap">
+                <img class="miniprogram" src="../static/offImg/tost.png" />
+                <img class="down-btn" src="../static/offImg/down-btn.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>
+            <div class="noMiniprogram">
+                <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>
+                </div>
+                <img class="close" src="img/close.png" />
             </div>
-            <img class="close" src="img/close.png" />
         </div>
     </div>
     
@@ -517,12 +538,29 @@
             if(isIOS){
                 copyUrl();
             }else{
-                let ua = navigator.userAgent.toLowerCase();
-                if (ua.match(/MicroMessenger/i) == "micromessenger") {
+                download();
+            }
+		});
+        $('.down-btn')[0].addEventListener('click', (e) => {
+            let ua = navigator.userAgent.toLowerCase();
+            if (ua.match(/MicroMessenger/i) == "micromessenger") {
+                var oInput = document.createElement('input'); //创建一个input
+                oInput.setAttribute("readonly", "readonly"); //设置只读,否则移动端使用复制功能时可能会造成软件盘弹出
+                setTimeout(() => {
+                    oInput.value = code;
+                    document.body.appendChild(oInput);
+                    selectText(oInput, 0, oInput.value.length);
+                    document.execCommand("Copy"); // 执行浏览器复制命令
+                    $('.dialog').animate({top: '-6.96rem'},"fast");
+                    $('.mask').hide();
+                    document.documentElement.style.overflow='auto';
+                    oInput.style.display = 'none'; // 将input隐藏
+                    oInput.blur();
+                    oInput.remove(); // 将input销毁
                     location.href = 'weixin://dl/business/?t=sg6FNjcPWip';
-                }else{
-                    download();
-                }
+                }, 400)
+            }else{
+                alert('环境问题')
             }
 		});
         function download() {
@@ -826,7 +864,11 @@
                     }
                     let ua = navigator.userAgent.toLowerCase();
                     if(ua.match(/MicroMessenger/i)=="micromessenger"){
-			            $('.get-success').eq(0).text('打开小程序并复制激活码');
+				        $('.miniprogram').eq(0).css('display', 'block');
+				        $('.noMiniprogram').eq(0).css('display', 'none');
+                    }else{
+                        $('.miniprogram').eq(0).css('display', 'none');
+				        $('.noMiniprogram').eq(0).css('display', 'block');
                     }
                     $('.dialog').animate({top: '1.8rem'},"fast");
                     $('.mask').show();
@@ -872,7 +914,6 @@
                     let middle = this.shareInfo.gotoUrl.split('=')[1];
                     let result = middle.split('&')[0];
                     const {
-						title,
 						content,
 						shareImg
 					} = this.shareInfo;
@@ -883,6 +924,7 @@
 					if (isAndroid) {
 						window.native.share(title, content, `${baseUrl}/h5/microserviceUserH5/vcloud/actFissionShare.html?username=${result}&strategyId=${this.strategyId}&tagId=${GetRequest().tagId}`, shareImg)
 					} else if (isIOS) {
+
 						window.webkit.messageHandlers.share.postMessage({
 							title: title,
 							content: content,

+ 4 - 3
microserviceUserH5/vcloud/exchangePhoneActivity.html

@@ -43,8 +43,8 @@
 						<input class="phone-ipt ipt" value="某手指用户" disabled />
 						<img class="right_icon" src="../static/img/exchangePhoneActivity/right_icon.png">
 						<div class="select-wrap">
-							<div class="select selected">某手指用户</div>
-							<div class="select">新人福利</div>
+							<div class="select selected" index="1">某手指用户</div>
+							<div class="select" index="2">新人福利</div>
 						</div>
 					</div>
 					<div class="ipt-row">
@@ -190,7 +190,8 @@
 			});
 		}
 		//点击下拉框选择
-		$('.selectNode')[0].addEventListener('click',() => {
+		$('.selectNode')[0].addEventListener('click',(e) => {
+			console.log(e)
 			$('.select-wrap').eq(0).css('opacity', '1');
 		})
 		//点击立即领取按钮