From b75e44f9ff4bc628dff2f265c3d92ca07c792c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=99=E7=A0=81=E7=94=9F=E8=8A=B1?= <18523774412@qq.com>
Date: Sun, 10 Nov 2024 15:43:33 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E4=BC=98=E5=8C=96=E5=B0=8F=E5=B1=8F?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E8=8F=9C=E5=8D=95=E6=8A=BD=E5=B1=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/layouts/frontend/components/aside.vue |  9 +++-----
 .../layouts/frontend/components/header.vue    | 22 ++++++-------------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/web/src/layouts/frontend/components/aside.vue b/web/src/layouts/frontend/components/aside.vue
index 7c8130a7..0b3ba8cf 100644
--- a/web/src/layouts/frontend/components/aside.vue
+++ b/web/src/layouts/frontend/components/aside.vue
@@ -50,20 +50,17 @@
 
 <script setup lang="ts">
 import { useRoute, useRouter, type RouteRecordRaw } from 'vue-router'
-import { useUserInfo } from '/@/stores/userInfo'
 import { useMemberCenter } from '/@/stores/memberCenter'
-import { onClickMenu } from '/@/utils/router'
+import { useUserInfo } from '/@/stores/userInfo'
 import { fullUrl } from '/@/utils/common'
+import { onClickMenu } from '/@/utils/router'
 
 const route = useRoute()
 const router = useRouter()
 const userInfo = useUserInfo()
 const memberCenter = useMemberCenter()
 
-const routerPush = (routeName = '', route?: RouteRecordRaw) => {
-    if (document.body.clientWidth < 992) {
-        memberCenter.toggleMenuExpand(false)
-    }
+const routerPush = (routeName: string, route?: RouteRecordRaw) => {
     if (routeName) {
         router.push({ name: routeName })
     } else if (route) {
diff --git a/web/src/layouts/frontend/components/header.vue b/web/src/layouts/frontend/components/header.vue
index 4aaf7747..d9e1b66d 100644
--- a/web/src/layouts/frontend/components/header.vue
+++ b/web/src/layouts/frontend/components/header.vue
@@ -21,7 +21,7 @@
             v-model="memberCenter.state.menuExpand"
             :with-header="false"
             direction="ltr"
-            size="40%"
+            :size="memberCenter.state.shrink ? '70%' : '40%'"
         >
             <div class="header-row">
                 <div @click="router.push({ name: '/' })" class="header-logo">
@@ -38,28 +38,20 @@
 </template>
 
 <script setup lang="ts">
-import { watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import { useSiteConfig } from '/@/stores/siteConfig'
-import { useMemberCenter } from '/@/stores/memberCenter'
+import { onBeforeRouteUpdate, useRouter } from 'vue-router'
 import { initialize } from '/@/api/frontend/index'
 import Menu from '/@/layouts/frontend/components/menu.vue'
+import { useMemberCenter } from '/@/stores/memberCenter'
 import { layoutMenuScrollbarRef } from '/@/stores/refs'
+import { useSiteConfig } from '/@/stores/siteConfig'
 
-const route = useRoute()
 const router = useRouter()
 const siteConfig = useSiteConfig()
 const memberCenter = useMemberCenter()
 
-watch(
-    () => route.path,
-    () => {
-        memberCenter.toggleMenuExpand(false)
-    },
-    {
-        immediate: true,
-    }
-)
+onBeforeRouteUpdate(() => {
+    memberCenter.toggleMenuExpand(false)
+})
 
 /**
  * 前端初始化请求，获取站点配置信息，动态路由信息等