Merge branch 'master' into dev

src/main.js

@@ -46,9 +46,24 @@ Vue.prototype.setPageNavState = function () {
           console.log("setPageNavState来自 ios/android的回传数据： ", response);
           console.log("setPageNavState来自 ios/android的回传数据： ", response);
         }
         }
       );
       );
+      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);
+        }
+      );
+
     });
     });
   } catch (err) {
   } catch (err) {
-    console.log("setPageNavState is error,err=",err);
+    console.log("main setPageNavState is error,err=",err);
   }
   }
 };
 };
 
 

src/views/Bill/index.vue

@@ -159,6 +159,7 @@ import { Icon, Loading } from "vant";
 import { TabHeader } from "@/components";
 import { TabHeader } from "@/components";
 import * as utils from "../../utils/common";
 import * as utils from "../../utils/common";
 import { mapGetters, mapActions } from "vuex";
 import { mapGetters, mapActions } from "vuex";
+
 import setBarHeight from "../../assets/js/setBarHeight.js";
 import setBarHeight from "../../assets/js/setBarHeight.js";
 import dayjs from "dayjs";
 import dayjs from "dayjs";