Parcourir la source

Merge branch 'release/v5.4.0' of Software/android-cloud-H5 into test

heyang il y a 2 ans
Parent
commit
9d368d86ef
1 fichiers modifiés avec 55 ajouts et 9 suppressions
  1. 55 9
      static/microserviceUserH5/vcloud/awardActivity.html

+ 55 - 9
static/microserviceUserH5/vcloud/awardActivity.html

@@ -4,7 +4,7 @@
 <head>
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-	<title>抽奖活动</title>
+	<title>免费活动</title>
 	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
 	<link rel="stylesheet" href="../static/js/vender/toastr/toastr.min.css">
 	<link rel="stylesheet" href="../static/css/awardActivity.css">
@@ -82,7 +82,7 @@
 					</div>
 					<div class="no-distribution-data">
 						<img class="no-distribution-img" src="../static/img/awardActivity/no-data.png" />
-						<div class="no-distribution-text">没有抽奖记录,我都替你着急~</div>
+						<div class="no-distribution-text">先购买云手机,才能分配喔~</div>
 					</div>
 				</div>
 			</div>
@@ -192,7 +192,7 @@
 	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
 	<script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script>
 	<script type="text/javascript">
-        // var baseUrl = 'http://192.168.31.194'
+        // var baseUrl = 'http://gntest.phone.androidscloud.com:1280'
 	    let timer,flag = true;
 		var url = window.location.href;
 		url = url.split('/')
@@ -227,7 +227,6 @@
 		(function(doc) {
 			var init = function () {
 				bindEvent();
-				headerAward();
 				goodsList();
 				rewardList();
 				allotTimeRecord();
@@ -268,12 +267,26 @@
 				$('.distribution-list-wrap').eq(0).css('display', 'none');
 				if(pages === 0) {
 					$('.no-award-data').eq(0).css('display', 'block');
+					$('.award-list').eq(0).css('display', 'none');
 				} else {
+					$('.award-list').eq(0).css('display', 'block');
 					$('.no-award-data').eq(0).css('display', 'none');
 				}
 			}
 
 			function tabHandle2 (e) {
+				if(activityState == 0){
+					stopManyClick(() =>{
+						toastr.error('活动未开始!');
+					})
+					return
+				}
+				if(activityState == 2){
+					stopManyClick(() =>{
+						toastr.error('活动已结束!');
+					})
+					return
+				}
 				operate('mfhd_2022_h5_tab分配奖励');
 				$('.tab-bg1').eq(0).css('display', 'none');
 				$('.tab-wrap').eq(0).css('height', '14.75rem');
@@ -356,6 +369,18 @@
 			}
 			// 开始抽奖
 			function startLottery(type){
+				if(activityState == 0){
+					stopManyClick(() =>{
+						toastr.error('活动未开始!');
+					})
+					return
+				}
+				if(activityState == 2){
+					stopManyClick(() =>{
+						toastr.error('活动已结束!');
+					})
+					return
+				}
 				if(lotteryCount === 0) {
 					operate('mfhd_2022_h5_购买云机');
 					getTimeHandle('buy');
@@ -446,6 +471,13 @@
 							if(type != 'down'){
 								$('.award-list-wrap').eq(0).empty();
 							}
+							if(pages === 0) {
+								$('.no-award-data').eq(0).css('display', 'block');
+								$('.award-list').eq(0).css('display', 'none');
+							} else {
+								$('.award-list').eq(0).css('display', 'block');
+								$('.no-award-data').eq(0).css('display', 'none');
+							}
 							let result = ''
 							list.map((item, index) => {
 								result += $('#awardRecord').text().replace(/{{(.*?)}}/g, function(node, key) {
@@ -496,6 +528,7 @@
 							awardData = res.data.marquee
 							let goodsInfos = res.data.goodsInfos
 							lotteryCount = res.data.lotteryCount
+							activityState = res.data.activityState
 							awardNumber = goodsInfos.length
 							let actRule = res.data.actRule
 							let result = ''
@@ -517,6 +550,7 @@
 							if(lotteryCount !== 0) {
 								$('.start-award')[0].src = '../static/img/awardActivity/start-award.png';
 							}
+							headerAward();
 							$('.rule-point-wrap').eq(0).html(actRule)
 							$('.times').eq(0).text(lotteryCount)
 							$('.all-award-wrap').eq(0).append(result)
@@ -530,6 +564,9 @@
 			}
 			//轮播
 			function headerAward(){
+				if(awardData.length === 0) {
+					return
+				}
 				setInterval(() =>{
 					awardHandle();
 				},3000);
@@ -537,12 +574,12 @@
 			function awardHandle(){
 				let index = (topVal/0.5) + 1,awardString;
 				let awardLen = Array.from($('.award-text')).length;
-				if(awardLen < 20){
+				if(awardLen < awardData.length){
 					let node = document.createElement('div');
 					node.className = "award-text";
 					$('.award-lists')[0].appendChild(node);
 				}
-				if(topVal < 9.5){
+				if(topVal < awardData.length/2 - 0.5){
 					topVal+=0.5;
 				}else{
 					topVal = 0;
@@ -551,9 +588,10 @@
 				let numberType = Math.floor(getRandom()/4);
 				if(awardData && awardData[index] && topVal < awardData.length/2){
 					awardString = `恭喜${awardData[index].phone}用户获得${['优惠券','激活码','云机时长','星币','云机套餐','谢谢惠顾'][awardData[index].goodsType]}奖品`;
-				}else{
-					awardString = `恭喜1${[3,5,7,8,3,5,7,8,3,5][getRandom()]}${getRandom()}****${getRandom()}${getRandom()}${getRandom()}${getRandom()}用户获得${['优惠券','激活码','云机时长','星币','云机套餐','谢谢惠顾'][numberType]}`
 				}
+				// else{
+				// 	awardString = `恭喜1${[3,5,7,8,3,5,7,8,3,5][getRandom()]}${getRandom()}****${getRandom()}${getRandom()}${getRandom()}${getRandom()}用户获得${['优惠券','激活码','云机时长','星币','云机套餐','谢谢惠顾'][numberType]}`
+				// }
 				$('.award-text').eq(index).text(awardString);
 				$('.award-lists').eq(0).animate({top: -(topVal) + 'rem'},"fast");
 			}
@@ -671,8 +709,16 @@
 				}
 			});
 			function getTimeHandle(type) {
+				if(activityState == 0){
+					stopManyClick(() =>{
+						toastr.error('活动未开始!');
+					})
+					return
+				}
 				if(activityState == 2){
-					toastr.error('活动已结束!');
+					stopManyClick(() =>{
+						toastr.error('活动已结束!');
+					})
 					return
 				}
 				if(type != 'bug') {