Merge branch 'bfwms' of http://47.97.1.152:5880/r/wms_app into bfwms

whycq

2022-10-15 c038caf7b08e3a8cd5573b00bac4fa1ee4076571

 uni_modules/uni-popup/components/uni-popup/uni-popup.vue

@@ -179,7 +179,7 @@
         this.popupWidth = windowWidth
         this.popupHeight = windowHeight + windowTop
         // TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
         if(safeArea && this.safeArea){
         if(safeArea){
            // #ifdef MP-WEIXIN
            this.safeAreaInsets = screenHeight - safeArea.bottom
            // #endif