Merge branch 'dev-5.2' of http://192.168.32.253:3000/Software/android-cloud-H5 into dev-5.2

microserviceUserH5/static/css/browser.css

@@ -67,16 +67,16 @@ input{
   display: flex;
   flex-wrap: wrap;
   margin-left: 0.2rem;
-  /* justify-content: center; */
+  position: relative;
 }
 .tag-item{
   width: 1.6rem;
-  height: 1.96rem;
+  /* height: 2.16rem; */
   background: #F4F9FF;
   border-radius: 0.2rem;
   display: flex;
   flex-direction: column;
-  justify-content: space-around;
+  /* justify-content: space-around; */
   padding-left: 0.1rem;
   padding-top: 0.24rem;
   margin-top: 0.3rem;
@@ -90,17 +90,24 @@ input{
   display: inline-block;
 }
 .icon-title{
+  margin-top: 0.1rem;
   font-family: SourceHanSansCN-Medium, SourceHanSansCN;
   font-size: 0.28rem;
   font-weight: 500;
   color: #333333;
 }
 .right-arrow{
+  position: absolute;
+  bottom: 0.16rem;
   width: 0.32rem;
   height: 0.32rem;
   display: inline-block;
 }
 
+.right-arrow-heght{
+  height: 0.52rem;
+}
+
 #toast-container>.toast-error {
   background-image: none !important;
   border-radius: 0.2rem;

microserviceUserH5/vcloud/browser.html

@@ -64,6 +64,7 @@
 								<img class="icon-row" data-plateName="${list[i].plateName}" data-id="${list[i].id}" src=${fileCenterApi}/document/newFile/download/0/3dn9b4585511476691c6?fileKey=${list[i].iconImage} />
 								<div class="icon-title" data-plateName="${list[i].plateName}" data-id="${list[i].id}">${list[i].plateName}</div>
 								<img class="right-arrow" src="../static/img/browser/right-arrow.png" data-plateName="${list[i].plateName}" data-id="${list[i].id}" />
+								<div class="right-arrow-heght"></div>
 							</div>`
 					}
 					tagDom.innerHTML = node;
@@ -73,6 +74,9 @@
 	tagDom.addEventListener('click',(e)=>{
 		let plateName = e.target.dataset.platename;
 		let id = e.target.dataset.id;
+		if(!id) {
+			return
+		}
 		$.ajax({
 			url: `${baseUrl}/api/public/v1/browserPlate/reportClickNum/${id}`,
 			type: 'get',

screenAndroid/WXtrialInterface.html

@@ -234,7 +234,7 @@
     var form = {};
     form.token = parameters['token'];
     form.userCardId = parameters['userCardId'];
-    var videoTimer = null, videoTime = 0, adType = 0, sourceType = 0, disconnectionFlag = false;
+    var videoTimer = null, videoTime = 0, adType = 0, sourceType = 0, disconnectionFlag = false, getDate = false;
     if (parameters['mealType'] === 'VIP') {
       $(".loading_sceen_pic").attr('src', '../static/img/home_bg_VIP.png');
     } else if (parameters['mealType'] === 'SVIP') {
@@ -271,6 +271,13 @@
         }
       });
     }
+    //云机倒计时
+    let validTime = parameters['validTime'];
+    setTimeout(() => {
+      $('.bug-title').eq(0).text('尊敬的用户您的云手机试用时间已到期');
+      getDate = true;
+      $('.buy-phone-wrap').eq(0).show();
+    }, validTime)
     var topwinHeight = window.screen.height - window.innerHeight + 30; //计算title top 头部  
     $('#wine').css({
       "width": window.screen.width,
@@ -1106,9 +1113,15 @@
         pointName = videoTime == 0 ? '激活码-关闭-去购买' : '激活码-强制关闭-去购买';
       }
       systemBuriedPoint(pointName);
-      wx.miniProgram.navigateTo({
-        url: '/packageA/order/renew/index?record=' + form.userCardId
-      })
+      if(getDate){
+        wx.miniProgram.navigateTo({
+          url: '/packageA/order/buy/index'
+        })
+      } else {
+        wx.miniProgram.navigateTo({
+          url: '/packageA/order/renew/index?record=' + form.userCardId
+        })
+      }
     })
     // 放弃
     $('.cannel-ad-btn')[0].addEventListener('click', () => {

screenIos/WXtrialInterface.html

@@ -670,7 +670,7 @@
           url: '/pages/home/home'
         })
       } else {
-        location.href = 'http://test_zt_ip62.phone.androidscloud.com/cloud/phone/web/#/pages/index/index'
+        location.href = 'http://14.18.190.141:1280/cloud/phone/web/#/pages/index/index'
         // 动态设置有问题 https://ask.dcloud.net.cn/question/96060
         // document.addEventListener('UniAppJSBridgeReady', function() {
         //   console.log(222)
@@ -803,7 +803,7 @@
                 url: '/pages/home/home'
               })
             } else {
-              location.href = 'http://test_zt_ip62.phone.androidscloud.com/cloud/phone/web/#/pages/index/index'
+              location.href =  `${baseUrl}/cloud/phone/web/#/pages/index/index`
               // document.addEventListener('UniAppJSBridgeReady', function() {
               //   uni.navigateTo({
               //     url: '/pages/index/index'
@@ -843,7 +843,7 @@
             url: '/pages/home/home'
           })
         } else {
-          location.href = 'http://test_zt_ip62.phone.androidscloud.com/cloud/phone/web/#/pages/index/index'
+          location.href = `${baseUrl}/cloud/phone/web/#/pages/index/index`
           // document.addEventListener('UniAppJSBridgeReady', function() {
           //   uni.navigateTo({
           //     url: '/pages/index/index'