소스 검색

修改bug

huangxiaojing 3 년 전
부모
커밋
63d648ff59
5개의 변경된 파일64개의 추가작업 그리고 242개의 파일을 삭제
  1. 10 21
      microserviceUserH5/vcloud/register.html
  2. 2 26
      screenAndroid/WXdraw.js
  3. 24 91
      screenAndroid/WXtrialInterface.html
  4. 2 26
      screenIos/WXdraw.js
  5. 26 78
      screenIos/WXtrialInterface.html

+ 10 - 21
microserviceUserH5/vcloud/register.html

@@ -19,11 +19,12 @@
   <script src="../static/js/vender/base64.js"></script>
   <script src="../static/js/vender/verify.js"></script>
   <script src="../static/js/vender/ase.js"></script>
+  <script src="../static/js/vender/vue/config.js"></script>
   <script>
     toastr.options.positionClass = 'toast-center-center';
   </script>
   <style>
-    .my-tips{
+    .my-tips {
       position: fixed;
       top: 50%;
       left: 50%;
@@ -34,8 +35,7 @@
 </head>
 
 <body>
-  <div class="my-tips">当前功能维护中,暂无法使用</div>
-  <!-- <div id="mpanel2"></div>
+  <div id="mpanel2"></div>
   <div id="form-btn"></div>
   <div class="top free-code-con" style="position:relative;">
     <div>
@@ -70,8 +70,8 @@
         </div>
       </div>
     </div>
-  </div> -->
-  <!-- <script type="text/javascript" th:inline="javascript">
+  </div>
+  <script type="text/javascript" th:inline="javascript">
     var parameters = GetRequest();
     var phone = parameters["phone"];
     var timer, flag = true;
@@ -187,8 +187,7 @@
     function getHead(fileId) {
       $('.head img').attr('src', '../static/img/invite/header-img.png');
       if (fileId) {
-        let urls = baseUrl == 'http://prese.phone.androidscloud.com' ? 'http://110.53.221.195:8210' : 'https://wjzx.androidscloud.com:9091';
-        $('.head img').attr('src', `${urls}/document/newFile/download/0/347905r86eb745a1sc38?fileKey=` + fileId);
+        $('.head img').attr('src', `${fileCenterApi}/document/newFile/download/0/347905r86eb745a1sc38?fileKey=${fileId}`);
       }
     }
     function encrypt(word, keyStr) {
@@ -261,23 +260,13 @@
         url: baseUrl + '/api/user/v5/operateApi/addUserVisit',
         type: 'post',
         data: JSON.stringify({ "accessType": 2, "loginType": 2 }),
-        contentType:"application/json",
-				dataType: 'json',
-				cache: false,
+        contentType: "application/json",
+        dataType: 'json',
+        cache: false,
         success: function () {
         }
       })
     }
-    // function visit() {
-		// 	$.ajax({
-		// 		url: baseUrl + '/api/user/v3/invitation/client/addInviteData',
-		// 		type: 'get',
-		// 		cache: false,
-		// 		dataType: 'text',
-		// 		success: function () {
-		// 		}
-		// 	})
-		// }
     //防止提示一秒内重复显示
     function stopManyClick(fn) {
       if (flag) {
@@ -287,7 +276,7 @@
       if (timer) { clearTimeout(timer); }
       timer = setTimeout(() => { flag = true }, 1500);
     }
-  </script> -->
+  </script>
 </body>
 <style>
   #toast-container>.toast-error {

+ 2 - 26
screenAndroid/WXdraw.js

@@ -68,19 +68,7 @@ function doConnect() {
     wsss.close();
     throttle(doConnect, 100);
     if (errorTime > 1000) {
-      if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-        tt.miniProgram.switchTab({
-          url: '/pages/home/home'
-        })
-      } else if (window.__wxjs_environment === 'miniprogram') {
-        wx.miniProgram.switchTab({
-          url: '/pages/home/home'
-        })
-      } else {
-        uni.webView.navigateTo({
-          url: '/pages/index/index'
-        });
-      }
+      quit();
     }
   };
   wsss.onmessage = function (res) {
@@ -102,19 +90,7 @@ function doConnect() {
           }, function () {
             isControl = false;
             //点击取消后的回调函数
-            if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-              tt.miniProgram.switchTab({
-                url: '/pages/home/home'
-              })
-            } else if (window.__wxjs_environment === 'miniprogram') {
-              wx.miniProgram.switchTab({
-                url: '/pages/home/home'
-              })
-            } else {
-              uni.webView.navigateTo({
-                url: '/pages/index/index'
-              });
-            }
+            quit();
           });
         } else {
           $.confirm("当前云手机正在授控,是否请求获取云手机控制权?", function () {

+ 24 - 91
screenAndroid/WXtrialInterface.html

@@ -355,19 +355,7 @@
         } else {
           clearInterval(intervaler);
           $.toast("画面异常,请重新进入", "text");
-          if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-            tt.miniProgram.switchTab({
-              url: '/pages/home/home'
-            })
-          } else if (window.__wxjs_environment === 'miniprogram') {
-            wx.miniProgram.switchTab({
-              url: '/pages/home/home'
-            })
-          } else {
-            uni.webView.navigateTo({
-              url: '/pages/index/index'
-            });
-          }
+          quit();
         }
       }, 3000);
 
