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

static/microserviceUserH5/static/css/awardActivity.css

@@ -27,7 +27,8 @@ ul, li {
   width: 7.5rem;
   position: absolute;
   top: 0;
-  left: 0;
+  left: 50%;
+  transform: translateX(-50%);
   z-index: -1;
 }
 
@@ -123,11 +124,14 @@ ul, li {
 }
 
 .all-award-wrap{
+  width: 6.2rem;
   position: absolute;
   top: 2.36rem;
-  left: 0.78rem;
+  left: 50%;
+  transform: translateX(-50%);
   display: flex;
   flex-wrap: wrap;
+  margin-left: 0.12rem;
 }
 
 .curr-award-item{
@@ -513,12 +517,20 @@ input:focus{
 
 .award-record-list-item{
   display: flex;
-  justify-content: space-between;
   font-size: 0.28rem;
   color: #666666;
   padding-bottom: 0.4rem;
 }
 
+.award-record-list-name{
+  min-width: 1.5rem;
+}
+
+.award-record-list-day{
+  min-width: 0.6rem;
+  text-align: right;
+}
+
 .result-mask,.rule-mask{
   width: 100%;
   height: 100vh;

static/microserviceUserH5/vcloud/awardActivity.html

@@ -95,7 +95,7 @@
 						<div class="rule-title">活动规则</div>
 						<div class="rule-title-icon"></div>
 					</div>
-					<div class="rule-point-wrap">
+					<div class="rule-point-wrap" style="white-space: pre-line;">
 						<!-- <div class="rule-point">1、活动期间，购买获得的抽取资格不限次数, 活动期间可用，活动结束后未使用的做过期处理。</div>
 						<div class="rule-point">2、参与活动的套餐是星曜月卡与年卡套餐，其他套餐不参与活动。</div>
 						<div class="rule-point">3、星币、激活码购买的订单不参与本次活动。</div>
@@ -141,7 +141,7 @@
 	<script type="text/html" id="award1">
 		<div class="curr-award-item curr-award-item-one">
 			<div class="curr-award-img curr-award-img-one">
-				<img class="award-img" src="{{icon}}" />
+				<img class="award-img curr-award-img-one" src="{{icon}}" />
 			</div>
 			<div class="curr-award-name">{{goodsName}}</div>
 			<div class="curr-award-id">{{id}}</div>
@@ -178,9 +178,9 @@
     </script>
 	<script type="text/html" id="record">
 		<div class="award-record-list-item">
-			<div class="award-record-list-content">{{diskName}}</div>
+			<div class="award-record-list-content award-record-list-name">{{diskName}}</div>
 			<div class="award-record-list-content">{{createTime}}</div>
-			<div class="award-record-list-content">{{validTime}}</div>
+			<div class="award-record-list-content award-record-list-day">{{validTime}}</div>
 		</div>
     </script>
 	<script>
@@ -497,6 +497,7 @@
 							}
 							let result = ''
 							list.map((item, index) => {
+								item.createTime = `${item.createTime.substring(5, 7)}月${item.createTime.substring(8, 10)}日${item.createTime.substring(11)}`
 								result += $('#awardRecord').text().replace(/{{(.*?)}}/g, function(node, key) {
 									return item[key];
 								})
@@ -552,9 +553,11 @@
 							let resultDom = goodsInfos.length === 9 ? $('#award1') : $('#award2');
 							if(goodsInfos.length === 9) {
 								$(".top-bg-one").css({"display": "block"})
+								$(".all-award-wrap").css({"marginLeft": "0.1rem"})
 								$(".top-bg-two").css({"display": "none"})
 							} else {
 								$(".top-bg-one").css({"display": "none"})
+								$(".all-award-wrap").css({"marginLeft": "0.14rem"})
 								$(".top-bg-two").css({"display": "block"})
 							}
 							goodsInfos.map((item, index) => {
@@ -780,6 +783,7 @@
 								$('.award-record-list-wrap').eq(0).empty();
 							}
 							list.map(item => {
+								item.createTime = `${item.createTime.substring(0, 4)}年${item.createTime.substring(5, 7)}月${item.createTime.substring(8, 10)}日${item.createTime.substring(11)}`
 								result += $('#record').text().replace(/{{(.*?)}}/g, function(node, key) {
 									return item[key];
 								})
@@ -867,6 +871,9 @@
 			}
 			//点击加减号
 			$('.distribution-container')[0].addEventListener('click',(e) => {
+				if(!lotteryFlag) {
+					return
+				}
 				if(e.target.className === 'add'){
 					operate('mfhd_2022_h5_加号');
 					const id = e.target.dataset.id;