Browse Source

调整免费活动

heyang 2 years ago
parent
commit
a6fa165df1

+ 3 - 8
static/microserviceUserH5/static/css/awardActivity.css

@@ -143,18 +143,13 @@ ul, li {
   margin-bottom: 0.12rem;
 }
 
-.curr-award-img{
+.award-img{
   width: 1.08rem;
   height: 0.88rem;
   background: #FFE3B7;
   border-radius: 0.08rem;
 }
 
-.award-img{
-  width: 100%;
-  height: 100%;
-}
-
 .curr-award-name{
   margin-top: 0.12rem;
   font-size: 0.2rem;
@@ -178,10 +173,10 @@ ul, li {
 
 .rest-wrap{
   width: 7.5rem;
-  min-height: 66vh;
+  /* min-height: 66vh; */
   margin: 0 auto;
   margin-top: -0.04rem;
-  padding-bottom: 0.76rem;
+  padding-bottom: 1.56rem;
   background-image: url('../img/awardActivity/rest-bg.png');
   background-repeat: repeat-y;
   background-size: cover;

+ 3 - 13
static/microserviceUserH5/vcloud/awardActivity.html

@@ -149,9 +149,7 @@
     </script>
 	<script type="text/html" id="award2">
 		<div class="curr-award-item">
-			<div class="curr-award-img">
-				<!-- <img class="award-img" src="{{icon}}" /> -->
-			</div>
+			<img class="award-img" src="{{icon}}" />
 			<div class="curr-award-name">{{goodsName}}</div>
 			<div class="curr-award-id">{{id}}</div>
 		</div>
@@ -391,7 +389,7 @@
 					})
 					return
 				}
-				if(lotteryCount === 0) {
+				if(lotteryCount <= 0) {
 					operate('mfhd_2022_h5_购买云机');
 					getTimeHandle('buy');
 					return
@@ -408,7 +406,6 @@
 					return
 				}
 				let num = flagNum > awardNumber ? flagNum - awardNumber : flagNum;
-				console.log(num);
 				$('.curr-award-item').eq(num).css('background', '#ffffff');
 				$.ajax({
 					url: baseUrl + '/api/activity/gratis/startLottery',
@@ -567,7 +564,7 @@
 									return item[key];
 								})
 							})
-							if(lotteryCount !== 0) {
+							if(lotteryCount > 0) {
 								$('.start-award')[0].src = '../static/img/awardActivity/start-award.png';
 							}
 							clearInterval(awardTimer);
@@ -678,9 +675,6 @@
 				})
 				$('.distribution-container').eq(0).append(result);
 				for (var i = 0; i < list.length; i++) {
-					console.log(pageNum1)
-					console.log(pageNum1 * 5 + i)
-					console.log($('.num-ipt')[pageNum1 * 5 + i])
 					$('.num-ipt')[pageNum1 * 5 + i].oninput = function (e) {
 						const id = e.target.dataset.id;
 						let oldDuration = 0;
@@ -783,7 +777,6 @@
 							pages2 = res.data.pages
 							recordFlag2 = true;
 							if(type != 'down'){
-								console.log('清空')
 								$('.award-record-list-wrap').eq(0).empty();
 							}
 							list.map(item => {
@@ -917,7 +910,6 @@
 							toastr.error('分配时长不能大于未分配总时长');
 						})
 					}
-					console.log(distributionList)
 				}
 				if(e.target.className === 'cut'){
 					operate('mfhd_2022_h5_减号');
@@ -941,7 +933,6 @@
 							toastr.error('分配的时长不能小于0');
 						})
 					}
-					console.log(distributionList)
 				}
 			});
 			function distributionTime(e) {
@@ -950,7 +941,6 @@
 				}
 				operate('mfhd_2022_h5_分配奖励');
 				distributionList = distributionList.filter(item => item.allotTime != 0);
-				console.log(distributionList)
 				if (distributionList.length === 0) {
 					stopManyClick(() => {
 						toastr.error('未选中任何云手机');