Merge branch 'dev-5.3' of Software/android-cloud-H5 into uat

microserviceUserH5/static/css/anniversaryCelebrate.css

@@ -677,6 +677,7 @@ ul, li {
 
 .card-item-wrap{
   margin-top: 0.7rem;
+  margin-left: 0.12rem;
   width: 1.55rem;
   height: 1.13rem;
   position: relative;
@@ -698,12 +699,16 @@ ul, li {
 }
 
 .many-card-item:nth-child(4n){
-  margin-left: 1rem;
+  margin-left: 0.6rem;
+}
+
+.many-card-item:nth-child(5n) {
+  margin-left: 0.4rem;
 }
 
 .many-card-item:nth-child(6n) {
   padding-top: 0.35rem;
-  margin-left: 1rem;
+  margin-left: 0.6rem;
 }
 
 .many-card-item:nth-child(7n) {

microserviceUserH5/vcloud/anniversaryCelebrate.html

@@ -599,7 +599,24 @@
 												</div>
 											</div>`
 								} else {
-									if(list[i].awardType == 2){
+									if(list.length == 7) {
+										if(i == 5) {
+											str += `<div class="card-item many-card-item">
+													<div class="card-item-wrap card-item-wraps">
+														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
+														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
+													</div>
+												</div>`
+										}
+										if(i == 6) {
+											str += `<div class="card-item many-card-item two-item">
+													<div class="card-item-wrap card-item-wraps">
+														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
+														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
+													</div>
+												</div>`
+										}
+									} else if(list[i].awardType == 2){
 										str += `<div class="card-item many-card-item">
 													<div class="card-item-wrap card-item-wraps">
 														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
@@ -796,6 +813,10 @@
 		//点击获取次数
 		$('.get-times')[0].addEventListener('click',getTimeHandle,false);
 		function getTimeHandle() {
+			if(anniversarySwitch == 2){
+				toastr.error('活动已结束！');
+				return
+			}
 			if(!id){
 				download();
 				// location.href = 'http://f.mpay8.cn/l/cmK4MSiolegJcfl';
@@ -819,7 +840,7 @@
 					} else {
 						window.native.startRenew();
 					}
-				} else if (isiOS && window.webkit.messageHandlers) {
+				} else if (isiOS && window.webkit) {
 					if(phoneRemainQuantity > 0){
 						window.webkit.messageHandlers.startPurchase.postMessage({ type: 1, day: 365 });
 					} else {
@@ -832,7 +853,7 @@
 						})
 					} else {
 						uni.webView.navigateTo({
-							url: '/pages/order/renew'
+							url: '/pages/order/renew?record=' + userCardId
 						})
 					}
 				}
@@ -904,9 +925,6 @@
 		// 活动获取用户云机列表，分页
 		function getLists(type){
 			const sliderLen = Array.from($('.slider-item')).length;
-			// if(sliderLen != 0 && sliderLen >= sliderNumber){
-			// 	return
-			// }
 			$.ajax({
 				url: baseUrl + '/api/resources/v5/client/disk/info/anniversary/usercard',
 				type: 'get',
@@ -1198,8 +1216,11 @@
 						} else {
 							$('.sure-distribution-wrap').eq(0).css('display', 'none');
 							stopManyClick(() => {
-								toastr.error(res.msg);
+								toastr.error(res.data.msg);
 							})
+							pageNums = 1;
+							pages = 0;
+							getLists();
 						}
 					},
 				})
