From 539c7d7b680ef82df92cef0ee637ced6729c3a32 Mon Sep 17 00:00:00 2001
From: Bull-BCLS <tomcat416@163.com>
Date: Mon, 15 Apr 2024 23:31:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=99=BB=E5=BD=95=E9=A1=B5=E7=BD=91?=
 =?UTF-8?q?=E7=AB=99=E6=A0=87=E9=A2=98=E3=80=81LOGO=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Logo.vue | 4 +++-
 src/router/permission.ts       | 1 -
 src/views/login/index.vue      | 7 ++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Logo.vue b/src/layout/components/Logo.vue
index 7a0b8eb..5c94729 100644
--- a/src/layout/components/Logo.vue
+++ b/src/layout/components/Logo.vue
@@ -1,6 +1,7 @@
 <template>
   <section class="system-logo" :class="{ collapsed: props.collapsed }" @click="toHome">
-    <img class="logo" :src="appStore.getLogo() ?? '@/assets/images/logo.svg'"  alt="logo"/>
+    <img v-if="webLogo" class="logo" :src="webLogo"  alt="logo"/>
+    <img v-else class="logo" src="@/assets/images/logo.svg"  alt="logo"/>
     <span class="system-name">{{ webTitle }}</span>
   </section>
 </template>
@@ -12,6 +13,7 @@ const appStore= useAppStore();
 appStore.initWebConfig()
 
 const webTitle = computed(() => appStore.getTitle());
+const webLogo = computed(() => appStore.getLogo());
 
 interface Props {
   collapsed?: boolean
diff --git a/src/router/permission.ts b/src/router/permission.ts
index f84e30f..7fdea06 100644
--- a/src/router/permission.ts
+++ b/src/router/permission.ts
@@ -15,7 +15,6 @@ export const resetHasRouteFlag = () => {
 router.beforeEach(async (to, from, next) => {
   const userStore = useUserStore()
   const routeStore = useRouteStore()
-  const appStore = useAppStore()
 
   // 判断该用户是否登录
   if (getToken()) {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index d6b8f85..09ee569 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -19,7 +19,8 @@
             @submit="handleLogin"
           >
             <h3 class="login-right__title">
-              <img :src="appStore.getLogo()" alt="Logo" height="33" />
+              <img v-if="webLogo" class="logo" :src="webLogo"  alt="logo" height="33"/>
+              <img v-else class="logo" src="@/assets/images/logo.svg"  alt="logo"/>
               <span>{{ appStore.getTitle() }}</span>
             </h3>
             <a-form-item field="username">
@@ -75,6 +76,10 @@ import { useLoading } from '@/hooks'
 import { encryptByRsa } from '@/utils/encrypt'
 
 const appStore = useAppStore()
+appStore.initWebConfig()
+
+const webTitle = computed(() => appStore.getTitle());
+const webLogo = computed(() => appStore.getLogo());
 
 defineOptions({ name: 'Login' })