Merge branch 'master' into dev

src/assets/js/setBarHeight.js

 const setBarHeight = {
 const setBarHeight = {
     mounted() {
     mounted() {
+        try {
 
 
+            window.WebViewJavascriptBridge.callHandler(
+                "getBarHeight",
+                null,
+                function (response) {
+                    console.log("getBarHeight来自 ios/android的回传数据： ", response);
+                    if (response) {
+                        const barHeight = response.statusBarHeight;
+                        const conHeight = 46 + barHeight;
+                        document
+                            .getElementsByClassName("iosStyle")[0]
+                            .setAttribute(
+                                "style",
+                                "padding-top:" + barHeight + "px !important"
+                            );
+
+                        document
+                            .getElementsByClassName("container")[0]
+                            .setAttribute(
+                                "style",
+                                "padding-top:" + conHeight + "px !important"
+                            );
+                    }
+                }
+            );
+
+        } catch (err) {
+            console.log("getBarHeight is error");
+        }
     }
     }
 }
 }
 
 

src/views/Bill/index.vue

@@ -445,7 +445,7 @@ export default {
           }
           }
         );
         );
       } catch (err) {
       } catch (err) {
-        console.log("getBarHeight is error,err=",err);
+        console.log("getBarHeight is error,err=", err);
       }
       }
     },
     },
     closeWebView() {
     closeWebView() {
@@ -466,12 +466,11 @@ export default {
     }
     }
   },
   },
   async mounted() {
   async mounted() {
-    this.getBarHeight();
     this.setPageNavState();
     this.setPageNavState();
+    this.getBarHeight();
     this.globalNavLeftArrowClick(this.navLeftArrowClick);
     this.globalNavLeftArrowClick(this.navLeftArrowClick);
     await this.loadPeriodData();
     await this.loadPeriodData();
     this.payUrl = await this.loadPayUrl();
     this.payUrl = await this.loadPayUrl();
-    
   }
   }
 };
 };
 </script>
 </script>