From 2d43a1df3f5ba42710e6d21c27d1e13bdb8dfd56 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 24 三月 2025 09:23:08 +0800
Subject: [PATCH] -

---
 src/uni_modules/uview-plus/components/u-modal/u-modal.vue |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/uni_modules/uview-plus/components/u-modal/u-modal.vue b/src/uni_modules/uview-plus/components/u-modal/u-modal.vue
index d724c9a..74baa6d 100644
--- a/src/uni_modules/uview-plus/components/u-modal/u-modal.vue
+++ b/src/uni_modules/uview-plus/components/u-modal/u-modal.vue
@@ -9,6 +9,8 @@
 			overflow: 'hidden',
 			marginTop: `-${addUnit(negativeTop)}`
 		}"
+		:closeable='closeable'
+		@close='closepoup'
 		:closeOnClickOverlay="closeOnClickOverlay"
 		:safeAreaInsetBottom="false"
 		:duration="400"
@@ -120,7 +122,7 @@
 	 * @event {Function} confirm	鐐瑰嚮纭鎸夐挳鏃惰Е鍙�
 	 * @event {Function} cancel		鐐瑰嚮鍙栨秷鎸夐挳鏃惰Е鍙�
 	 * @event {Function} close		鐐瑰嚮閬僵鍏抽棴鍑哄彂锛宑loseOnClickOverlay涓簍rue鏈夋晥
-	 * @example <u-loadmore :status="status" icon-type="iconType" load-text="loadText" />
+	 * @example <u-modal :show="show" />
 	 */
 	export default {
 		name: 'u-modal',
@@ -137,7 +139,7 @@
 				if (n && this.loading) this.loading = false
 			}
 		},
-		emits: ["confirm", "cancel", "close"],
+		emits: ["confirm", "cancel", "close", "update:show",'closemodal'],
 		methods: {
 			addUnit,
 			// 鐐瑰嚮纭畾鎸夐挳
@@ -145,12 +147,19 @@
 				// 濡傛灉閰嶇疆浜嗗紓姝ュ叧闂紝灏嗘寜閽�间负loading鐘舵��
 				if (this.asyncClose) {
 					this.loading = true;
+				} else {
+					this.$emit('update:show', false)
 				}
 				this.$emit('confirm')
 			},
 			// 鐐瑰嚮鍙栨秷鎸夐挳
 			cancelHandler() {
+				this.$emit('update:show', false)
 				this.$emit('cancel')
+			},
+			// 
+			closepoup(){
+				this.$emit('closemodal')
 			},
 			// 鐐瑰嚮閬僵
 			// 浠庡師鐞嗕笂鏉ヨ锛宮odal鐨勯伄缃╃偣鍑伙紝骞朵笉鏄湡鐨勭偣鍑诲埌浜嗛伄缃�
@@ -159,6 +168,7 @@
 			// 閫忔槑閬僵鐨勫瓙鍏冪礌鍋氫簡.stop澶勭悊锛屾墍浠ョ偣鍑诲唴瀹瑰尯锛屼篃涓嶄細瀵艰嚧璇Е鍙�
 			clickHandler() {
 				if (this.closeOnClickOverlay) {
+					this.$emit('update:show', false)
 					this.$emit('close')
 				}
 			}

--
Gitblit v1.9.1