From 3ea84b4c77c9ccec598e9cbce8d2186200cb81ac Mon Sep 17 00:00:00 2001
From: hooray <304327508@qq.com>
Date: Wed, 13 Oct 2021 16:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E8=88=AA=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=BA=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=88=E4=B8=8D=E5=90=AB=E4=B8=BB=E5=AF=BC=E8=88=AA=EF=BC=89?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=9C=A8=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                | 45 +++++++++++-----------
 src/layout/components/SubSidebar/index.vue |  4 +-
 src/store/modules/menu.js                  |  2 +-
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 71ede115..723fb359 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,28 +27,6 @@ watch([
     immediate: true
 })
 
-watch([
-    () => store.state.settings.enableDynamicTitle,
-    () => store.state.settings.title
-], () => setDocumentTitle(), {
-    immediate: true
-})
-
-onMounted(() => {
-    window.onresize = () => {
-        store.commit('settings/setMode', document.documentElement.clientWidth)
-    }
-    window.onresize()
-})
-
-function setDocumentTitle() {
-    if (store.state.settings.enableDynamicTitle && store.state.settings.title) {
-        let title = store.state.settings.title
-        document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
-    } else {
-        document.title = import.meta.env.VITE_APP_TITLE
-    }
-}
 function setMenuMode() {
     document.body.removeAttribute('data-sidebar-no-collapse')
     document.body.removeAttribute('data-sidebar-collapse')
@@ -59,4 +37,27 @@ function setMenuMode() {
     }
     document.body.setAttribute('data-menu-mode', store.state.settings.menuMode)
 }
+
+watch([
+    () => store.state.settings.enableDynamicTitle,
+    () => store.state.settings.title
+], () => setDocumentTitle(), {
+    immediate: true
+})
+
+function setDocumentTitle() {
+    if (store.state.settings.enableDynamicTitle && store.state.settings.title) {
+        let title = store.state.settings.title
+        document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
+    } else {
+        document.title = import.meta.env.VITE_APP_TITLE
+    }
+}
+
+onMounted(() => {
+    window.onresize = () => {
+        store.commit('settings/setMode', document.documentElement.clientWidth)
+    }
+    window.onresize()
+})
 </script>
diff --git a/src/layout/components/SubSidebar/index.vue b/src/layout/components/SubSidebar/index.vue
index 3381f2ff..5ec02777 100644
--- a/src/layout/components/SubSidebar/index.vue
+++ b/src/layout/components/SubSidebar/index.vue
@@ -1,8 +1,8 @@
 <template>
     <div v-if="['side', 'head', 'single'].includes($store.state.settings.menuMode) || $store.state.settings.mode === 'mobile'" class="sub-sidebar-container" :class="{'is-collapse': $store.state.settings.mode === 'pc' && $store.state.settings.sidebarCollapse}" @scroll="onSidebarScroll">
-        <Logo :show-logo="$store.state.settings.menuMode === 'single'" :class="{
+        <Logo :show-logo="$store.state.settings.menuMode === 'single' && $store.state.settings.mode === 'pc'" :class="{
             'sidebar-logo': true,
-            'sidebar-logo-bg': $store.state.settings.menuMode === 'single',
+            'sidebar-logo-bg': $store.state.settings.menuMode === 'single' && $store.state.settings.mode === 'pc',
             'shadow': sidebarScrollTop
         }"
         />
diff --git a/src/store/modules/menu.js b/src/store/modules/menu.js
index 7f7b1456..39eb2366 100644
--- a/src/store/modules/menu.js
+++ b/src/store/modules/menu.js
@@ -126,7 +126,7 @@ const getters = {
     // 由于 getter 的结果不会被缓存，导致导航栏切换时有明显的延迟，该问题会在 Vue 3.2 版本中修复，详看 https://github.com/vuejs/vuex/pull/1883
     routes: (state, getters, rootState) => {
         let routes
-        if (rootState.settings.menuMode === 'single') {
+        if (rootState.settings.menuMode === 'single' && rootState.settings.mode === 'pc') {
             routes = [{ children: [] }]
             state.routes.map(item => {
                 routes[0].children.push(...item.children)