Browse Source

Merge branch 'dev-5.3' of Software/android-cloud-H5 into uat

heyang 3 years ago
parent
commit
8454d12b2b

+ 5 - 1
microserviceUserH5/static/css/anniversaryCelebrate.css

@@ -712,7 +712,7 @@ ul, li {
 
 .many-one-card{
   padding-top: 0.35rem;
-  margin-left: 1rem;
+  margin-left: 0.4rem;
 }
 
 .many-two-card{
@@ -905,6 +905,10 @@ ul, li {
   margin-left: 0.4rem;
 }
 
+.card-texts{
+  bottom: 0.01rem;
+}
+
 #toast-container>.toast-error {
   background-image: none !important;
 }

+ 5 - 4
microserviceUserH5/vcloud/anniversaryCelebrate.html

@@ -303,12 +303,12 @@
 	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
 	<script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script>
 	<script type="text/javascript">
-        // var baseUrl = 'http://14.18.190.141:1280'
+        // var baseUrl = 'http://prese.phone.androidscloud.com'
 	    let timer,flag = true;
 		var url = window.location.href;
 		url = url.split('/')
 		var loc = window.location.search,
-		    n1 = loc.length,//地址的总长度 many-one-card
+		    n1 = loc.length,//地址的总长度
 		    n2 = loc.indexOf("="),//取得=号的位置
 		    id = loc.substr(n2 + 1, n1 - n2),//从=号后面的内容
 			u = navigator.userAgent,
@@ -344,6 +344,7 @@
 			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
 		// 初始化数据
 		init();
+		getPhoneNumber();
 		function init() {
 			$.ajax({
 				url: baseUrl + '/api/activity/v1/anniversary/getAnniversary',
@@ -522,7 +523,7 @@
 									str += `<div class="card-item one-card-item">
 												<div class="card-item-wrap">
 													<img class="one-card" src="../static/img/anniversaryCelebrate/day-card.png" />
-													<div class="card-text">星曜${list[0].awardDurations}天卡</div>
+													<div class="card-text card-texts">星曜${list[0].awardDurations}天卡</div>
 												</div>
 											</div>`
 								} else {
@@ -594,7 +595,7 @@
 									str += `<div class="card-item many-card-item">
 												<div class="card-item-wrap card-item-wraps">
 													<img class="many-card" src="../static/img/anniversaryCelebrate/day-card.png" />
-													<div class="card-text">星曜${list[i].awardDurations}天卡</div>
+													<div class="card-text card-texts">星曜${list[i].awardDurations}天卡</div>
 												</div>
 											</div>`
 								} else {