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

microserviceUserH5/static/css/anniversaryCelebrate.css

@@ -671,7 +671,7 @@ ul, li {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 0.06rem;
+  bottom: 0.1rem;
   /* animation: mymoves 0.8s; */
 }
 

microserviceUserH5/vcloud/anniversaryCelebrate.html

@@ -314,7 +314,7 @@
 			u = navigator.userAgent,
 			ua = navigator.userAgent.toLowerCase(),
 			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
-			isMiniprogram = false,
+			miniprogram = false,
 			anniversarySwitch = 0,
 			animationFlag = true,
 			residueDegree = 0,
@@ -341,21 +341,6 @@
 			recordFlags = true,
 		    sliderNumber = 0,//滑块是数量，控制溢出不能滑动
 			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
-		if (ua.match(/MicroMessenger/i) == "micromessenger") {
-			//ios的ua中无miniProgram，但都有MicroMessenger（表示是微信浏览器）
-			wx.miniProgram.getEnv((res) => {
-				if (res.miniprogram) {
-					isMiniprogram = true;
-				} else {
-					isMiniprogram = false;
-				}
-			})
-		} else {
-			isMiniprogram = false;
-		}
-		if(id){
-			getPhoneNumber();
-		}
 		// 初始化数据
 		init();
 		function init() {
@@ -462,7 +447,7 @@
 				setTimeout(() => {
 					$('.light-show').hide();
 					$('.award-success').show();
-				},800)
+				},400)
 			}
 			handleAward(5);
 			operate('znq_2022_h5_抽奖5次');
