From 7dd2e7918b00a857ca8a3634e24b2f6dd7446d1b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 24 六月 2025 10:29:33 +0800
Subject: [PATCH] Merge branch 'xgmFlwms' of http://47.97.1.152:5880/r/wms_app into xgmFlwms

---
 uni_modules/uni-popup/components/uni-popup/uni-popup.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
index bd12076..a1f8da6 100644
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ b/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){
+			if(safeArea && this.safeArea){
 				// #ifdef MP-WEIXIN
 				this.safeAreaInsets = screenHeight - safeArea.bottom
 				// #endif

--
Gitblit v1.9.1