调整

microserviceUserH5/vcloud/doubleChristmasActivity.html

@@ -20,7 +20,7 @@
 	<div class="container">
 		<div class="header-container">
 			<img class="top-banner" src="../static/img/doubleChristmasActivity/top-banner.png" />
-			<div class="activity-meal">活动参与套餐：星耀套餐</div>
+			<div class="activity-meal">活动参与套餐：星曜套餐</div>
 			<div class="meal-price">云机低至<span class="meal-price-num"></span>元/天</div>
 			<div class="rest-time"></div>
 			<div class="limit">PC端用户不参与本次活动</div>
@@ -59,7 +59,7 @@
 			<div class="rest-tip">使用激活码，优惠券和星币支付不参与活动</div>
 			<div class="tab-row">
 				<div class="tab-item tab-active" data-index="0">充值奖励</div>
-				<div class="tab-item" data-index="1">分配奖励（<span class="time-number"></span>）</div>
+				<div class="tab-item" data-index="1">分配奖励（<span class="time-number">0</span>）</div>
 				<img class="tab-bg" src="../static/img/doubleChristmasActivity/tab-bg.png" />
 			</div>
 			<div class="reward-container">
@@ -87,13 +87,13 @@
 				<div class="distribution-time">
 					<div>
 						<span class="distribution-text">奖励总时长</span>
-						<span class="distribution-total-num"></span>
+						<span class="distribution-total-num">0</span>
 						<span class="distribution-text">天</span>
 					</div>
 					<span class="distribution-line">|</span>
 					<div>
 						<span class="distribution-text">未分配时长</span>
-						<span class="no-distribution-num"></span>
+						<span class="no-distribution-num">0</span>
 						<span class="distribution-text">天</span>
 					</div>
 				</div>
@@ -194,6 +194,7 @@
 		let tabIndex = 0,
 		    userName = '',
 		    totalTime = 0,
+			activityState = 0,
 		    christmasDoubleReward = 0,
 		    currTotalTime = 0,
 		    distributionList = [],
@@ -275,6 +276,7 @@
 					getList();
 					const objData = res.data;
 					userName = objData.userName;
+					activityState = objData.activityState;
 	            	distributionRecord();
 					christmasDoubleReward = objData.christmasDoubleReward;
 					// 解决ios时间显示为NaN
@@ -291,6 +293,16 @@
 						minute = parseInt(result / 1000 / 60 % 60),
 						seconds = parseInt(result / 1000 % 60),
 						time = day + "天" + hour + "时" + minute + "分" + seconds + "秒";
+						if (day == 0 && hour == 0 && minute == 0 && seconds == 0 || objData.activityState == 2) {
+							astr = '活动已结束';
+						    $('.activity-finish').eq(0).css('display', 'block');
+					        $('.rest-time').eq(0).text(astr);
+							return
+						}else if(objData.activityState == 0){
+							astr = '活动未开始';
+					        $('.rest-time').eq(0).text(astr);
+							return
+						}
 					const timeInterval = setInterval(() => {
 						if (seconds > 0) {
 							seconds--;
@@ -311,13 +323,14 @@
 						}
 						time = day + "天" + hour + "时" + minute + "分" + seconds + "秒";
 						let str = `距离活动结束：${time}`
+						if (day == 0 && hour == 0 && minute == 0 && seconds == 0 || objData.activityState == 2) {
+							str = '活动已结束';
+							clearInterval(timeInterval);
+						    $('.activity-finish').eq(0).css('display', 'block');
+						}
 						$('.rest-time').eq(0).text(str);
 					}, 1000)
 					let str = `距离活动结束：${time}`
-					if (day == 0 && hour == 0 && minute == 0 && seconds == 0 || objData.activityEnd) {
-						str = '已结束'
-						getList()
-					}
 					$('.rest-time').eq(0).text(str);
 				},
 			})
@@ -391,7 +404,9 @@
 								$('.next-reward').eq(0).css('display', 'none');
 							}
 						}
-					} else {
+					} else if(res.status === 4104) {
+						let sliderItemDom = `<div class="slider-item no-slider">暂无活动开启</div>`;
+						$('.reward-container').eq(0).append(sliderItemDom);
 						stopManyClick(() => {
 							toastr.error(res.msg);
 						})
@@ -655,7 +670,6 @@
 						distributionList.map((val) => {
 							totalRecords.map((item, indexs) => {
 								if(val.cardId == item.id){
-									console.log('indexs',indexs)
 									$('.ipt').eq(indexs).val(0);
 								}
 							})