Merge remote-tracking branch 'origin/dev' into dev

src/layout/components/Logo.vue

@@ -1,14 +1,19 @@
 <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"/>
-    <span class="system-name">{{ appStore.getTitle() }}</span>
+    <img v-else class="logo" src="@/assets/images/logo.svg"  alt="logo"/>
+    <span class="system-name">{{ webTitle }}</span>
   </section>
 </template>
 
 <script setup lang="ts">
-import { useAppStore } from '@/stores'
+import {useAppStore} from "@/stores";
 
-const appStore = useAppStore()
+const appStore= useAppStore();
+appStore.initWebConfig()
+
+const webTitle = computed(() => appStore.getTitle());
+const webLogo = computed(() => appStore.getLogo());
 
 interface Props {
   collapsed?: boolean

src/router/permission.ts

@@ -15,8 +15,6 @@ export const resetHasRouteFlag = () => {
 router.beforeEach(async (to, from, next) => {
   const userStore = useUserStore()
   const routeStore = useRouteStore()
-  const appStore = useAppStore()
-  appStore.initWebConfig()
 
   // 判断该用户是否登录
   if (getToken()) {

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' })