Merge branch 'master' into dev

src/main.js

@@ -51,7 +51,7 @@ Vue.prototype.setPageNavState = function () {
         null,
         function(response) {
           console.log(
-            "getBarHeight来自 ios/android的回传数据： ",
+            "main getBarHeight来自 ios/android的回传数据： ",
             response
           );
           if (response) {

src/views/Bill/index.vue

@@ -421,15 +421,11 @@ export default {
     },
     getBarHeight() {
       try {
-        initJsBridge(() => {
         window.WebViewJavascriptBridge.callHandler(
           "getBarHeight",
           null,
           function(response) {
-              console.log(
-                "getBarHeight来自 ios/android的回传数据： ",
-                response
-              );
+            console.log("getBarHeight来自 ios/android的回传数据： ", response);
             if (response) {
               const barHeight = response.statusBarHeight;
               const conHeight = 46 + barHeight;
@@ -449,7 +445,6 @@ export default {
             }
           }
         );
-        });
       } catch (err) {
         console.log("getBarHeight is error,err=", err);
       }
@@ -473,7 +468,7 @@ export default {
   },
   async mounted() {
     this.setPageNavState();
-    this.getBarHeight();
+    //this.getBarHeight();
     this.globalNavLeftArrowClick(this.navLeftArrowClick);
     await this.loadPeriodData();
     this.payUrl = await this.loadPayUrl();