Merge branch 'master' into dev

src/views/Bill/index.vue

@@ -420,11 +420,15 @@ export default {
     },
     },
     getBarHeight() {
     getBarHeight() {
       try {
       try {
+        initJsBridge(() => {
           window.WebViewJavascriptBridge.callHandler(
           window.WebViewJavascriptBridge.callHandler(
             "getBarHeight",
             "getBarHeight",
             null,
             null,
             function(response) {
             function(response) {
-            console.log("getBarHeight来自 ios/android的回传数据： ", response);
+              console.log(
+                "getBarHeight来自 ios/android的回传数据： ",
+                response
+              );
               if (response) {
               if (response) {
                 const barHeight = response.statusBarHeight;
                 const barHeight = response.statusBarHeight;
                 const conHeight = 46 + barHeight;
                 const conHeight = 46 + barHeight;
@@ -444,6 +448,7 @@ export default {
               }
               }
             }
             }
           );
           );
+        });
       } catch (err) {
       } catch (err) {
         console.log("getBarHeight is error,err=", err);
         console.log("getBarHeight is error,err=", err);
       }
       }