Explorar el Código

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

heyang hace 2 años
padre
commit
68b7b70384

+ 2 - 1
static/microserviceUserH5/static/css/awardActivity.css

@@ -119,6 +119,7 @@ ul, li {
 }
 
 .award-text{
+  height: 0.5rem;
   font-size: 0.24rem;
   color: #ffffff;
 }
@@ -183,7 +184,7 @@ ul, li {
   /* min-height: 66vh; */
   margin: 0 auto;
   margin-top: -0.04rem;
-  padding-bottom: 1.56rem;
+  padding-bottom: 2rem;
   background-image: url('../img/awardActivity/rest-bg.png');
   background-repeat: repeat-y;
   background-size: cover;

+ 5 - 2
static/microserviceUserH5/vcloud/awardActivity.html

@@ -433,7 +433,7 @@
 			//抽奖结果展示
 			function lotteryResultHandle() {
 				$('.main-contain').eq(0).empty();
-				$('.result-dialog').animate({top: '3.86rem'},"fast");
+				$('.result-dialog').animate({top: '2.86rem'},"fast");
 				$('.result-mask').show();
 				document.documentElement.style.overflow='hidden';
 				lotteryFlag = true;
@@ -455,6 +455,9 @@
 				pageNum = 1;
 				rewardList();
 				allotTimeCardList();
+				if (isAndroid && window.native) { // 安卓
+					window.native.refreshPhoneList();
+				}
 				$('.main-contain').eq(0).append(result)
 				if(awardNumber === 9) {
 					$('.card-img')[0].className = 'card-img card-img1';
@@ -1067,7 +1070,7 @@
 			});
 			function ruleHandle (e) {
 				operate('mfhd_2022_h5_规则');
-				$('.rule-result-dialog').animate({top: '3.86rem'},"fast");
+				$('.rule-result-dialog').animate({top: '2.86rem'},"fast");
 				$('.rule-mask').show();
 				document.documentElement.style.overflow='hidden';
 			}