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

static/microserviceUserH5/static/css/awardActivity.css

@@ -151,7 +151,7 @@ ul, li {
 .award-img{
   width: 1.08rem;
   height: 0.8rem;
-  background: #FFE3B7;
+  /* background: #FFE3B7; */
   border-radius: 0.08rem;
 }
 
@@ -169,7 +169,7 @@ ul, li {
 
 .curr-award-item-one{
   width: 1.78rem;
-  height: 1.82rem;
+  height: 1.72rem;
   margin-left: 0.16rem;
 }
 
@@ -442,6 +442,8 @@ ul, li {
   text-align: center;
   font-size: 0.32rem;
   color: #999999;
+  position: relative;
+  z-index: 99;
 }
 
 .cut{
@@ -675,10 +677,20 @@ input:focus{
 .card-img{
   width: 1.52rem;
   height: 1.52rem;
-  background: #FFF0DB;
+  /* background: #FFF0DB; */
   border-radius: 0.24rem;
 }
 
+.card-img1{
+  width: 1.46rem;
+  height: 1.08rem;
+}
+
+.card-img2{
+  width: 1.08rem;
+  height: 0.8rem;
+}
+
 .card-title{
   margin-top: 0.24rem;
   font-size: 0.32rem;

static/microserviceUserH5/vcloud/awardActivity.html

@@ -456,6 +456,11 @@
 				rewardList();
 				allotTimeCardList();
 				$('.main-contain').eq(0).append(result)
+				if(awardNumber === 9) {
+					$('.card-img')[0].className = 'card-img card-img1';
+				} else {
+					$('.card-img')[0].className = 'card-img card-img2';
+				}
 				$('.times').eq(0).text(lotteryResult.lotteryCount)
 			}
 			// 抽奖记录
@@ -611,7 +616,7 @@
 				}
 				let numberType = Math.floor(getRandom()/4);
 				if(awardData && awardData[index] && topVal < awardData.length/2){
-					awardString = `恭喜${awardData[index].phone}用户获得${['优惠券','激活码','云机时长','星币','云机套餐','谢谢惠顾'][awardData[index].goodsType]}奖品`;
+					awardString = `恭喜${awardData[index].phone}用户获得${awardData[index].goodsName}奖品`;
 				}
 				// else{
 				// 	awardString = `恭喜1${[3,5,7,8,3,5,7,8,3,5][getRandom()]}${getRandom()}****${getRandom()}${getRandom()}${getRandom()}${getRandom()}用户获得${['优惠券','激活码','云机时长','星币','云机套餐','谢谢惠顾'][numberType]}`
@@ -878,6 +883,7 @@
 				if(!lotteryFlag) {
 					return
 				}
+				console.log(e.target.className)
 				if(e.target.className === 'add'){
 					operate('mfhd_2022_h5_加号');
 					const id = e.target.dataset.id;