From 2b36f535c7d22b3bdd173425c609e802a85da2b3 Mon Sep 17 00:00:00 2001
From: leipu <200684632@qq.com>
Date: Wed, 13 Nov 2024 10:25:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(slot):=20=E4=BC=98=E5=8C=96=E9=83=A8?=
 =?UTF-8?q?=E5=88=86slot=E5=86=99=E6=B3=95,=E5=87=8F=E5=B0=91=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/AppPage.vue    |  5 +++--
 src/components/common/CommonPage.vue |  9 ++++----
 src/components/me/modal/index.vue    | 31 ++++++++++++++--------------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/components/common/AppPage.vue b/src/components/common/AppPage.vue
index 10b959a..a60386e 100644
--- a/src/components/common/AppPage.vue
+++ b/src/components/common/AppPage.vue
@@ -11,8 +11,9 @@
     <main :class="{ 'flex-1': full }" class="m-12">
       <slot />
     </main>
-    <slot v-if="$slots.footer" name="footer" />
-    <TheFooter v-else-if="showFooter" class="mb-12 mt-auto" />
+    <slot name="footer">
+      <TheFooter v-if="showFooter" class="mb-12 mt-auto" />
+    </slot>
     <n-back-top :bottom="20" />
   </main>
 </template>
diff --git a/src/components/common/CommonPage.vue b/src/components/common/CommonPage.vue
index 1099a8d..2b59d77 100644
--- a/src/components/common/CommonPage.vue
+++ b/src/components/common/CommonPage.vue
@@ -39,10 +39,11 @@
       <slot />
     </AppCard>
 
-    <slot v-if="$slots.footer" name="footer" />
-    <AppCard v-else-if="showFooter" class="flex-shrink-0 py-12">
-      <TheFooter />
-    </AppCard>
+    <slot name="footer">
+      <AppCard v-if="showFooter" class="flex-shrink-0 py-12">
+        <TheFooter />
+      </AppCard>
+    </slot>
   </main>
 </template>
 
diff --git a/src/components/me/modal/index.vue b/src/components/me/modal/index.vue
index 52b0d4d..b56bd99 100644
--- a/src/components/me/modal/index.vue
+++ b/src/components/me/modal/index.vue
@@ -26,21 +26,22 @@
 
       <!-- 底部按钮 -->
       <template #footer>
-        <slot v-if="$slots.footer" name="footer" />
-        <footer v-else-if="modalOptions.showFooter" class="flex justify-end">
-          <n-button v-if="modalOptions.showCancel" @click="handleCancel()">
-            {{ modalOptions.cancelText }}
-          </n-button>
-          <n-button
-            v-if="modalOptions.showOk"
-            type="primary"
-            :loading="modalOptions.okLoading"
-            class="ml-20"
-            @click="handleOk()"
-          >
-            {{ modalOptions.okText }}
-          </n-button>
-        </footer>
+        <slot name="footer">
+          <footer v-if="modalOptions.showFooter" class="flex justify-end">
+            <n-button v-if="modalOptions.showCancel" @click="handleCancel()">
+              {{ modalOptions.cancelText }}
+            </n-button>
+            <n-button
+              v-if="modalOptions.showOk"
+              type="primary"
+              :loading="modalOptions.okLoading"
+              class="ml-20"
+              @click="handleOk()"
+            >
+              {{ modalOptions.okText }}
+            </n-button>
+          </footer>
+        </slot>
       </template>
     </n-card>
   </n-modal>