@@ -1259,7 +1280,7 @@
 			operate('znq_2022_h5_分享');
 			if (isAndroid && window.native) {
 				window.native.share('双子星云手机闪曜周年庆！大礼回馈，最高免费赠送188天！', '双子星云手机闪曜周年庆！大礼回馈，最高免费赠送188天！', `${baseUrl}/h5/microserviceUserH5/vcloud/anniversaryCelebrate.html`, '../static/img/anniversaryCelebrate/share-bg.png')
-			} else if (isiOS && window.webkit.messageHandlers) {
+			} else if (isiOS && window.webkit) {
 				window.webkit.messageHandlers.share.postMessage({
 					title: '双子星云手机闪曜周年庆！大礼回馈，最高免费赠送188天！',
 					content: '双子星云手机闪曜周年庆！大礼回馈，最高免费赠送188天！',
@@ -1267,7 +1288,9 @@
 					shareImg: '../static/img/anniversaryCelebrate/share-bg.png'
 				});
 			} else {
-				copyUrl();
+				stopManyClick(() =>{
+					copyUrl();
+				})
 			}
 		},false);
 		function download() {

screenAndroid/WXtrialInterface.html

@@ -42,92 +42,6 @@
       rel="stylesheet"
       href="https://cdn.bootcss.com/jquery-weui/1.2.1/css/jquery-weui.min.css"
     />
-    <style>
-      .try-use-wrap,
-      .buy-phone-wrap,
-      .look-wrap {
-        width: 100%;
-        height: 100%;
-        position: fixed;
-        top: 0;
-        left: 0;
-        z-index: 9999;
-        background: rgba(0, 0, 0, 0.5);
-        display: none;
-      }
-
-      .try-use-container {
-        width: 80%;
-        height: 409px;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        background-color: #ffffff;
-        border-radius: 0.66em;
-      }
-
-      .time-close-wrap {
-        width: 5.46em;
-        height: 2em;
-        line-height: 2em;
-        text-align: center;
-        position: absolute;
-        top: 0.24em;
-        right: 0.3em;
-        background: rgba(0, 0, 0, 0.49);
-        border-radius: 1.26em;
-        font-size: 12px;
-        color: #ffffff;
-      }
-
-      .bug-wrap {
-        width: 90%;
-        height: 115px;
-        background: #ffffff;
-        border-radius: 10px;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-      }
-
-      .bug-title {
-        text-align: center;
-        margin: 25px 0;
-        font-size: 18px;
-        font-weight: 600;
-        color: #333333;
-      }
-
-      .btn-list {
-        width: 100%;
-        height: 44px;
-        line-height: 44px;
-        border-top: 1px solid rgba(238, 238, 238, 1);
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        display: flex;
-        align-items: center;
-      }
-
-      .btn {
-        flex: 1;
-        text-align: center;
-      }
-
-      .cannel-btn {
-        font-size: 18px;
-        color: #666666;
-      }
-
-      .go-bug {
-        font-size: 18px;
-        color: #3b7fff;
-        border-left: 1px solid rgba(238, 238, 238, 1);
-      }
-    </style>
   </head>
 
   <body class="scroll h-player" style="overscroll-behavior: contain">

screenAndroid/css/WXtrialInterface.css

@@ -567,4 +567,89 @@ ul, li {
 	font-size: 18px;
 	color: #3B7FFF;
 	border-left: 1px solid rgba(238,238,238,1);
+}
+
+.try-use-wrap,
+.buy-phone-wrap,
+.look-wrap {
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 9999;
+	background: rgba(0, 0, 0, 0.5);
+	display: none;
+}
+
+.try-use-container {
+	width: 80%;
+	height: 409px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	background-color: #FFFFFF;
+	border-radius: 0.66em;
+}
+
+.time-close-wrap {
+	width: 5.46em;
+	height: 2em;
+	line-height: 2em;
+	text-align: center;
+	position: absolute;
+	top: 0.24em;
+	right: 0.3em;
+	background: rgba(0, 0, 0, 0.49);
+	border-radius: 1.26em;
+	font-size: 12px;
+	color: #FFFFFF;
+}
+
+.bug-wrap {
+	width: 90%;
+	height: 115px;
+	background: #FFFFFF;
+	border-radius: 10px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+
+.bug-title {
+	text-align: center;
+	margin: 25px 0;
+	font-size: 18px;
+	font-weight: 600;
+	color: #333333;
+}
+
+.btn-list {
+	width: 100%;
+	height: 44px;
+	line-height: 44px;
+	border-top: 1px solid rgba(238, 238, 238, 1);
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	display: flex;
+	align-items: center;
+}
+
+.btn {
+	flex: 1;
+	text-align: center;
+}
+
+.cannel-btn {
+	font-size: 18px;
+	color: #666666;
+}
+
+.go-bug {
+	font-size: 18px;
+	color: #3B7FFF;
+	border-left: 1px solid rgba(238, 238, 238, 1);
 }

screenIos/WXtrialInterface.html

@@ -43,92 +43,6 @@
       rel="stylesheet"
       href="https://cdn.bootcss.com/jquery-weui/1.2.1/css/jquery-weui.min.css"
     />
-    <style>
-      .try-use-wrap,
-      .buy-phone-wrap,
-      .look-wrap {
-        width: 100%;
-        height: 100%;
-        position: fixed;
-        top: 0;
-        left: 0;
-        z-index: 9999;
-        background: rgba(0, 0, 0, 0.5);
-        display: none;
-      }
-
-      .try-use-container {
-        width: 80%;
-        height: 409px;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        background-color: #ffffff;
-        border-radius: 0.66em;
-      }
-
-      .time-close-wrap {
-        width: 5.46em;
-        height: 2em;
-        line-height: 2em;
-        text-align: center;
-        position: absolute;
-        top: 0.24em;
-        right: 0.3em;
-        background: rgba(0, 0, 0, 0.49);
-        border-radius: 1.26em;
-        font-size: 12px;
-        color: #ffffff;
-      }
-
-      .bug-wrap {
-        width: 90%;
-        height: 115px;
-        background: #ffffff;
-        border-radius: 10px;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-      }
-
-      .bug-title {
-        text-align: center;
-        margin: 25px 0;
-        font-size: 18px;
-        font-weight: 600;
-        color: #333333;
-      }
-
-      .btn-list {
-        width: 100%;
-        height: 44px;
-        line-height: 44px;
-        border-top: 1px solid rgba(238, 238, 238, 1);
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        display: flex;
-        align-items: center;
-      }
-
-      .btn {
-        flex: 1;
-        text-align: center;
-      }
-
-      .cannel-btn {
-        font-size: 18px;
-        color: #666666;
-      }
-
-      .go-bug {
-        font-size: 18px;
-        color: #3b7fff;
-        border-left: 1px solid rgba(238, 238, 238, 1);
-      }
-    </style>
   </head>
 
   <body class="scroll h-player" style="overscroll-behavior: contain">

screenIos/css/WXtrialInterface.css

@@ -500,4 +500,89 @@ input,textarea {
 }
 .bottommains img {
 	pointer-events: none;
+}
+
+.try-use-wrap,
+.buy-phone-wrap,
+.look-wrap {
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 9999;
+	background: rgba(0, 0, 0, 0.5);
+	display: none;
+}
+
+.try-use-container {
+	width: 80%;
+	height: 409px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	background-color: #FFFFFF;
+	border-radius: 0.66em;
+}
+
+.time-close-wrap {
+	width: 5.46em;
+	height: 2em;
+	line-height: 2em;
+	text-align: center;
+	position: absolute;
+	top: 0.24em;
+	right: 0.3em;
+	background: rgba(0, 0, 0, 0.49);
+	border-radius: 1.26em;
+	font-size: 12px;
+	color: #FFFFFF;
+}
+
+.bug-wrap {
+	width: 90%;
+	height: 115px;
+	background: #FFFFFF;
+	border-radius: 10px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+
+.bug-title {
+	text-align: center;
+	margin: 25px 0;
+	font-size: 18px;
+	font-weight: 600;
+	color: #333333;
+}
+
+.btn-list {
+	width: 100%;
+	height: 44px;
+	line-height: 44px;
+	border-top: 1px solid rgba(238, 238, 238, 1);
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	display: flex;
+	align-items: center;
+}
+
+.btn {
+	flex: 1;
+	text-align: center;
+}
+
+.cannel-btn {
+	font-size: 18px;
+	color: #666666;
+}
+
+.go-bug {
+	font-size: 18px;
+	color: #3B7FFF;
+	border-left: 1px solid rgba(238, 238, 238, 1);
 }