heyang 3 years ago
parent
commit
dc734f5bf7
2 changed files with 29 additions and 6 deletions
  1. 7 1
      screenIos/WXdraw.js
  2. 22 5
      screenIos/WXtrialInterface.html

+ 7 - 1
screenIos/WXdraw.js

@@ -76,10 +76,16 @@ function doConnect() {
         tt.miniProgram.switchTab({
         tt.miniProgram.switchTab({
           url: '/pages/home/home'
           url: '/pages/home/home'
         })
         })
-      } else {
+      } else if(window.__wxjs_environment === 'miniprogram') {
         wx.miniProgram.switchTab({
         wx.miniProgram.switchTab({
           url: '/pages/home/home'
           url: '/pages/home/home'
         })
         })
+      } else {
+        document.addEventListener('UniAppJSBridgeReady', function() {
+          uni.navigateTo({
+            url: '/pages/index/index'
+          });
+        })
       }
       }
     }
     }
   };
   };

+ 22 - 5
screenIos/WXtrialInterface.html

@@ -99,6 +99,7 @@
     <div class="weui_loading"><i class="weui-loading weui-icon_toast"></i></div>
     <div class="weui_loading"><i class="weui-loading weui-icon_toast"></i></div>
     <p class="weui-toast_content">数据加载中</p>
     <p class="weui-toast_content">数据加载中</p>
   </div>
   </div>
+  <script type="text/javascript" src="https://unpkg.com/@dcloudio/uni-webview-js@0.0.2/index.js"></script>
   <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
   <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
   <script src="https://lf1-cdn-tos.bytegoofy.com/goofy/developer/jssdk/jssdk-1.0.3.js"></script>
   <script src="https://lf1-cdn-tos.bytegoofy.com/goofy/developer/jssdk/jssdk-1.0.3.js"></script>
   <script type="text/javascript" src="jquery-1.11.0.min.js"></script>
   <script type="text/javascript" src="jquery-1.11.0.min.js"></script>
@@ -572,10 +573,16 @@
         tt.miniProgram.switchTab({
         tt.miniProgram.switchTab({
           url: '/pages/home/home'
           url: '/pages/home/home'
         })
         })
-      } else {
+      } else if(window.__wxjs_environment === 'miniprogram') {
         wx.miniProgram.switchTab({
         wx.miniProgram.switchTab({
           url: '/pages/home/home'
           url: '/pages/home/home'
         })
         })
+      } else {
+        document.addEventListener('UniAppJSBridgeReady', function() {
+          uni.navigateTo({
+            url: '/pages/index/index'
+          });
+        })
       }
       }
     })
     })
 
 
@@ -684,8 +691,6 @@
     var ip = parameters["ip"];
     var ip = parameters["ip"];
     var appletPushAddress = parameters["appletPushAddress"];
     var appletPushAddress = parameters["appletPushAddress"];
     var token = parameters["cardToken"];
     var token = parameters["cardToken"];
-    cardToken = cardToken && cardToken.replace(/@/g, "=");
-    cardToken = cardToken.replace(/$/g, "+");
     var webSocketWorker = new Worker('websocket.js?ip=' + ip + '&appletPushAddress=' + appletPushAddress + '&token=' + token);
     var webSocketWorker = new Worker('websocket.js?ip=' + ip + '&appletPushAddress=' + appletPushAddress + '&token=' + token);
 
 
     webSocketWorker.onmessage = function (event) {
     webSocketWorker.onmessage = function (event) {
@@ -712,10 +717,16 @@
               tt.miniProgram.switchTab({
               tt.miniProgram.switchTab({
                 url: '/pages/home/home'
                 url: '/pages/home/home'
               })
               })
-            } else {
+            } else if(window.__wxjs_environment === 'miniprogram') {
               wx.miniProgram.switchTab({
               wx.miniProgram.switchTab({
                 url: '/pages/home/home'
                 url: '/pages/home/home'
               })
               })
+            } else {
+              document.addEventListener('UniAppJSBridgeReady', function() {
+                uni.navigateTo({
+                  url: '/pages/index/index'
+                });
+              })
             }
             }
           }
           }
         }
         }
@@ -745,10 +756,16 @@
           tt.miniProgram.switchTab({
           tt.miniProgram.switchTab({
             url: '/pages/home/home'
             url: '/pages/home/home'
           })
           })
-        } else {
+        } else if(window.__wxjs_environment === 'miniprogram') {
           wx.miniProgram.switchTab({
           wx.miniProgram.switchTab({
             url: '/pages/home/home'
             url: '/pages/home/home'
           })
           })
+        } else {
+          document.addEventListener('UniAppJSBridgeReady', function() {
+            uni.navigateTo({
+              url: '/pages/index/index'
+            });
+          })
         }
         }
       }
       }
     }
     }