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

static/microserviceUserH5/static/css/awardActivity.css

@@ -149,15 +149,17 @@ ul, li {
 
 .award-img{
   width: 1.08rem;
-  height: 0.88rem;
+  height: 0.8rem;
   background: #FFE3B7;
   border-radius: 0.08rem;
 }
 
 .curr-award-name{
-  margin-top: 0.12rem;
-  font-size: 0.2rem;
+  margin-top: 0.08rem;
+  padding: 0 0.12rem;
+  font-size: 0.16rem;
   color: #E4402F;
+  text-align: center;
 }
 
 .curr-award-id{
@@ -166,7 +168,7 @@ ul, li {
 
 .curr-award-item-one{
   width: 1.78rem;
-  height: 1.78rem;
+  height: 1.82rem;
   margin-left: 0.16rem;
 }
 

static/microserviceUserH5/vcloud/awardActivity.html

@@ -725,10 +725,14 @@
 								}
 							})
 							$('.num-ipt').eq(index).val(val);
-							stopManyClick(() => {
-								toastr.error('分配时长不能大于未分配总时长');
-							})
-							return
+							if(!lotteryFlag) {
+								return
+							} else {
+								stopManyClick(() => {
+									toastr.error('分配时长不能大于未分配总时长');
+								})
+								return
+							}
 						}
 						if(value.length > 5) value = value.slice(0, 5);
 						$('.num-ipt').eq(index).val(value);