Merge branch 'master' into dev

src/main.js

@@ -48,16 +48,17 @@ Vue.prototype.setPageNavState = function () {
       );
       window.WebViewJavascriptBridge.callHandler(
         "getBarHeight",
-        {
-          isShowClose: false,
-          isShowBack: false,
-          isCloseLeft: false,
-          isShowTitle: false,
-          isShowNav: false,
-          isCloseWebView: false
-        },
-        function (response) {
-          console.log("main getBarHeight ios/android的回传数据： ", response);
+        null,
+        function(response) {
+          console.log(
+            "getBarHeight来自 ios/android的回传数据： ",
+            response
+          );
+          if (response) {
+            const barHeight = response.statusBarHeight;
+            const conHeight = 46 + barHeight;
+            console.log('conHeight=',conHeight);
+          }
         }
       );