From 1da4ccbf33281b669c40488be047700a298927de Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:55:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/GlobalAlertWindow.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/src/components/common/GlobalAlertWindow.vue b/admin/src/components/common/GlobalAlertWindow.vue
index f5b8623..f252722 100644
--- a/admin/src/components/common/GlobalAlertWindow.vue
+++ b/admin/src/components/common/GlobalAlertWindow.vue
@@ -21,7 +21,7 @@
<div v-if="withFooter" class="window__footer">
<slot name="footer">
<el-button @click="confirm" :loading="confirmWorking" type="primary">纭畾</el-button>
- <el-button v-if="showCancel" @click="close">鍙栨秷</el-button>
+ <el-button v-if="!showCancel" @click="close">鍙栨秷</el-button>
</slot>
</div>
</el-dialog>
@@ -41,7 +41,7 @@
},
showCancel: {
type: Boolean,
- default: true
+ default: false
},
// 鏄惁鍖呭惈搴曢儴鎿嶄綔
withFooter: {
--
Gitblit v1.9.3