From 4ee46819c1a86e0ede3da7066f7b0e610c893c3f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 17 五月 2024 11:50:38 +0800
Subject: [PATCH] !117 修复登录失效，重新登录丢失参数问题 Merge pull request !117 from 爱宇阳/dev
---
src/views/login.vue | 3 ++-
src/permission.ts | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/permission.ts b/src/permission.ts
index ef9976a..1123738 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -52,7 +52,8 @@
// 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
next();
} else {
- next(`/login?redirect=${to.fullPath}`); // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
+ const redirect = encodeURIComponent(to.fullPath || '/');
+ next(`/login?redirect=${redirect}`) // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
NProgress.done();
}
}
diff --git a/src/views/login.vue b/src/views/login.vue
index 060703b..3616d09 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -130,7 +130,8 @@
// 璋冪敤action鐨勭櫥褰曟柟娉�
const [err] = await to(userStore.login(loginForm.value));
if (!err) {
- await router.push({ path: redirect.value || '/' });
+ const redirectUrl = redirect.value || '/';
+ await router.push(redirectUrl);
loading.value = false;
} else {
loading.value = false;
--
Gitblit v1.9.3