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

static/microserviceUserH5/vcloud/awardActivity.html

@@ -356,7 +356,6 @@
 				let flag = $('.curr-award-id').eq(num).text();
 				if(flag == lotteryResult.id){
 					flagNum = num < 6 ? num + awardNumber : num;
-					console.log('flagNum', flagNum)
 				}
 				timer = setTimeout(() => {
 					if(num === awardNumber) {
@@ -651,10 +650,10 @@
 							unAllotTime = res.data.unAllotTime
 							userCardId = cardList[0] && cardList[0].userCardId
 							pageCardList()
-							$('.all-times').eq(0).text(res.data.totalTime)
+							$('.all-times').eq(0).text(unAllotTime)
 							$('.red').eq(0).text(res.data.totalTime)
 							$('.red').eq(1).text(res.data.allotTime)
-							$('.red').eq(2).text(res.data.unAllotTime)
+							$('.red').eq(2).text(unAllotTime)
 						}else{
 							stopManyClick(() =>{
 								toastr.error(res.msg)