Browse Source

完成H5悬浮功能样式调整, 放出退出并下机按钮

t_finder 2 years ago
parent
commit
33929703b1

+ 20 - 9
static/screenAndroid/WXtrialInterface.html

@@ -121,10 +121,14 @@
           <img src="../static/img/wx/jianqieban_icon.png" />
           <div>剪贴板</div>
         </div>
-        <div class="upload" id="upload" data-text="Signout" onclick="handleQuit()">
+        <div class="upload" id="upload" data-text="Signout" onclick="handleQuit('quit')">
           <img src="../static/img/wx/tuichu_icon.png" />
           <div>退出</div>
         </div>
+        <div class="upload" id="dormant" data-text="Dormant" onclick="handleQuit('dormant')">
+          <img src="../static/img/wx/tuichu_icon.png" />
+          <div>退出并下机</div>
+        </div>
       </div>
     </div>
     <div class="bottommains">
@@ -228,7 +232,7 @@
       <div class="countdown-container">
         <img class="countdown-img" src="img/countdown.png" />
         <div class="countdown-title">计费规则</div>
-        <div class="countdown-tip">进入云机开始计时,点击退出并下机停止<br/>计时。点击退出云机仍处于计时状态。</div>
+        <div class="countdown-tip">进入云机开始计时,点击退出并下机停止<br />计时。点击退出云机仍处于计时状态。</div>
         <div class="countdown-tip2">云机时长剩余:<span class="countdown-time"></span></div>
         <div class="countdown-btn">我知道了</div>
       </div>
@@ -259,6 +263,7 @@
     url = url.split('/');
     var baseUrl = url[0] + '//' + url[2];
 
+    // 获取url中"?"符后的字串
     var parameters = GetRequest();
     var token = parameters['token'];
     var mealType = parameters['mealType'];
@@ -272,6 +277,11 @@
       disconnectionFlag = false,
       getDate = false;
 
+    // 计时套餐显示退出并下机按钮
+    if (userCardType === 1) {
+      $('#dormant').css({ display: 'block' })
+    }
+
     var isDev =
       /^192\.168\./.test(location.host) ||
       /^127\.0\.0\.1/.test(location.host) ||
@@ -378,12 +388,12 @@
     // 根据id删除数据
     function deleteDB(db, storeName, id) {
       let request = db.transaction([storeName], 'readwrite').objectStore(storeName).delete(id)
-   
-      request.onsuccess = function() {
+
+      request.onsuccess = function () {
         console.log('数据删除成功')
       }
-   
-      request.onerror = function() {
+
+      request.onerror = function () {
         console.log('数据删除失败')
       }
     }
@@ -913,8 +923,9 @@
       };
     }
 
+    // 获取url中"?"符后的字串
     function GetRequest() {
-      var url = location.search; // 获取url中"?"符后的字串
+      var url = location.search;
       var obj = new Object();
       if (url.indexOf('?') != -1) {
         var str = url.substr(1);
@@ -1433,7 +1444,7 @@
         type: 'get',
         dataType: 'json',
         contentType: 'application/json;charset=UTF-8',
-      }).then(function (res) {});
+      }).then(function (res) { });
     }
 
     // 秒转化为时分秒