@@ -385,19 +373,7 @@
         if (errorTime > 1000) {
           $.toast("画面异常,请重新进入", "text");
           wsss.close();
-          if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-            tt.miniProgram.switchTab({
-              url: '/pages/home/home'
-            })
-          } else if (window.__wxjs_environment === 'miniprogram') {
-            wx.miniProgram.switchTab({
-              url: '/pages/home/home'
-            })
-          } else {
-            uni.webView.navigateTo({
-              url: '/pages/index/index'
-            });
-          }
+          quit();
         }
       });
       ws.addEventListener('message', function (event) {
@@ -461,19 +437,9 @@
     document.addEventListener("visibilitychange", function () {
       console.log(document[hidden]);
       if (document[hidden]) {
-        if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-          tt.miniProgram.switchTab({
-            url: '/pages/home/home'
-          })
-        } else if (window.__wxjs_environment === 'miniprogram') {
-          wx.miniProgram.switchTab({
-            url: '/pages/home/home'
-          })
-        } else {
-          uni.webView.navigateTo({
-            url: '/pages/index/index'
-          });
-        }
+        quit();
+        ws.close();
+        wsss.close();
       }
     }, false);
 
@@ -551,21 +517,9 @@
           else {
             $.toast("画面异常,请重新进入", "text");
             clearInterval(intervaler);
+            quit();
             ws.close();
             wsss.close();
-            if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-              tt.miniProgram.switchTab({
-                url: '/pages/home/home'
-              })
-            } else if (window.__wxjs_environment === 'miniprogram') {
-              wx.miniProgram.switchTab({
-                url: '/pages/home/home'
-              })
-            } else {
-              uni.webView.navigateTo({
-                url: '/pages/index/index'
-              });
-            }
           }
         }
         if (input[23] == 0x05) { //横竖屏标识
@@ -933,21 +887,9 @@
 
     $("#upload").on("click", function () {
       clearInterval(intervaler);
+      quit();
       ws.close();
       wsss.close();
-      if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-        tt.miniProgram.switchTab({
-          url: '/pages/home/home'
-        })
-      } else if (window.__wxjs_environment === 'miniprogram') {
-        wx.miniProgram.switchTab({
-          url: '/pages/home/home'
-        })
-      } else {
-        uni.webView.navigateTo({
-          url: '/pages/index/index'
-        });
-      }
     })
 
     function selectText(x) {
@@ -1120,19 +1062,7 @@
       $('.buy-phone-wrap').eq(0).hide();
       if (disconnectionFlag || getDate) {//设置了断线时间,取消直接退出
         systemBuriedPoint('激活码-断线-取消');
-        if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-          tt.miniProgram.switchTab({
-            url: '/pages/home/home'
-          })
-        } else if (window.__wxjs_environment === 'miniprogram') {
-          wx.miniProgram.switchTab({
-            url: '/pages/home/home'
-          })
-        } else {
-          uni.webView.navigateTo({
-            url: '/pages/index/index'
-          });
-        }
+        quit();
         return
       }
       let pointName = '';
@@ -1179,19 +1109,7 @@
       } else {
         systemBuriedPoint('激活码-强制关闭-放弃');
       }
-      if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-        tt.miniProgram.switchTab({
-          url: '/pages/home/home'
-        })
-      } else if (window.__wxjs_environment === 'miniprogram') {
-        wx.miniProgram.switchTab({
-          url: '/pages/home/home'
-        })
-      } else {
-        uni.webView.navigateTo({
-          url: '/pages/index/index'
-        });
-      }
+      quit();
     })
     // 继续观看
     $('.looking')[0].addEventListener('click', () => {
@@ -1218,6 +1136,21 @@
         success: function (res) { }
       })
     }