@@ -480,7 +465,7 @@
 		},false);
 		function handleAward(times,type) {
 			if(!id){
-				if (isMiniprogram) { // 小程序
+				if (window.__wxjs_environment === 'miniprogram') { // 小程序
 					wx.miniProgram.navigateTo({
 						url: '/pages/index/index'
 					})
@@ -523,7 +508,7 @@
 							$('.award-result-mask').show();
 							document.documentElement.style.overflow='hidden';
 						}
-						if(lighten.length != 10){
+						if(lighten.length < 10){
 							$('.award-success').hide();
 						}
 						$('.award-result-wrap').eq(0).text('');
@@ -542,41 +527,57 @@
 								} else {
 									if(list.length == 3) {
 										str += `<div class="card-item many-two-card">
-													<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
-													<div class="card-text">星曜${list[1].awardDurations}天卡</div>
+													<div class="card-item-wrap card-item-wraps">
+														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
+														<div class="card-text">星曜${list[1].awardDurations}天卡</div>
+													</div>
 												</div>
 												<div class="card-item many-one-card">
-													<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
-													<div class="card-text">星曜${list[2].awardDurations}天卡</div>
+													<div class="card-item-wrap card-item-wraps">
+														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
+														<div class="card-text">星曜${list[2].awardDurations}天卡</div>
+													</div>
 												</div>`
 									}else if(list[i].awardType == 2){//外环
 										str += `<div class="card-item many-two-card">
-													<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
-													<div class="card-text">星曜${list[1].awardDurations}天卡</div>
+													<div class="card-item-wrap card-item-wraps">
+														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
+														<div class="card-text">星曜${list[1].awardDurations}天卡</div>
+													</div>
 												</div>
 												<div class="card-item many-one-card">
-													<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-													<div class="card-text">星曜188天卡</div>
+													<div class="card-item-wrap card-item-wraps">
+														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+														<div class="card-text">星曜188天卡</div>
+													</div>
 												</div>`
 									} else if(list[i].awardType == 1) {//内环
 										str += `<div class="card-item many-two-card">
-													<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-													<div class="card-text">星曜88天卡</div>
+													<div class="card-item-wrap card-item-wraps">
+														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+														<div class="card-text">星曜88天卡</div>
+													</div>
 												</div>
 												<div class="card-item many-one-card">
-													<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
-													<div class="card-text">星曜${list[1].awardDurations}天卡</div>
+													<div class="card-item-wrap card-item-wraps">
+														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
+														<div class="card-text">星曜${list[1].awardDurations}天卡</div>
+													</div>
 												</div>`
 									}
 								}
 								if(otherData.length == 0){
 									str += `<div class="card-item many-two-card">
-												<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-												<div class="card-text">星曜88天卡</div>
+												<div class="card-item-wrap card-item-wraps">
+													<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+													<div class="card-text">星曜88天卡</div>
+												</div>
 											</div>
 											<div class="card-item many-one-card">
-												<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-												<div class="card-text">星曜188天卡</div>
+												<div class="card-item-wrap card-item-wraps">
+													<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+													<div class="card-text">星曜188天卡</div>
+												</div>
 											</div>`
 								}
 							}
@@ -598,33 +599,45 @@
 								} else {
 									if(list[i].awardType == 2){
 										str += `<div class="card-item many-card-item">
-													<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
-													<div class="card-text">星曜${list[i].awardDurations}天卡</div>
+													<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>
 												<div class="card-item many-card-item two-item">
-													<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-													<div class="card-text">星曜188天卡</div>
+													<div class="card-item-wrap card-item-wraps">
+														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+														<div class="card-text">星曜188天卡</div>
+													</div>
 												</div>`
 									} else if(list[i].awardType == 1) {
 										str += `<div class="card-item many-card-item">
-													<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-													<div class="card-text">星曜88天卡</div>
+													<div class="card-item-wrap card-item-wraps">
+														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+														<div class="card-text">星曜88天卡</div>
+													</div>
 												</div>
 												<div class="card-item many-card-item two-item">
-													<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
-													<div class="card-text">星曜${list[i].awardDurations}天卡</div>
+													<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>`
 									}
 								}
 							}
 							if(otherData.length == 0){
 								str += `<div class="card-item many-card-item">
-											<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-											<div class="card-text">星曜88天卡</div>
+											<div class="card-item-wrap card-item-wraps">
+												<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+												<div class="card-text">星曜88天卡</div>
+											</div>
 										</div>
 										<div class="card-item many-card-item two-item">
-											<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-											<div class="card-text">星曜188天卡</div>
+											<div class="card-item-wrap card-item-wraps">
+												<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+												<div class="card-text">星曜188天卡</div>
+											</div>
 										</div>`
 							}
 							var imgTimer2 = setInterval(() => {
@@ -650,6 +663,7 @@
 		}
 		//点击确定
 		$('.distribution-award')[0].addEventListener('click',() => {
+			operate('znq_2022_h5_确定按钮');
 			animationFlag = true;
 			$('.award-result-dialog').animate({top: '-10.96rem'},"fast");
 			$('.award-result-mask').hide();
@@ -657,6 +671,7 @@
 		},false);
 		//点击抽奖关闭按钮
 		$('.award-result-close')[0].addEventListener('click',() => {
+			operate('znq_2022_h5_抽奖关闭按钮');
 			animationFlag = true;
 			$('.award-result-dialog').animate({top: '-10.96rem'},"fast");
 			$('.award-result-mask').hide();
@@ -664,6 +679,7 @@
 		},false);
 		// 点击领取tab切换
 		$('.get-award-wrap')[0].addEventListener('click',(e) => {
+			operate('znq_2022_h5_充值奖励');
 			if(!id){
 				return
 			}
@@ -685,6 +701,7 @@
 			$('.get-award-text')[0].className = 'get-award-text';
 		},false);
 		$('.get-award-wrap')[1].addEventListener('click',(e) => {
+			operate('znq_2022_h5_分配奖励');
 			if(!id){
 				return
 			}
@@ -692,6 +709,7 @@
 			$('.light-content-container').eq(0).css('display', 'none');
 			pageNums = 1;
 			pages = 0;
+			totalRecords = [];
 			getLists();
 			$('.get-award-img')[0].src = '../static/img/anniversaryCelebrate/get-award-hidden.png';
 			$('.get-award-img')[1].src = '../static/img/anniversaryCelebrate/get-award-success-show.png';
@@ -703,6 +721,7 @@
 		},false);
 		//获取抽奖记录
 		function getAward(type){
+			operate('znq_2022_h5_抽奖记录');
 			$.ajax({
 				url: baseUrl + `/api/activity/v1/anniversary/rewardList?pageNum=${pageNum}&pageSize=10&receive=${receive}`,
 				type: 'get',
@@ -746,24 +765,28 @@
 		}
 		//点击规则
 		$('.rule-wrap')[0].addEventListener('click',(e) => {
+			operate('znq_2022_h5_规则');
 			$('.rule-result-dialog').animate({top: '1.86rem'},"fast");
 			$('.rule-mask').show();
 			document.documentElement.style.overflow='hidden';
 		},false);
 		//关闭规则
 		$('.rule-close')[0].addEventListener('click',() => {
+			operate('znq_2022_h5_关闭规则');
 			$('.rule-result-dialog').animate({top: '-10.96rem'},"fast");
 			$('.rule-mask').hide();
 			document.documentElement.style.overflow='auto';
 		},false);
 		//点击法律声明
 		$('.law-statement')[0].addEventListener('click',(e) => {
+			operate('znq_2022_h5_法律声明');
 			$('.law-result-dialog').animate({top: '1.86rem'},"fast");
 			$('.law-mask').show();
 			document.documentElement.style.overflow='hidden';
 		},false);
 		//关闭法律声明
 		$('.law-close')[0].addEventListener('click',() => {
+			operate('znq_2022_h5_关闭法律声明');
 			$('.law-result-dialog').animate({top: '-10.96rem'},"fast");
 			$('.law-mask').hide();
 			document.documentElement.style.overflow='auto';
@@ -772,7 +795,7 @@
 		$('.get-times')[0].addEventListener('click',getTimeHandle,false);
 		function getTimeHandle() {
 			if(!id){
-				if (isMiniprogram) { // 小程序
+				if (window.__wxjs_environment === 'miniprogram') { // 小程序
 					wx.miniProgram.navigateTo({
 						url: '/pages/index/index'
 					})
@@ -783,7 +806,7 @@
 			}
 		    operate('znq_2022_h5_获取次数按钮');
 			stopManyClick(() =>{
-				if (isMiniprogram) { // 小程序
+				if (window.__wxjs_environment === 'miniprogram') { // 小程序
 					if(phoneRemainQuantity > 0){
 						wx.miniProgram.navigateTo({
 							url: '/packageA/order/buy/index?type=activity'
@@ -793,6 +816,16 @@
 							url: '/packageA/order/renew/index?type=activity'
 						})
 					}
+				}else if(uni.webView) {
+					if(phoneRemainQuantity > 0){
+						uni.webView.navigateTo({
+							url: '/pages/order/order'
+						})
+					} else {
+						uni.webView.navigateTo({
+							url: '/pages/order/renew'
+						})
+					}
 				} else if (isAndroid) { // 安卓
 					if(phoneRemainQuantity > 0){
 						window.native.startPurchase('SVIP', 365);
@@ -805,16 +838,6 @@
 					} else {
 						window.webkit.messageHandlers.startRenew.postMessage({ type: 1, day: 365 });
 					}
-				} else {
-					if(phoneRemainQuantity > 0){
-						uni.webView.navigateTo({
-							url: '/pages/order/order'
-						})
-					} else {
-						uni.webView.navigateTo({
-							url: '/pages/order/renew'
-						})
-					}
 				}
 			})
 		}
@@ -930,9 +953,9 @@
 												</div>
 											</div>
 											<div class="compute-block">
-												<img class="compute-icon cut" data-id=${recordsId} data-index=${totalRecords.length - 5 + i} src="../static/img/anniversaryCelebrate/cut.png" />
-												<input class="ipt" data-id=${recordsId} data-index=${totalRecords.length - 5 + i} type="number" onkeyup="this.value=this.value.replace(/-/g,'')" value="0" />
-												<img class="compute-icon add" data-id=${recordsId} data-index=${totalRecords.length - 5 + i} src="../static/img/anniversaryCelebrate/add.png" />
+												<img class="compute-icon cut" data-id=${recordsId} data-index=${totalRecords.length - records.length + i} src="../static/img/anniversaryCelebrate/cut.png" />
+												<input class="ipt" data-id=${recordsId} data-index=${totalRecords.length - records.length + i} type="number" onkeyup="this.value=this.value.replace(/-/g,'')" value="0" />
+												<img class="compute-icon add" data-id=${recordsId} data-index=${totalRecords.length - records.length + i} src="../static/img/anniversaryCelebrate/add.png" />
 											</div>
 										</div>
 									</div>`
@@ -946,7 +969,7 @@
 							}
 							$('.distribution-reward-btn').eq(0).css('display','block');
 							for (var i = 0; i < len; i++) {
-								$('.ipt')[totalRecords.length - 5 + i].oninput = function (e) {
+								$('.ipt')[totalRecords.length - records.length + i].oninput = function (e) {
 									const id = e.target.dataset.id;
 									let oldDuration = 0;
 									let preTotalTime = 0;
@@ -1020,6 +1043,7 @@
 		}
 		//点击加号
 		$('.slider-list')[0].addEventListener('click',(e) => {
+			operate('znq_2022_h5_加号');
 			if(e.target.className === 'compute-icon add'){
 			    const id = e.target.dataset.id;
 				let currTotalTime = 0;
@@ -1067,6 +1091,7 @@
 		});
 		//点击减号
 		$('.slider-list')[0].addEventListener('click',(e) => {
+			operate('znq_2022_h5_减号');
 			if(e.target.className === 'compute-icon cut'){
 				const id = e.target.dataset.id;
 			    let index = e.target.dataset.index;
@@ -1093,6 +1118,7 @@
 		});
 		//点击分配时长按钮
 		$('.distribution-reward-btn')[0].addEventListener('click', (e) => {
+			operate('znq_2022_h5_分配时长');
 			if(e.target.className != 'reward-btn-img'){
 				return
 			}
@@ -1107,7 +1133,7 @@
 		});
 		//点击分配时长取消按钮
 		$('.sure-distribution-cannel')[0].addEventListener('click', (e) => {
-			operate('dt_双旦_h5_分配奖励_取消');
+			operate('znq_2022_h5_分配奖励_取消');
 			$('.sure-distribution-wrap').eq(0).css('display', 'none');
 		});
 		//点击分配时长确定按钮
@@ -1132,6 +1158,8 @@
 							$('.slider-list').eq(0).text('');
 							$('.page-number').eq(0).text('');
 							init();
+							pageNums = 1;
+							pages = 0;
 							getLists();
 							distributionPageNum = 1;
 							$('.time-row-data').eq(0).text('');
@@ -1142,7 +1170,8 @@
 									}
 								})
 							})
-							distributionList = [];card-text
+							distributionList = [];
+							totalRecords = [];
 							stopManyClick(() => {
 								toastr.error('分配成功，请前往云机列表查看');
 							})
@@ -1158,6 +1187,7 @@
 		});
 		//点击分配时长记录
 		$('.distribution-time-Record')[0].addEventListener('click', (e) => {
+			operate('znq_2022_h5_分配时长记录');
 			$('.distribution-time-dialog').animate({top: '4.86rem'},"fast");
 			$('.distribution-time-mask').show();
 			document.documentElement.style.overflow='hidden';
@@ -1206,6 +1236,7 @@
 			})
 		}
 		$('.share-wrap')[0].addEventListener('click',() => {
+			operate('znq_2022_h5_分享');
 			if (isAndroid) {
 				window.native.share('双子星云手机闪曜周年庆！大礼回馈，最高免费赠送188天！', '双子星云手机闪曜周年庆！大礼回馈，最高免费赠送188天！', `${baseUrl}/h5/microserviceUserH5/vcloud/anniversaryCelebrate.html`, '../static/img/anniversaryCelebrate/share-bg.png')
 			} else if (isiOS) {
@@ -1220,6 +1251,7 @@
 			}
 		},false);
 		function download() {
+			operate('znq_2022_h5_下载');
             if(window.__wxjs_environment === 'miniprogram'){
 				wx.miniProgram.navigateTo({
 					url: '/pages/home/home'
@@ -1267,6 +1299,7 @@
 		}
 		//点击分配时长关闭按钮
 		$('.distribution-close')[0].addEventListener('click',() => {
+			operate('znq_2022_h5_分配时长关闭');
 			$('.distribution-time-dialog').animate({top: '-10.96rem'},"fast");
 			$('.distribution-time-mask').hide();
 			document.documentElement.style.overflow='auto';

screenIos/WXtrialInterface.html

@@ -205,7 +205,6 @@
           width="100%"
           height="100%"
           id="source"
-          muted
           autoplay="autoplay"
           loop="loop"
           webkit-playsinline="true"
@@ -389,7 +388,6 @@
       var winese = document.createElement('wine');
       wine.style.top = '-' + winese + 'px';
       var isAudioPlay = false;
-      // adInit();
       initAD();
       $.alert({
         title: '提示',
@@ -976,9 +974,9 @@
         });
       }
       //广告信息
-      let adData = null; // 广告数据
-      let adLastTime = 0; // 广告时间
-      let intervalTime = 0; // 间隔时间
+      var adData = null; // 广告数据
+      var adLastTime = 0; // 广告时间
+      var intervalTime = 0; // 间隔时间
       // let adType = 0;
       console.log(
         '🚀 ~ file: WXtrialInterface.html ~ line 973 ~ sourceType',
@@ -1000,7 +998,7 @@
           contentType: 'application/json;charset=UTF-8',
         }).then(function (res) {
           if (res.status === 0) {
-            const list = res.data.filter(
+            var list = res.data.filter(
               (v) => v.adType === 1 && !!v.adVideoBase.videoUrl,
             );
             adData = list[Math.floor(Math.random() * list.length)];
@@ -1016,7 +1014,7 @@
       }
       // 播放广告
       function playAD() {
-        const nowTime = Date.now();
+        var nowTime = Date.now();
         if (
           adData &&
           // [1, 2].includes(sourceType) &&
@@ -1083,7 +1081,7 @@
             case 2: {
               return getConfigByPhoneType().then(function (res) {
                 if (res.isDisconnectionTime === 1) {
-                  let time = res.disconnectionTime * 60 * 1000;
+                  var time = res.disconnectionTime * 60 * 1000;
                   setTimeout(() => {
                     disconnectionFlag = true;
                     $('.buy-phone-wrap').eq(0).show();