@@ -1580,7 +1591,7 @@
     // 播放广告
     function playAD() {
       var nowTime = Date.now();
-      if ( adData && $('.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();

+ 66 - 34
static/screenAndroid/css/WXtrialInterface.css

@@ -172,10 +172,11 @@ html {
 .leftmains {
   width: 3.5rem;
   /* height: 100%; */
-  background: #333333;
+  background: #020206;
   position: fixed;
   right: -4rem;
   top: 0;
+  opacity: 0.8;
   bottom: 50px;
   z-index: 2;
   transition: all 0.2s ease-in;
@@ -210,24 +211,25 @@ html {
   margin: 0 auto;
   width: 3rem;
   /* height: 1.8rem; */
-  line-height: 1.8rem;
+  line-height: 1.5rem;
   color: #fff;
   text-align: center;
   font-size: 16px;
   /* margin-top: 3rem; */
 }
-.upload + .upload {
+
+.upload+.upload {
   margin-top: 1rem;
 }
 
 .upload img {
-  width: 1.5rem;
-  height: 1.5rem;
+  width: 1.2rem;
+  height: 1.2rem;
 }
 
 .upload div {
   margin-top: -0.5rem;
-  font-size: 14px;
+  font-size: 12px;
 }
 
 .operation {
@@ -238,10 +240,14 @@ html {
   width: 100%;
 }
 
+#dormant {
+  display: none;
+}
+
 .bottommains {
   width: 100%;
   height: 50px;
-  background: #333333;
+  background: #020206;
   position: fixed;
   left: 0;
   bottom: 0;
@@ -519,7 +525,8 @@ li {
   display: none;
 }
 
-.time-lang-container, .countdown-container{
+.time-lang-container,
+.countdown-container {
   width: 80%;
   height: 356px;
   position: absolute;
@@ -533,36 +540,40 @@ li {
   align-items: center;
 }
 
-.time-lang-img, .countdown-img{
+.time-lang-img,
+.countdown-img {
   width: 104px;
   height: 140px;
 }
 
-.time-lang-title, .countdown-title{
+.time-lang-title,
+.countdown-title {
   margin-top: 0.34rem;
   font-size: 18px;
   font-weight: 600;
   color: #363636;
 }
 
-.time-lang-tip, .countdown-tip{
+.time-lang-tip,
+.countdown-tip {
   margin-top: 0.28rem;
   font-size: 14px;
   color: #757580;
   text-align: center;
 }
 
-.countdown-tip2{
+.countdown-tip2 {
   margin-top: 0.16rem;
   font-size: 14px;
   color: #757580;
 }
 
-.countdown-time{
+.countdown-time {
   color: #00DB88;
 }
 
-.time-lang-btn, .countdown-btn{
+.time-lang-btn,
+.countdown-btn {
   width: 244px;
   height: 50px;
   line-height: 50px;
@@ -575,7 +586,7 @@ li {
   color: #FFFFFF;
 }
 
-.countdown-btn{
+.countdown-btn {
   margin-top: 24px;
 }
 
@@ -590,7 +601,7 @@ li {
   border-radius: 0.66em;
 }
 
-.apply-container{
+.apply-container {
   width: 80%;
   height: 419px;
   position: absolute;
@@ -601,7 +612,7 @@ li {
   border-radius: 0.66em;
 }
 
-.apply-title{
+.apply-title {
   text-align: center;
   margin-top: 0.34rem;
   font-size: 16px;
@@ -609,12 +620,12 @@ li {
   color: #363636;
 }
 
-.apply-list{
+.apply-list {
   height: 290px;
   margin-top: 16px;
 }
 
-.apply-item{
+.apply-item {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -632,26 +643,26 @@ li {
   border-radius: 10px;
 }
 
-.apply-row{
+.apply-row {
   flex: 1;
   margin-left: 10px;
 }
 
-.apply-row-title{
+.apply-row-title {
   width: 140px;
-  overflow:hidden; 
-  text-overflow:ellipsis;
-  white-space:nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
   font-size: 16px;
   color: #363636;
 }
 
-.apply-row-down{
+.apply-row-down {
   font-size: 12px;
   color: #757580;
 }
 
-.apply-down-btn{
+.apply-down-btn {
   width: 68px;
   height: 30px;
   line-height: 30px;
@@ -662,7 +673,7 @@ li {
   color: #FFFFFF;
 }
 
-.apply-list-change{
+.apply-list-change {
   width: 244px;
   height: 50px;
   line-height: 50px;
@@ -849,6 +860,7 @@ li {
   box-sizing: border-box;
   display: none;
 }
+
 .dialog-mask {
   background-color: rgba(0, 0, 0, 0.6);
   position: absolute;
@@ -860,18 +872,22 @@ li {
   height: 100%;
   z-index: 0;
 }
+
 .dialog.show {
   display: flex;
 }
+
 .dialog * {
   box-sizing: inherit;
 }
+
 .dialog-content-border {
   width: 70vw;
   /* height: 70vw; */
   z-index: 1;
   position: relative;
 }
+
 .dialog-content {
   width: 100%;
   /* height: 100%; */
@@ -880,6 +896,7 @@ li {
   display: flex;
   flex-direction: column;
 }
+
 .dialog-header {
   display: flex;
   align-items: center;
@@ -888,11 +905,13 @@ li {
   padding: 0 5vw;
   border-bottom: 1px solid rgba(255, 255, 255, 0.2);
 }
+
 .dialog-btn {
   padding: 0.5rem;
   line-height: 1;
   color: rgba(255, 255, 255, 0.6);
 }
+
 .dialog-btn.confirm {
   color: #fff;
 }
@@ -901,25 +920,24 @@ li {
   overflow: hidden;
   padding: 1px;
   border-radius: 20px;
-  background: linear-gradient(
-    180deg,
-    rgba(118, 204, 255, 1),
-    rgba(195, 40, 255, 1)
-  );
+  background: linear-gradient(180deg,
+      rgba(118, 204, 255, 1),
+      rgba(195, 40, 255, 1));
 }
+
 #set-phone-size-dialog .dialog-content {
   overflow: hidden;
   border-radius: 20px;
   background-color: #000000;
 }
+
 .menu-btn {
   margin: 0 auto;
   width: 2.5rem;
-  height: 1.8rem;
   line-height: 1.8rem;
   color: #fff;
   text-align: center;
-  font-size: 15px;
+  font-size: 12px;
   margin-top: 1rem;
 }
 
@@ -927,6 +945,7 @@ li {
   /* margin-top: 2vw; */
   padding: 4vw 0;
 }
+
 .phone-size-item {
   height: 11.7333vw !important;
   /* text-align: center; */
@@ -936,6 +955,7 @@ li {
   align-items: center;
   justify-content: center;
 }
+
 .phone-size-item.active {
   color: #fff;
   font-size: 4.2667vw;
@@ -944,14 +964,17 @@ li {
   background-position: center center;
   background-repeat: no-repeat;
 }
+
 #box {
   display: flex;
   align-items: center;
   justify-content: center;
 }
+
 #playCanvas {
   flex: none;
 }
+
 #playCanvas.vertical {
   position: relative;
   transform: rotate(0deg);
@@ -959,6 +982,7 @@ li {
   width: 100vw;
   height: calc(100vh - 50px);
 }
+
 #playCanvas.horizontal {
   position: relative;
   transform: rotate(90deg);
@@ -985,16 +1009,19 @@ li {
   z-index: 10000;
   display: none;
 }
+
 .fnca {
   display: flex;
   flex-wrap: nowrap;
   justify-content: space-around;
   align-items: center;
 }
+
 .wh22 {
   width: 0.99rem;
   height: 0.99rem;
 }
+
 .line {
   width: 1px;
   height: 0.81rem;
@@ -1002,6 +1029,7 @@ li {
   border-radius: 1px;
   opacity: 0.3;
 }
+
 /* .dialog-jifei {
   width: 13.26rem;
   height: 13.17rem;
@@ -1018,12 +1046,14 @@ li {
   height: 5.88rem;
   margin: 0 auto;
 }
+
 .fs16 {
   font-size: 0.72rem;
   font-weight: 500;
   color: #363636;
   text-align: center;
 }
+
 .fs14 {
   font-size: 0.63rem;
   color: #757580;
@@ -1031,9 +1061,11 @@ li {
   margin-top: 0.45rem;
   text-align: center;
 }
+
 .c00DB88 {
   color: #00DB88;
 }
+
 .jishi-close-icon {
   width: 9.375rem;
   height: 1.81rem;

+ 39 - 21
static/screenAndroid/timer.js

@@ -1,26 +1,44 @@
-function handleQuit() {
-  if (userCardType === 1) {
-    $.actions({
-      actions: [{
-        text: "退出",
-        onClick: function () {
-          ws.close();
-          wsss.close();
-          quit();
-        }
-      }, {
-        text: "退出并下机",
-        onClick: function () {
-          downline();
-        }
-      }]
-    });
-  } else {
-    ws.close();
-    wsss.close();
-    quit();
+// function handleQuit() {
+//   if (userCardType === 1) {
+//     $.actions({
+//       actions: [{
+//         text: "退出",
+//         onClick: function () {
+//           ws.close();
+//           wsss.close();
+//           quit();
+//         }
+//       }, {
+//         text: "退出并下机",
+//         onClick: function () {
+//           downline();
+//         }
+//       }]
+//     });
+//   } else {
+//     ws.close();
+//     wsss.close();
+//     quit();
+//   }
+// }
+
+function handleQuit(action = "quit") {
+  switch (action) {
+    case 'quit':
+      return exit();
+    case 'dormant':
+      return downline();
   }
 }
+
+// 退出
+function exit() {
+  ws.close();
+  wsss.close();
+  quit();
+}
+
+// 退出并下机
 function downline() {
   $.ajax({
     url: baseUrl + '/api/resources/yearMember/downline?userCardId=' + userCardId,

+ 18 - 9
static/screenIos/WXtrialInterface.html

@@ -114,10 +114,14 @@
           <img src="../static/img/wx/jianqieban_icon.png" />
           <div>剪贴板</div>
         </div>
-        <div class="upload" id="upload" data-text="Signout" onclick="handleQuit()">
+        <div class="upload" id="upload" data-text="Signout" onclick="handleQuit('quit')">
           <img src="../static/img/wx/tuichu_icon.png" />
           <div>退出</div>
         </div>
+        <div class="upload" id="dormant" data-text="Dormant" onclick="handleQuit('dormant')">
+          <img src="../static/img/wx/tuichu_icon.png" />
+          <div>退出并下机</div>
+        </div>
       </div>
     </div>
     <div class="bottommains">
@@ -219,7 +223,7 @@
       <div class="countdown-container">
         <img class="countdown-img" src="img/countdown.png" />
         <div class="countdown-title">计费规则</div>
-        <div class="countdown-tip">进入云机开始计时,点击退出并下机停止<br/>计时。点击退出云机仍处于计时状态。</div>
+        <div class="countdown-tip">进入云机开始计时,点击退出并下机停止<br />计时。点击退出云机仍处于计时状态。</div>
         <div class="countdown-tip2">云机时长剩余:<span class="countdown-time"></span></div>
         <div class="countdown-btn">我知道了</div>
       </div>
@@ -356,6 +360,11 @@
       disconnectionFlag = false,
       getDate = false;
 
+    // 计时套餐显示退出并下机按钮
+    if (userCardType === 1) {
+      $('#dormant').css({ display: 'block' })
+    }
+
     if (mealType === 'VIP') {
       $('.loading_sceen_pic').attr('src', '../static/img/home_bg_VIP.png');
     } else if (mealType === 'SVIP') {
@@ -472,12 +481,12 @@
     // 根据id删除数据
     function deleteDB(db, storeName, id) {
       let request = db.transaction([storeName], 'readwrite').objectStore(storeName).delete(id)
-   
-      request.onsuccess = function() {
+
+      request.onsuccess = function () {
         console.log('数据删除成功')
       }
-   
-      request.onerror = function() {
+
+      request.onerror = function () {
         console.log('数据删除失败')
       }
     }
@@ -1412,7 +1421,7 @@
         type: 'get',
         dataType: 'json',
         contentType: 'application/json;charset=UTF-8',
-      }).then(function (res) {});
+      }).then(function (res) { });
     }
 
     // 秒转化为时分秒
@@ -1664,7 +1673,7 @@
             url: '/packageA/order/buy/index?buyType=试用界面购买',
           });
         } else {
-          if(userCardType === 1) {
+          if (userCardType === 1) {
             uni.webView.navigateTo({
               url: '/pages/order/renewTime',
             });
@@ -1684,7 +1693,7 @@
               }&record=` + userCardId,
           });
         } else {
-          if(userCardType === 1) {
+          if (userCardType === 1) {
             uni.webView.navigateTo({
               url: '/pages/order/renewTime',
             });

+ 82 - 40
static/screenIos/css/WXtrialInterface.css

@@ -172,10 +172,11 @@ html {
 .leftmains {
   width: 3.5rem;
   /* height: 100%; */
-  background: #333333;
+  background: #020206;
   position: fixed;
   right: -4rem;
   top: 0;
+  opacity: 0.8;
   bottom: 50px;
   z-index: 2;
   transition: all 0.2s ease-in;
@@ -210,24 +211,25 @@ html {
   margin: 0 auto;
   width: 3rem;
   /* height: 1.8rem; */
-  line-height: 1.8rem;
+  line-height: 1.5rem;
   color: #fff;
   text-align: center;
   font-size: 16px;
   /* margin-top: 3rem; */
 }
-.upload + .upload {
+
+.upload+.upload {
   margin-top: 1rem;
 }
 
 .upload img {
-  width: 1.5rem;
-  height: 1.5rem;
+  width: 1.2rem;
+  height: 1.2rem;
 }
 
 .upload div {
   margin-top: -0.5rem;
-  font-size: 14px;
+  font-size: 12px;
 }
 
 .operation {
@@ -238,10 +240,14 @@ html {
   width: 100%;
 }
 
+#dormant {
+  display: none;
+}
+
 .bottommains {
   width: 100%;
   height: 50px;
-  background: #333333;
+  background: #020206;
   position: fixed;
   left: 0;
   bottom: 0;
@@ -498,19 +504,28 @@ li {
   left: 0;
   z-index: 4;
 }
+
 * {
-  -webkit-touch-callout: none; /*系统默认菜单被禁用*/
-  -webkit-user-select: none; /*webkit浏览器*/
-  -khtml-user-select: none; /*早期浏览器*/
-  -moz-user-select: none; /*火狐*/
-  -ms-user-select: none; /*IE10*/
+  -webkit-touch-callout: none;
+  /*系统默认菜单被禁用*/
+  -webkit-user-select: none;
+  /*webkit浏览器*/
+  -khtml-user-select: none;
+  /*早期浏览器*/
+  -moz-user-select: none;
+  /*火狐*/
+  -ms-user-select: none;
+  /*IE10*/
   user-select: none;
 }
+
 input,
 textarea {
-  -webkit-user-select: auto; /*webkit浏览器*/
+  -webkit-user-select: auto;
+  /*webkit浏览器*/
   outline: none;
 }
+
 .bottommains img {
   pointer-events: none;
 }
@@ -531,7 +546,8 @@ textarea {
   display: none;
 }
 
-.time-lang-container, .countdown-container{
+.time-lang-container,
+.countdown-container {
   width: 80%;
   height: 356px;
   position: absolute;
@@ -545,36 +561,40 @@ textarea {
   align-items: center;
 }
 
-.time-lang-img, .countdown-img{
+.time-lang-img,
+.countdown-img {
   width: 104px;
   height: 140px;
 }
 
-.time-lang-title, .countdown-title{
+.time-lang-title,
+.countdown-title {
   margin-top: 0.34rem;
   font-size: 18px;
   font-weight: 600;
   color: #363636;
 }
 
-.time-lang-tip, .countdown-tip{
+.time-lang-tip,
+.countdown-tip {
   margin-top: 0.28rem;
   font-size: 14px;
   color: #757580;
   text-align: center;
 }
 
-.countdown-tip2{
+.countdown-tip2 {
   margin-top: 0.16rem;
   font-size: 14px;
   color: #757580;
 }
 
-.countdown-time{
+.countdown-time {
   color: #00DB88;
 }
 
-.time-lang-btn, .countdown-btn{
+.time-lang-btn,
+.countdown-btn {
   width: 244px;
   height: 50px;
   line-height: 50px;
@@ -587,7 +607,7 @@ textarea {
   color: #FFFFFF;
 }
 
-.countdown-btn{
+.countdown-btn {
   margin-top: 24px;
 }
 
@@ -602,7 +622,7 @@ textarea {
   border-radius: 0.66em;
 }
 
-.apply-container{
+.apply-container {
   width: 80%;
   height: 419px;
   position: absolute;
@@ -613,7 +633,7 @@ textarea {
   border-radius: 0.66em;
 }
 
-.apply-title{
+.apply-title {
   text-align: center;
   margin-top: 0.34rem;
   font-size: 16px;
@@ -621,12 +641,12 @@ textarea {
   color: #363636;
 }
 
-.apply-list{
+.apply-list {
   height: 290px;
   margin-top: 16px;
 }
 
-.apply-item{
+.apply-item {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -644,26 +664,26 @@ textarea {
   border-radius: 10px;
 }
 
-.apply-row{
+.apply-row {
   flex: 1;
   margin-left: 10px;
 }
 
-.apply-row-title{
+.apply-row-title {
   width: 140px;
-  overflow:hidden; 
-  text-overflow:ellipsis;
-  white-space:nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
   font-size: 16px;
   color: #363636;
 }
 
-.apply-row-down{
+.apply-row-down {
   font-size: 12px;
   color: #757580;
 }
 
-.apply-down-btn{
+.apply-down-btn {
   width: 68px;
   height: 30px;
   line-height: 30px;
@@ -674,7 +694,7 @@ textarea {
   color: #FFFFFF;
 }
 
-.apply-list-change{
+.apply-list-change {
   width: 244px;
   height: 50px;
   line-height: 50px;
@@ -776,6 +796,7 @@ textarea {
   box-sizing: border-box;
   display: none;
 }
+
 .dialog-mask {
   background-color: rgba(0, 0, 0, 0.6);
   position: absolute;
@@ -787,18 +808,22 @@ textarea {
   height: 100%;
   z-index: 0;
 }
+
 .dialog.show {
   display: flex;
 }
+
 .dialog * {
   box-sizing: inherit;
 }
+
 .dialog-content-border {
   width: 70vw;
   /* height: 70vw; */
   z-index: 1;
   position: relative;
 }
+
 .dialog-content {
   width: 100%;
   /* height: 100%; */
@@ -807,6 +832,7 @@ textarea {
   display: flex;
   flex-direction: column;
 }
+
 .dialog-header {
   display: flex;
   align-items: center;
@@ -815,11 +841,13 @@ textarea {
   padding: 0 5vw;
   border-bottom: 1px solid rgba(255, 255, 255, 0.2);
 }
+
 .dialog-btn {
   padding: 0.5rem;
   line-height: 1;
   color: rgba(255, 255, 255, 0.6);
 }
+
 .dialog-btn.confirm {
   color: #fff;
 }
@@ -828,25 +856,24 @@ textarea {
   overflow: hidden;
   padding: 1px;
   border-radius: 20px;
-  background: linear-gradient(
-    180deg,
-    rgba(118, 204, 255, 1),
-    rgba(195, 40, 255, 1)
-  );
+  background: linear-gradient(180deg,
+      rgba(118, 204, 255, 1),
+      rgba(195, 40, 255, 1));
 }
+
 #set-phone-size-dialog .dialog-content {
   overflow: hidden;
   border-radius: 20px;
   background-color: #000000;
 }
+
 .menu-btn {
   margin: 0 auto;
   width: 2.5rem;
-  height: 1.8rem;
   line-height: 1.8rem;
   color: #fff;
   text-align: center;
-  font-size: 15px;
+  font-size: 12px;
   margin-top: 1rem;
 }
 
@@ -854,6 +881,7 @@ textarea {
   /* margin-top: 2vw; */
   padding: 4vw 0;
 }
+
 .phone-size-item {
   height: 11.7333vw !important;
   /* text-align: center; */
@@ -863,6 +891,7 @@ textarea {
   align-items: center;
   justify-content: center;
 }
+
 .phone-size-item.active {
   color: #fff;
   font-size: 4.2667vw;
@@ -871,14 +900,17 @@ textarea {
   background-position: center center;
   background-repeat: no-repeat;
 }
+
 #box {
   display: flex;
   align-items: center;
   justify-content: center;
 }
+
 #playCanvas {
   flex: none;
 }
+
 #playCanvas.vertical {
   position: relative;
   transform: rotate(0deg);
@@ -886,6 +918,7 @@ textarea {
   width: 100vw;
   height: calc(100vh - 50px);
 }
+
 #playCanvas.horizontal {
   position: relative;
   transform: rotate(90deg);
@@ -893,6 +926,7 @@ textarea {
   width: calc(100vh - 50px);
   height: 100vw;
 }
+
 .count-view {
   min-width: 5.16rem;
   height: 1.63rem;
@@ -911,16 +945,19 @@ textarea {
   z-index: 10000;
   display: none;
 }
+
 .fnca {
   display: flex;
   flex-wrap: nowrap;
   justify-content: space-around;
   align-items: center;
 }
+
 .wh22 {
   width: 0.99rem;
   height: 0.99rem;
 }
+
 .line {
   width: 1px;
   height: 0.81rem;
@@ -928,6 +965,7 @@ textarea {
   border-radius: 1px;
   opacity: 0.3;
 }
+
 /* .dialog-jifei {
   width: 13.26rem;
   height: 13.17rem;
@@ -944,12 +982,14 @@ textarea {
   height: 5.88rem;
   margin: 0 auto;
 }
+
 .fs16 {
   font-size: 0.72rem;
   font-weight: 500;
   color: #363636;
   text-align: center;
 }
+
 .fs14 {
   font-size: 0.63rem;
   color: #757580;
@@ -957,9 +997,11 @@ textarea {
   margin-top: 0.45rem;
   text-align: center;
 }
+
 .c00DB88 {
   color: #00DB88;
 }
+
 .jishi-close-icon {
   width: 9.375rem;
   height: 1.81rem;

+ 39 - 21
static/screenIos/timer.js

@@ -1,26 +1,44 @@
-function handleQuit() {
-  if (userCardType === 1) {
-    $.actions({
-      actions: [{
-        text: "退出",
-        onClick: function () {
-          decodeWoker.postMessage('close');
-          decodeWoker.terminate();
-          quit();
-        }
-      }, {
-        text: "退出并下机",
-        onClick: function () {
-          downline();
-        }
-      }]
-    });
-  } else {
-    decodeWoker.postMessage('close');
-    decodeWoker.terminate();
-    quit();
+// function handleQuit() {
+//   if (userCardType === 1) {
+//     $.actions({
+//       actions: [{
+//         text: "退出",
+//         onClick: function () {
+//           decodeWoker.postMessage('close');
+//           decodeWoker.terminate();
+//           quit();
+//         }
+//       }, {
+//         text: "退出并下机",
+//         onClick: function () {
+//           downline();
+//         }
+//       }]
+//     });
+//   } else {
+//     decodeWoker.postMessage('close');
+//     decodeWoker.terminate();
+//     quit();
+//   }
+// }
+
+function handleQuit(action = "quit") {
+  switch (action) {
+    case 'quit':
+      return exit();
+    case 'dormant':
+      return downline();
   }
 }
+
+// 退出
+function exit() {
+  decodeWoker.postMessage('close');
+  decodeWoker.terminate();
+  quit();
+}
+
+// 退出并下机
 function downline() {
   $.ajax({
     url: baseUrl + '/api/resources/yearMember/downline?userCardId=' + userCardId,