+    function quit() {
+      if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
+        tt.miniProgram.switchTab({
+          url: '/pages/home/home'
+        })
+      } else if (window.__wxjs_environment === 'miniprogram') {
+        wx.miniProgram.switchTab({
+          url: '/pages/home/home'
+        })
+      } else {
+        uni.webView.navigateTo({
+          url: '/pages/index/index'
+        });
+      }
+    }
     window.onbeforeunload = function () {
       ws.close();
       wsss.close();

+ 2 - 26
screenIos/WXdraw.js

@@ -77,19 +77,7 @@ function doConnect() {
     wsss.close();
     throttle(doConnect, 100);
     if (errorTime > 1000) {
-      if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-        tt.miniProgram.switchTab({
-          url: '/pages/home/home'
-        })
-      } else if (window.__wxjs_environment === 'miniprogram') {
-        wx.miniProgram.switchTab({
-          url: '/pages/home/home'
-        })
-      } else {
-        uni.webView.navigateTo({
-          url: '/pages/index/index'
-        });
-      }
+      quit();
     }
   };
   wsss.onmessage = function (res) {
@@ -111,19 +99,7 @@ function doConnect() {
           }, function () {
             isControl = false;
             //点击取消后的回调函数
-            if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-              tt.miniProgram.switchTab({
-                url: '/pages/home/home'
-              })
-            } else if (window.__wxjs_environment === 'miniprogram') {
-              wx.miniProgram.switchTab({
-                url: '/pages/home/home'
-              })
-            } else {
-              uni.webView.navigateTo({
-                url: '/pages/index/index'
-              });
-            }
+            quit();
           });
         } else {
           $.confirm("当前云手机正在授控,是否请求获取云手机控制权?", function () {

+ 26 - 78
screenIos/WXtrialInterface.html

@@ -674,19 +674,7 @@
       decodeWoker.postMessage('close');
       decodeWoker.terminate();
       webSocketWorker.terminate();
-      if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-        tt.miniProgram.switchTab({
-          url: '/pages/home/home'
-        })
-      } else if (window.__wxjs_environment === 'miniprogram') {
-        wx.miniProgram.switchTab({
-          url: '/pages/home/home'
-        })
-      } else {
-        uni.webView.navigateTo({
-          url: '/pages/index/index'
-        });
-      }
+      quit();
     })
 
     function handleClose() {
@@ -802,19 +790,7 @@
             decodeWoker.postMessage('close');
             decodeWoker.terminate();
             webSocketWorker.terminate();
-            if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-              tt.miniProgram.switchTab({
-                url: '/pages/home/home'
-              })
-            } else if (window.__wxjs_environment === 'miniprogram') {
-              wx.miniProgram.switchTab({
-                url: '/pages/home/home'
-              })
-            } else {
-              uni.webView.navigateTo({
-                url: '/pages/index/index'
-              });
-            }
+            quit();
           }
         }
         if (input[23] == 0x05) { //横竖屏标识
@@ -839,19 +815,7 @@
         decodeWoker.postMessage('close');
         decodeWoker.terminate();
         webSocketWorker.terminate();
-        if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-          tt.miniProgram.switchTab({
-            url: '/pages/home/home'
-          })
-        } else if (window.__wxjs_environment === 'miniprogram') {
-          wx.miniProgram.switchTab({
-            url: '/pages/home/home'
-          })
-        } else {
-          uni.webView.navigateTo({
-            url: '/pages/index/index'
-          });
-        }
+        quit();
       }
     }
 
@@ -1013,19 +977,7 @@
       $('.buy-phone-wrap').eq(0).hide();
       if (disconnectionFlag || getDate) {//设置了断线时间,取消直接退出
         systemBuriedPoint('激活码-断线-取消');
-        if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-          tt.miniProgram.switchTab({
-            url: '/pages/home/home'
-          })
-        } else if (window.__wxjs_environment === 'miniprogram') {
-          wx.miniProgram.switchTab({
-            url: '/pages/home/home'
-          })
-        } else {
-          uni.webView.navigateTo({
-            url: '/pages/index/index'
-          });
-        }
+        quit();
         return
       }
       let pointName = '';
@@ -1072,19 +1024,7 @@
       } else {
         systemBuriedPoint('激活码-强制关闭-放弃');
       }
-      if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-        tt.miniProgram.switchTab({
-          url: '/pages/home/home'
-        })
-      } else if (window.__wxjs_environment === 'miniprogram') {
-        wx.miniProgram.switchTab({
-          url: '/pages/home/home'
-        })
-      } else {
-        uni.webView.navigateTo({
-          url: '/pages/index/index'
-        });
-      }
+      quit();
     })
     // 继续观看
     $('.looking')[0].addEventListener('click', () => {
@@ -1159,22 +1099,30 @@
     // 处理页面可见属性的改变
     document.addEventListener("visibilitychange", function () {
       if (document[hidden]) {
-        if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
-          tt.miniProgram.switchTab({
-            url: '/pages/home/home'
-          })
-        } else if (window.__wxjs_environment === 'miniprogram') {
-          wx.miniProgram.switchTab({
-            url: '/pages/home/home'
-          })
-        } else {
-          uni.webView.navigateTo({
-            url: '/pages/index/index'
-          });
-        }
+        quit();
+        wsss.close();
+        decodeWoker.postMessage('close');
+        decodeWoker.terminate();
+        webSocketWorker.terminate();
       }
     }, false);
 
+    function quit() {
+      if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
+        tt.miniProgram.switchTab({
+          url: '/pages/home/home'
+        })
+      } else if (window.__wxjs_environment === 'miniprogram') {
+        wx.miniProgram.switchTab({
+          url: '/pages/home/home'
+        })
+      } else {
+        uni.webView.navigateTo({
+          url: '/pages/index/index'
+        });
+      }
+    }
+
     window.onbeforeunload = function () {
       wsss.close();
       decodeWoker.postMessage('close');