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

pages/activity/doubleEleven/index.vue

@@ -85,7 +85,7 @@
               <div class="content">
                 <div class="title">月卡套餐7折优惠券</div>
                 <div class="tips">满90元可用，优惠券有效期<span style="color:#D358A8">3</span>天</div>
-                <div class="number">有效期:2022.11.10 16:28:52</div>
+                <div class="number">有效期至 2022.11.10 16:28</div>
               </div>
             </div> -->
 
@@ -433,8 +433,8 @@ img {
   background: url('../../../assets/image/activity/double-eleven/bj2.png') no-repeat;
   background-size: 100% 100%;
   padding-top: 210px;
-  padding-left: 20px;
-  padding-right: 20px;
+  padding-left: 15px;
+  padding-right: 15px;
 
   .coupon {
     width: 255px;

pages/activity/doubleEleven/pc.vue

@@ -82,7 +82,7 @@
                 <div class="content">
                   <div class="title-coupon">月卡套餐7折优惠券</div>
                   <div class="tips">满90元可用，优惠券有效期<span style="color:#D358A8">3</span>天</div>
-                  <div class="number">有效期:2022.11.10 16:28</div>
+                  <div class="number">有效期至 2022.11.10 16:28</div>
                 </div>
               </div> -->
 

static/screenAndroid/WXtrialInterface.html

@@ -228,7 +228,7 @@
       <div class="countdown-container">
         <img class="countdown-img" src="img/countdown.png" />
         <div class="countdown-title">计费规则</div>
-        <div class="countdown-tip">进入云机开始计时，下机停止计时</div>
+        <div class="countdown-tip">进入云机开始计时，点击退出并下机停止<br/>计时。点击退出云机仍处于计时状态。</div>
         <div class="countdown-tip2">云机时长剩余：<span class="countdown-time"></span></div>
         <div class="countdown-btn">我知道了</div>
       </div>
@@ -267,9 +267,8 @@
     var videoTimer = null,
       videoTime = 0,
       adType = 0,
-      sourceType = isNaN(parameters['sourceType'])
-        ? 0
-        : +parameters['sourceType'],
+      sourceType = isNaN(parameters['sourceType']) ? 0 : +parameters['sourceType'],
+      userCardType = isNaN(parameters['userCardType']) ? 0 : +parameters['userCardType'],
       disconnectionFlag = false,
       getDate = false;
 
@@ -1391,7 +1390,7 @@
     // 获取云机剩余时长
     function getResidueTime() {
       clearInterval(residueTimer);
-      if (sourceType !== 5) {
+      if (userCardType !== 1) {
         return
       }
       return $.ajax({
@@ -1423,7 +1422,7 @@
 
     // 客户端成功进入云手机后调用
     function startTime() {
-      if (sourceType !== 5) {
+      if (userCardType !== 1) {
         return
       }
       return $.ajax({
@@ -1581,12 +1580,7 @@
     // 播放广告
     function playAD() {
       var nowTime = Date.now();
-      if (
-        adData &&
-        // [1, 2].includes(sourceType) &&
-        $('.try-use-wrap').eq(0).is(':hidden') &&
-        nowTime > adLastTime + intervalTime
-      ) {
+      if ( adData && $('.try-use-wrap').eq(0).is(':hidden') && nowTime > adLastTime + intervalTime ) {
         $('#source').attr('src', adData.adVideoBase.videoUrl);
         $('.try-use-wrap').eq(0).show();
         $('#source')[0].play();

static/screenAndroid/timer.js

@@ -1,5 +1,5 @@
 function handleQuit() {
-  if (sourceType === 5) {
+  if (userCardType === 1) {
     $.actions({
       actions: [{
         text: "退出",

static/screenIos/WXtrialInterface.html

@@ -219,7 +219,7 @@
       <div class="countdown-container">
         <img class="countdown-img" src="img/countdown.png" />
         <div class="countdown-title">计费规则</div>
-        <div class="countdown-tip">进入云机开始计时，下机停止计时</div>
+        <div class="countdown-tip">进入云机开始计时，点击退出并下机停止<br/>计时。点击退出云机仍处于计时状态。</div>
         <div class="countdown-tip2">云机时长剩余：<span class="countdown-time"></span></div>
         <div class="countdown-btn">我知道了</div>
       </div>
@@ -351,9 +351,8 @@
     var videoTimer = null,
       videoTime = 0,
       adType = 0,
-      sourceType = isNaN(parameters['sourceType'])
-        ? sourceType
-        : +parameters['sourceType'],
+      sourceType = isNaN(parameters['sourceType']) ? sourceType : +parameters['sourceType'],
+      userCardType = isNaN(parameters['userCardType']) ? userCardType : +parameters['userCardType'],
       disconnectionFlag = false,
       getDate = false;
 
@@ -1335,12 +1334,7 @@
     // 播放广告
     function playAD() {
       var nowTime = Date.now();
-      if (
-        adData &&
-        // [1, 2].includes(sourceType) &&
-        $('.try-use-wrap').eq(0).is(':hidden') &&
-        nowTime > adLastTime + intervalTime
-      ) {
+      if (adData && $('.try-use-wrap').eq(0).is(':hidden') && nowTime > adLastTime + intervalTime) {
         $('#source').attr('src', adData.adVideoBase.videoUrl);
         $('.try-use-wrap').eq(0).show();
         $('#source')[0].play();
@@ -1375,7 +1369,7 @@
     // 获取云机剩余时长
     function getResidueTime() {
       clearInterval(residueTimer);
-      if (sourceType !== 5) {
+      if (userCardType !== 1) {
         return
       }
       return $.ajax({
@@ -1407,7 +1401,7 @@
 
     // 客户端成功进入云手机后调用
     function startTime() {
-      if (sourceType !== 5) {
+      if (userCardType !== 1) {
         return
       }
       return $.ajax({

static/screenIos/timer.js

@@ -1,5 +1,5 @@
 function handleQuit() {
-  if (sourceType === 5) {
+  if (userCardType === 1) {
     $.actions({
       actions: [{
         text: "退出",