From b01e46b64fd97f610ba17970e7c0aa1398a025e9 Mon Sep 17 00:00:00 2001
From: xiangshu233 <xiangshu233@outlook.com>
Date: Tue, 24 Mar 2026 21:43:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(ui,router):=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=BA=95=E9=83=A8=E9=81=AE=E6=8C=A1?=
 =?UTF-8?q?=E5=B9=B6=E6=B6=88=E9=99=A4=E8=B7=AF=E7=94=B1=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整登录页滚动容器与底部安全区留白，避免小屏下底部 UI 被遮挡

为“我的”页面增加底部留白，防止“退出登录”被悬浮导航覆盖

将全局路由守卫改为 Vue Router 返回值写法，移除 next() 过时用法

在悬浮导航中避免重复跳转当前路由，消除 redundant navigation 告警
---
 src/layout/components/FloatingNavBar.vue | 16 ++++++++++++++--
 src/router/router-guards.ts              | 16 ++++++----------
 src/views/my/index.vue                   |  5 +++++
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/layout/components/FloatingNavBar.vue b/src/layout/components/FloatingNavBar.vue
index b0baa96..28328fb 100644
--- a/src/layout/components/FloatingNavBar.vue
+++ b/src/layout/components/FloatingNavBar.vue
@@ -62,7 +62,7 @@
 <script setup lang="ts">
 import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { useDark } from '@vueuse/core'
-import { useRoute, useRouter } from 'vue-router'
+import { NavigationFailureType, isNavigationFailure, useRoute, useRouter } from 'vue-router'
 import { useDesignSettingStore } from '@/store/modules/designSetting'
 
 interface NavItem {
@@ -188,8 +188,20 @@ function bindResizeObserver() {
   }
 }
 
+function normalizePath(path: string) {
+  return path.replace(/\/+$/, '') || '/'
+}
+
 function goNav(path: string) {
-  router.push(path)
+  // Avoid redundant navigation warnings when clicking current tab.
+  if (normalizePath(currentRoute.path) === normalizePath(path)) {
+    return
+  }
+  router.push(path).catch((err) => {
+    if (!isNavigationFailure(err, NavigationFailureType.duplicated)) {
+      throw err
+    }
+  })
 }
 
 function handleNavClick(index: number, path: string) {
diff --git a/src/router/router-guards.ts b/src/router/router-guards.ts
index de9f4d3..ecf828b 100644
--- a/src/router/router-guards.ts
+++ b/src/router/router-guards.ts
@@ -15,29 +15,26 @@ const LOGIN_PATH = PageEnum.BASE_LOGIN
 const whitePathList = [LOGIN_PATH] // no redirect whitelist
 
 export function createRouterGuards(router: Router) {
-  router.beforeEach(async (to, from, next) => {
+  router.beforeEach(async (to, from) => {
     // to: 即将要进入的目标
     // from: 当前导航正要离开的路由
     NProgress.start()
     const userStore = useUserStoreWithOut()
 
     if (from.path === LOGIN_PATH && to.name === PageEnum.ERROR_PAGE_NAME) {
-      next(PageEnum.BASE_HOME)
-      return
+      return PageEnum.BASE_HOME
     }
 
     // Whitelist can be directly entered
     if (whitePathList.includes(to.path as PageEnum)) {
-      next()
-      return
+      return true
     }
 
     const token = storage.get(ACCESS_TOKEN)
 
     if (!token) {
       // redirect login page
-      next(LOGIN_PATH)
-      return
+      return LOGIN_PATH
     }
 
     // 当上次更新时间为空时获取用户信息
@@ -46,12 +43,11 @@ export function createRouterGuards(router: Router) {
         await userStore.GetUserInfo()
       }
       catch (err) {
-        next()
-        return
+        return true
       }
     }
 
-    next()
+    return true
   })
 
   // 进入某个路由之后触发的钩子
diff --git a/src/views/my/index.vue b/src/views/my/index.vue
index 2cfab71..0400016 100644
--- a/src/views/my/index.vue
+++ b/src/views/my/index.vue
@@ -88,6 +88,11 @@ const getUserCoverBg = computed(() => {
 </script>
 
 <style lang="less" scoped>
+.my-page {
+  min-height: 100%;
+  padding-bottom: calc(110px + env(safe-area-inset-bottom));
+}
+
 .my-bg {
   clip-path: inset(0 -55% 0 -55% round 0 0 100% 100%);
   background-size: cover;