Merge branch 'bug-5.2' of Software/android-cloud-H5 into test

microserviceUserH5/static/css/yunActivity.css

@@ -40,7 +40,6 @@ ul, li {
 
 .banner-img{
   width: 100%;
-  /* height: 100%; */
 }
 
 img {
@@ -53,11 +52,10 @@ img {
 
 .time-img{
   width: 100%;
-  /* height: 100%; */
 }
 
 .img-bottom {
-  margin: 0.5rem 0.97rem 0 0.61rem;
+  margin: 0.5rem 0.97rem 0.53rem 0.61rem;
 }
 
 .game-img {
@@ -186,8 +184,14 @@ img {
 }
 
 .video {
-  display: flex;
-  justify-content: center;
+  /* display: flex;
+  justify-content: center; */
+  position: relative;
+  width: 100%;
+  height: 4.06rem;
+  margin-top: 0.3rem;
+  background-size: 100% 100%;
+  background: url('../img/yunActivity/bgc.png');
 }
 
 .host-left {
@@ -202,6 +206,9 @@ img {
 
 
 .btn-video {
+  position: absolute;
+  top: 42%;
+  left: 45%;
   width: 0.88rem;
   height: 0.87rem;
 }
@@ -288,7 +295,7 @@ img {
 
 .viedo-game {
   position: absolute;
-  bottom: -30%;
+  /* top: 50%; */
   display: none;
   z-index: 999;
 }
@@ -302,4 +309,41 @@ img {
   height: 100%;
   display: none;
   background-color: rgba(0,0,0,.7);
+}
+
+
+#toast-container>.toast-error {
+  background-image: none !important;
+  border-radius: 0.2rem;
+}
+
+.toast-error {
+  background-color: rgba(0, 0, 0, 0.8);
+  border-radius: 0.2rem;
+}
+
+#toast-container>div {
+  font-size: 14px;
+  min-width: 80px !important;
+  padding: 12px !important;
+  box-shadow: none;
+  border-radius: 0.2rem;
+}
+
+.toast-center-center {
+  position: fixed;
+  min-width: 220px;
+  top: 50%;
+  left: 50%;
+  text-align: center;
+  transform: translateX(-50%);
+  color: #FFFFFF;
+  border-radius: 0.2rem;
+}
+
+@media (max-width: 480px) and (min-width: 241px) {
+  #toast-container>div {
+    min-width: 80px !important;
+    width: auto;
+  }
 }

microserviceUserH5/vcloud/yunActivity.html

@@ -44,7 +44,7 @@
 				</div>
 				<div class="code-tip">请输入正确的验证码</div>
 				<div class="donwlond-receive">
-					<img class="btn-img" onclick="copyUrl()" src="../static/img/yunActivity/takedowlond.png">	
+					<img class="btn-img" src="../static/img/yunActivity/takedowlond.png">	
 					<!-- <div class="btn-receive">
 						立即领取
 					</div> -->
@@ -55,9 +55,9 @@
 				<div class="game-host">游戏托管功能应用详解</div>
 				<img class="host-right" src="../static/img/yunActivity/right.png" />
 			</div>
-				<div class="video">
-					<img class="btn-video" src="../static/img/yunActivity/viedo.png"/>
-				</div>
+			<div class="video">
+				<img class="btn-video" src="../static/img/yunActivity/viedo.png"/>
+			</div>
 			<div class="direction">
 				<p>用绑定手机号打开双子星云手机APP，</p>
 				<p>登录并进入<b>“我的-我的工具-激活码”</b>兑换使用</p>
@@ -105,12 +105,16 @@
 			isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
 			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
 		// 点击立即领取按钮	
-		$('.donwlond-receive')[0].addEventListener('click',() => {
+		$('.btn-img')[0].addEventListener('click',() => {	
 			let phone = $('.phone-ipt').eq(0).val();
 			phone = phone.replace(/\s+/g,"");
 			let code = $('.code-ipt').eq(0).val();
 			code = code.replace(/\s+/g,"");
 			let phoneFlag = checkPhone()
+			let dataObj = {
+				phone: phone,
+				code: code
+			}
 			if(!phoneFlag || phone.length < 11) {
 				$('.phone-tip').eq(0).css('display','block');
 				return false
@@ -124,10 +128,6 @@
 				$('.code-tip').eq(0).css('display', 'block');
 				return false;
 			}
-			let dataObj = {
-				phone: phone,
-				code: code
-			}
 			$.ajax({
 				// url: baseUrl + '/api/user/web/register/qqWallet',
 				url: baseUrl + '/api/user/web/register/general',  // 地址
@@ -138,17 +138,22 @@
 				cache: false,
 				success: function (res) {
 					if(res.status == 0){
-						debugger
 						myCode = res.data;
 						// $('.copy-dialog').animate({top: '1.8rem'},"fast");
-						$('.copy-dialog').show()
-						$('.copy-mask').show();
-						$('.close').show()
-						document.documentElement.style.overflow='hidden';
+						// $('.copy-dialog').show()
+						// // $('.copy-mask').show();
+						// $('.close').show()
+						// document.documentElement.style.overflow='hidden';
+						if (isIOS) {
+						operate(`周年庆h5落地页打开${isIOS}`);
+						}else if(isAndroid) {
+						operate(`周年庆h5落地页打开${isAndroid}`);	
+						}
+						download();
+						toastr.error(`复制成功`);
 					}else{
 						toastr.error(res.msg);
 					}
-					
 				}
 			})
 		},false) 
@@ -276,8 +281,8 @@
                 // } else {
                 //     window.location.href = 'http://www.androidscloud.com?timestamp=' + Math.random();
                 // }
-				document.location.href = 'https://www.androidscloud.com?timestamp=' + Math.random();
-
+				// document.location.href = 'https://www.androidscloud.com?timestamp=' + Math.random();
+				document.location.href = 'https://file.phone.androidscloud.com:8121/document/newFile/download/1/edv834e74a9c43eaac02/LowLevelMultipartUpload_16680379050659020888/shuangzixing.apk';
             } else if (isIOS) {
                 document.location.href = 'https://www.pgyer.com/gemini6?timestamp=' + Math.random();
             } 
@@ -295,45 +300,45 @@
 			}
 		}
 		// 复制
-		function copyUrl() {
-			var code = $('.code-ipt').eq(0).val();
-			var phone = $('.phone-ipt').eq(0).val();
-			if( code && phone != '' ){
-			  var oInput = document.createElement('input');// 创建一个input
-			  oInput.setAttribute("readonly", "readonly");
-			   // 设置只读
-				setTimeout(() => {
-            	    oInput.value = myCode;
-            	    // oInput.select(); // 选择对象 ios不支持
-            	    document.body.appendChild(oInput)
-            	    selectText(oInput, 0, oInput.value.length);
-            	    document.execCommand("Copy"); // 执行浏览器复制命令
-            	    toastr.error(`复制成功`);
-            	    // $('.copy-dialog').animate({top: '-6.96rem'},"fast");
-            	    $('.copy-mask').hide();
-            	    document.documentElement.style.overflow='auto';
-            	    oInput.style.display = 'none'; // 将input隐藏
-            	    oInput.blur();
-            	    oInput.remove(); // 将input销毁
-            	    setTimeout(() => {
-            	        download();
-            	    }, 1000)
-            	}, 400) 
-			}	
-		}
-		$('.donwlond-receive')[0].addEventListener('click', (e) => {
-			if (isIOS) {
-				operate(`周年庆h5落地页打开${isIOS}`);
-			}else if(isAndroid) {
-				operate(`周年庆h5落地页打开${isAndroid}`);	
-			}
-			copyUrl();
-		});
+		// function copyUrl() {
+		// 	var code = $('.code-ipt').eq(0).val();
+		// 	var phone = $('.phone-ipt').eq(0).val();
+		// 	if( code && phone != ''){
+		// 	  var oInput = document.createElement('input');// 创建一个input
+		// 	  oInput.setAttribute("readonly", "readonly");
+		// 	   // 设置只读
+		// 		setTimeout(() => {
+        //     	    oInput.value = myCode;
+        //     	    // oInput.select(); // 选择对象 ios不支持
+        //     	    document.body.appendChild(oInput)
+        //     	    selectText(oInput, 0, oInput.value.length);
+        //     	    document.execCommand("Copy"); // 执行浏览器复制命令
+        //     	    // toastr.error(`复制成功`);
+        //     	    // $('.copy-dialog').animate({top: '-6.96rem'},"fast");
+        //     	    // $('.copy-mask').hide();
+        //     	    document.documentElement.style.overflow='auto';
+        //     	    oInput.style.display = 'none'; // 将input隐藏
+        //     	    oInput.blur();
+        //     	    oInput.remove(); // 将input销毁
+        //     	    // setTimeout(() => {
+        //     	    //     download();
+        //     	    // }, 1000)
+        //     	}, 400) 
+		// 	}	
+		// }
+		// $('.donwlond-receive')[0].addEventListener('click', (e) => {
+		// 	if (isIOS) {
+		// 		operate(`周年庆h5落地页打开${isIOS}`);
+		// 	}else if(isAndroid) {
+		// 		operate(`周年庆h5落地页打开${isAndroid}`);	
+		// 	}
+		// 	copyUrl();
+		// });
 		// 视频打开
 		$('.btn-video')[0].addEventListener('click',(e)=>{
 			$('.viedo-game').show();
 			$('.pop_video_bg').show();
-			console.log('11111111');
+			$('.viedo-game').animate({bottom: '-1.56rem'},"fast");
 		},false);
 		// 视频弹窗关闭
 		$('.pop_video_bg')[0].addEventListener('click',()=>{
@@ -355,12 +360,12 @@
 			})
 		}
 		// 埋点页面访问
+		var page = window.location.search.substring(6);
 		$(function() {
 			pushHistory();
-			var page = window.location.search.substring(6);
 			function pushHistory() {
 				var warids = {
-					"pointName": `周年庆h5落地页打开${page}` 
+					"pointName": `周年庆h5落地页打开${page}`  
 				}
 				$.ajax({
 					url: baseUrl + "/api/public/v1/systemBuriedPoint/stat",