Merge branch 'dev-5.2' of http://192.168.32.253:3000/Software/android-cloud-H5 into dev-5.2

microserviceUserH5/static/css/anniversaryCelebrate.css

@@ -609,7 +609,7 @@ ul, li {
   margin-top: 0.6rem;
   width: 1.66rem;
   height: 1.18rem;
-  animation: mymove 0.8s;
+  animation: mymoves 0.8s;
 }
 
 .card-text{
@@ -624,7 +624,7 @@ ul, li {
 .many-card{
   width: 1.48rem;
   height: 1.1rem;
-  animation: mymove 0.8s;
+  animation: mymoves 0.8s;
 }
 
 .many-card-item:nth-child(4n){
@@ -663,7 +663,7 @@ ul, li {
   display: none;
 }
 
-@keyframes mymove {
+@keyframes mymoves {
   0%   {transform:scale(0,0);}
   100% {transform:scale(1,1);}
 }

microserviceUserH5/vcloud/actFissionShare.html

@@ -923,7 +923,6 @@
 					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,

microserviceUserH5/vcloud/anniversaryCelebrate.html

@@ -297,7 +297,7 @@
 	</script>
 	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
 	<script type="text/javascript">
-        var baseUrl = 'http://192.168.31.198'
+        // var baseUrl = 'http://14.18.190.141:1280'
 	    let timer,flag = true;
 		var url = window.location.href;
 		url = url.split('/')
@@ -331,17 +331,22 @@
 		    distributionPages = 0,
 		    sliderNumber = 0,//滑块是数量，控制溢出不能滑动
 			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
-		// 初始化数据
-		window.onload = function(){
-			if (isAndroid && window.native) {
-				window.native.enableSharePage(
-					'您的好友送你一台免费云机',
-					'您的好友送你一台免费云机',
-					`${baseUrl}/h5/microserviceUserH5/vcloud/anniversaryCelebrate.html`,
-					'https://test.androidscloud.com/file-center/fileOperate/getImage?id=215553'
-				);
-			}
+		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() {
 			$.ajax({
@@ -656,22 +661,22 @@
 				},
 			})
 		}
-		//点击领取按钮
-		$('.light-content-list')[0].addEventListener('click',(e) => {
-			if (e.target.className === 'get-btn ') {
-				let awardId = parseInt(e.target.dataset.awardid);
-				let day = parseInt(e.target.dataset.day);
-				if (isMiniprogram) { // 小程序
-					wx.miniProgram.navigateTo({
-						url: `/packageA/activityCloudPhone/index?id=${awardId.toString()}&day=${day}`
-					})
-				} else if (isAndroid) { // 安卓
-					window.native.activatePhone(3, awardId, day);
-				} else if (isiOS) {
-					window.webkit.messageHandlers.activatePhone.postMessage({ type: 3, awardId: awardId, day: day });
-				}
-			}
-		},false);
+		// //点击领取按钮
+		// $('.light-content-list')[0].addEventListener('click',(e) => {
+		// 	if (e.target.className === 'get-btn ') {
+		// 		let awardId = parseInt(e.target.dataset.awardid);
+		// 		let day = parseInt(e.target.dataset.day);
+		// 		if (isMiniprogram) { // 小程序
+		// 			wx.miniProgram.navigateTo({
+		// 				url: `/packageA/activityCloudPhone/index?id=${awardId.toString()}&day=${day}`
+		// 			})
+		// 		} else if (isAndroid) { // 安卓
+		// 			window.native.activatePhone(3, awardId, day);
+		// 		} else if (isiOS) {
+		// 			window.webkit.messageHandlers.activatePhone.postMessage({ type: 3, awardId: awardId, day: day });
+		// 		}
+		// 	}
+		// },false);
 		//点击规则
 		$('.rule-wrap')[0].addEventListener('click',(e) => {
 			$('.rule-result-dialog').animate({top: '1.86rem'},"fast");
@@ -760,7 +765,7 @@
 				cache: false,
 				success: function (res) {
 					if (res.status === 0) {
-						let records = res.data.list;
+						let records = res.data.pageInfo.list;
 						totalRecords = [...totalRecords, ...records];
 						if(records.length === 0){
 							$('.page-row').eq(0).css('display','none');
@@ -776,8 +781,7 @@
 								len = records.length;
 							for (var i = 0; i < len; i++) {
 					            // 解决ios时间显示为NaN
-								now = '2021-11-11 12:22:22'
-								// var now = res.data.now.replace(/T/g, ' ');
+								var now = res.data.currentTime.replace(/T/g, ' ');
 					                now = now.replace(/\-/g, '/');
 								var exceptTime = records[i].exceptTime.replace(/T/g, ' ');
 								    exceptTime = exceptTime.replace(/\-/g, '/');
@@ -1087,7 +1091,6 @@
 			document.documentElement.style.overflow='auto';
 		},false);
 		//获取云机数量
-		getPhoneNumber();
 		function getPhoneNumber(){
 			$.ajax({
 				url: baseUrl + '/api/pay/v2/meal/info?phoneType=SVIP',