From 84b3565732b3a361966deff110124665133b9e15 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 11 三月 2024 10:47:10 +0800
Subject: [PATCH] update copyright 2024

---
 src/views/login.vue |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index c2a91ef..67a8e29 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -59,7 +59,7 @@
     </el-form>
     <!--  搴曢儴  -->
     <div class="el-login-footer">
-      <span>Copyright 漏 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright 漏 2018-2024 ruoyi.vip All Rights Reserved.</span>
     </div>
   </div>
 </template>
@@ -71,6 +71,7 @@
 import useUserStore from '@/store/modules/user'
 
 const userStore = useUserStore()
+const route = useRoute();
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 
@@ -96,6 +97,10 @@
 const register = ref(false);
 const redirect = ref(undefined);
 
+watch(route, (newRoute) => {
+    redirect.value = newRoute.query && newRoute.query.redirect;
+}, { immediate: true });
+
 function handleLogin() {
   proxy.$refs.loginRef.validate(valid => {
     if (valid) {
@@ -113,7 +118,14 @@
       }
       // 璋冪敤action鐨勭櫥褰曟柟娉�
       userStore.login(loginForm.value).then(() => {
-        router.push({ path: redirect.value || "/" });
+        const query = route.query;
+        const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
+          if (cur !== "redirect") {
+            acc[cur] = query[cur];
+          }
+          return acc;
+        }, {});
+        router.push({ path: redirect.value || "/", query: otherQueryParams });
       }).catch(() => {
         loading.value = false;
         // 閲嶆柊鑾峰彇楠岃瘉鐮�

--
Gitblit v1.9.3