优化

microserviceUserH5/vcloud/doubleChristmasActivity.html

@@ -169,7 +169,7 @@
 		url = url.split('/');
 		var topVal = -0.5;
 		let obj = {};
-		// var baseUrl = 'http://test.androidscloud.com'
+		// var baseUrl = 'http://per.cs.se.androidscloud.com'
 		var loc = window.location.search,
 			n1 = loc.length,//地址的总长度
 			n2 = loc.indexOf("="),//取得=号的位置
@@ -208,7 +208,19 @@
 		getLists();
 		//点击立即参与按钮
 		$('.join-activity-btn')[0].addEventListener('click', () => {
-			operate('dt_双旦_h5_立即参与');
+			if(activityState == 0){
+				stopManyClick(() => {
+					toastr.error('活动未开始');
+				})
+				return
+			}else if(activityState == 1){
+			    operate('dt_双旦_h5_立即参与');
+			}else if(activityState == 2){
+				stopManyClick(() => {
+					toastr.error('活动已结束');
+				})
+				return
+			}
 			if (isMiniprogram) { // 小程序
 				wx.miniProgram.navigateTo({
 					url: '/packageA/order/buy/index?type=activity'
@@ -391,12 +403,12 @@
 								</div>
 							</div>`
 							str += `<div class="reward-last-tip">已获得奖励请在分配奖励栏中进行时长分配</div>`
+							const noDistributionDuration = rewardDuration - usedDuration;
 							$('.reward-list').eq(0).append(str);
-							$('.time-number').eq(0).text(rewardDuration);
+							$('.time-number').eq(0).text(noDistributionDuration);
 							$('.total-time-num').eq(0).text(totalDuration);
 							$('.next-time-num').eq(0).text(nextDuration);
 							$('.distribution-total-num').eq(0).text(rewardDuration);
-							const noDistributionDuration = rewardDuration - usedDuration;
 						    $('.time-title-usedDuration').eq(0).text(usedDuration);
 							totalTime = noDistributionDuration;
 							$('.no-distribution-num').eq(0).text(noDistributionDuration);