Merge branch 'dev-5.2' of Software/android-cloud-H5 into test

screenAndroid/WXdraw.js

@@ -78,7 +78,7 @@ function doConnect() {
         })
       } else {
         document.addEventListener('UniAppJSBridgeReady', function () {
-          uni.navigateTo({
+          uni.webView.navigateTo({
             url: '/pages/index/index'
           });
         })
@@ -114,7 +114,7 @@ function doConnect() {
               })
             } else {
               document.addEventListener('UniAppJSBridgeReady', function () {
-                uni.navigateTo({
+                uni.webView.navigateTo({
                   url: '/pages/index/index'
                 });
               })

screenAndroid/WXtrialInterface.html

@@ -228,7 +228,7 @@
   <script type="text/javascript" src="WXdraw.js"></script>
   <script type="text/javascript" src="jmuxer.js"></script>
   <script type="text/javascript" src="spsParser.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/@dcloudio/uni-webview-js@0.0.2/index.js"></script>
+  <script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script>
   <script>
     var url = window.location.href;
     url = url.split('/');
@@ -365,7 +365,7 @@
             })
           } else {
             document.addEventListener('UniAppJSBridgeReady', function () {
-              uni.navigateTo({
+              uni.webView.navigateTo({
                 url: '/pages/index/index'
               });
             })
@@ -397,7 +397,7 @@
             })
           } else {
             document.addEventListener('UniAppJSBridgeReady', function () {
-              uni.navigateTo({
+              uni.webView.navigateTo({
                 url: '/pages/index/index'
               });
             })
@@ -475,7 +475,7 @@
           })
         } else {
           document.addEventListener('UniAppJSBridgeReady', function () {
-            uni.navigateTo({
+            uni.webView.navigateTo({
               url: '/pages/index/index'
             });
           })
@@ -569,7 +569,7 @@
               })
             } else {
               document.addEventListener('UniAppJSBridgeReady', function () {
-                uni.navigateTo({
+                uni.webView.navigateTo({
                   url: '/pages/index/index'
                 });
               })
@@ -953,7 +953,7 @@
         })
       } else {
         document.addEventListener('UniAppJSBridgeReady', function () {
-          uni.navigateTo({
+          uni.webView.navigateTo({
             url: '/pages/index/index'
           });
         })
@@ -1140,7 +1140,7 @@
           })
         } else {
           document.addEventListener('UniAppJSBridgeReady', function () {
-            uni.navigateTo({
+            uni.webView.navigateTo({
               url: '/pages/index/index'
             });
           })
@@ -1201,7 +1201,7 @@
         })
       } else {
         document.addEventListener('UniAppJSBridgeReady', function () {
-          uni.navigateTo({
+          uni.webView.navigateTo({
             url: '/pages/index/index'
           });
         })

screenIos/WXdraw.js

@@ -87,7 +87,7 @@ function doConnect() {
         })
       } else {
         document.addEventListener('UniAppJSBridgeReady', function () {
-          uni.navigateTo({
+          uni.webView.navigateTo({
             url: '/pages/index/index'
           });
         })
@@ -123,7 +123,7 @@ function doConnect() {
               })
             } else {
               document.addEventListener('UniAppJSBridgeReady', function () {
-                uni.navigateTo({
+                uni.webView.navigateTo({
                   url: '/pages/index/index'
                 });
               })

screenIos/WXtrialInterface.html

@@ -211,7 +211,6 @@
       </div>
     </div>
   </div>
-  <script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.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 type="text/javascript" src="jquery-1.11.0.min.js"></script>
@@ -222,7 +221,7 @@
   <script type="text/javascript" src="webgl.js"></script>
   <script type="text/javascript" src="https://cdn.bootcss.com/vConsole/3.2.0/vconsole.min.js"></script>
   <script type="text/javascript" src="WXdraw.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/@dcloudio/uni-webview-js@0.0.2/index.js"></script>
+  <script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"></script>
   <script type="text/javascript">
     $(function () {
       //手指滑动多少距离就认为是滑成功
@@ -685,7 +684,7 @@
         })
       } else {
         document.addEventListener('UniAppJSBridgeReady', function () {
-          uni.navigateTo({
+          uni.webView.navigateTo({
             url: '/pages/index/index'
           });
         })
@@ -815,7 +814,7 @@
               })
             } else {
               document.addEventListener('UniAppJSBridgeReady', function () {
-                uni.navigateTo({
+                uni.webView.navigateTo({
                   url: '/pages/index/index'
                 });
               })
@@ -854,7 +853,7 @@
           })
         } else {
           document.addEventListener('UniAppJSBridgeReady', function () {
-            uni.navigateTo({
+            uni.webView.navigateTo({
               url: '/pages/index/index'
             });
           })
@@ -1030,7 +1029,7 @@
           })
         } else {
           document.addEventListener('UniAppJSBridgeReady', function () {
-            uni.navigateTo({
+            uni.webView.navigateTo({
               url: '/pages/index/index'
             });
           })
@@ -1091,7 +1090,7 @@
         })
       } else {
         document.addEventListener('UniAppJSBridgeReady', function () {
-          uni.navigateTo({
+          uni.webView.navigateTo({
             url: '/pages/index/index'
           });
         })
@@ -1180,7 +1179,7 @@
           })
         } else {
           document.addEventListener('UniAppJSBridgeReady', function () {
-            uni.navigateTo({
+            uni.webView.navigateTo({
               url: '/pages/index/index'
             });
           })