From 84a3c3ba7cd8fb310ca24d3dcd4c734fb2d641f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Tue, 15 Apr 2025 18:01:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dredirect=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/permission.js         | 4 ++--
 web/src/pinia/modules/user.js | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/src/permission.js b/web/src/permission.js
index 3b48995c..5276aea5 100644
--- a/web/src/permission.js
+++ b/web/src/permission.js
@@ -115,7 +115,7 @@ router.beforeEach(async (to, from) => {
 
       return {
         name: 'Login',
-        query: { redirect: to.href }
+        query: { redirect: to.fullPath }
       }
     }
 
@@ -126,7 +126,7 @@ router.beforeEach(async (to, from) => {
   return {
     name: 'Login',
     query: {
-      redirect: document.location.hash
+      redirect: to.fullPath
     }
   }
 })
diff --git a/web/src/pinia/modules/user.js b/web/src/pinia/modules/user.js
index b103ec79..6f0e57b5 100644
--- a/web/src/pinia/modules/user.js
+++ b/web/src/pinia/modules/user.js
@@ -88,6 +88,11 @@ export const useUserStore = defineStore('user', () => {
         router.addRoute(asyncRouter)
       })
 
+      if(router.currentRoute.value.query.redirect) {
+        await router.replace(router.currentRoute.value.query.redirect)
+        return true
+      }
+
       if (!router.hasRoute(userInfo.value.authority.defaultRouter)) {
         ElMessage.error('请联系管理员进行授权')
       } else {