Selaa lähdekoodia

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

heyang 3 vuotta sitten
vanhempi
commit
5e639037d9

+ 2 - 2
microserviceUserH5/static/css/anniversaryCelebrate.css

@@ -565,7 +565,7 @@ ul, li {
   width: 100%;
   height: 100vh;
   position: fixed;
-  z-index: 999;
+  z-index: 9999;
   top: 0;
   left: 0;
   background: rgba(0, 0, 0, 0.5);
@@ -888,7 +888,7 @@ ul, li {
   position: fixed;
   top: 6.8rem;
   right: 0;
-  z-index: 9999;
+  z-index: 1200;
 }
 
 .share-img{

+ 8 - 5
microserviceUserH5/vcloud/anniversaryCelebrate.html

@@ -81,8 +81,8 @@
 
 <body>
 	<div class="container">
+		<span class="ipts"></span>
 		<div class="rule-wrap">
-			<div class="ipt"></div>
 			<img class="rule" src="../static/img/anniversaryCelebrate/rule.png" />
 		</div>
 		<div class="activity-text-wrap">
@@ -317,6 +317,7 @@
 			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
 			miniprogram = false,
 			anniversarySwitch = 0,
+			receiveSwitch = 1,
 			animationFlag = true,
 			residueDegree = 0,
 			awardTimes = 0,
@@ -347,6 +348,7 @@
 		init();
 		if(id){
 			getPhoneNumber();
+			getUserCard();
 		}
 		function init() {
 			$.ajax({
@@ -362,6 +364,7 @@
 					if(res.status === 0){
 						residueDegree = res.data.residueDegree;
 						anniversarySwitch = res.data.anniversarySwitch;
+						receiveSwitch = res.data.receiveSwitch;
 						result = res.data.lighten;
 						totalTime = res.data.notReceivedDuration;
 						receivedDuration = res.data.receivedDuration;
@@ -390,7 +393,7 @@
 							$('.icon1')[0].src = '../static/img/anniversaryCelebrate/icon4.png';
 							$('.icon2')[0].src = '../static/img/anniversaryCelebrate/icon3.png';
 						}
-						if(anniversarySwitch !== 0){
+						if(anniversarySwitch == 1 || (receiveSwitch == 0 && anniversarySwitch == 2)){
 							let awardText = anniversarySwitch == 1 ? '<div>活动暂未开启</div>请稍安勿躁' : '<div>活动已结束</div>期待下次的见面'
 							$('.no-start-dialog').eq(0).append(awardText);
 				            $('.no-start-dialog').animate({top: '50%'},"fast");
@@ -795,6 +798,7 @@
 		function getTimeHandle() {
 			if(!id){
 				download();
+				// location.href = 'http://f.mpay8.cn/l/cmK4MSiolegJcfl';
 				return
 			}
 		    operate('znq_2022_h5_获取次数按钮');
@@ -808,7 +812,7 @@
 						wx.miniProgram.navigateTo({
 							url: '/packageA/order/renew/index?record=' + userCardId
 						})
-					}web
+					}
 				} else if (isAndroid && window.native) { // 安卓
 					if(phoneRemainQuantity > 0){
 						window.native.startPurchase('SVIP', 365);
@@ -834,7 +838,6 @@
 				}
 			})
 		}
-		getUserCard();
 		function getUserCard(){
 			if(!id){
 				return
@@ -1285,7 +1288,7 @@
             oInput.setAttribute("readonly", "readonly"); //设置只读,否则移动端使用复制功能时可能会造成软件盘弹出
             setTimeout(() => {
                 oInput.value = window.location.href;
-                $('.ipt')[0].appendChild(oInput)
+                $('.ipts')[0].appendChild(oInput)
                 selectText(oInput, 0, oInput.value.length);
                 document.execCommand("Copy"); // 执行浏览器复制命令
                 toastr.error(`复制成功`);