yusheng 4 месяцев назад
Родитель
Сommit
b734f6b56e
2 измененных файлов с 5 добавлено и 7 удалено
  1. 4 6
      src/utils/page-tab-util.js
  2. 1 1
      src/views/login/index.vue

+ 4 - 6
src/utils/page-tab-util.js

@@ -254,21 +254,19 @@ export function logout(route, from) {
     if (localStorage.getItem('singleUserInfo') == '1') {
       router.push({
         path: '/singleLogin',
-        query: from ? { from } : void 0
+        // query: from ? { from } : void 0
       });
     } else {
       router.push({
         path: '/login',
-        query: from ? { from } : void 0
+        // query: from ? { from } : void 0
       });
     }
   } else {
     if (localStorage.getItem('singleUserInfo') == '1') {
-      location.replace(
-        BASE_URL + 'singleLogin' + (from ? '?from=' + from : '')
-      );
+      location.replace(window.location.origin + '/singleLogin');
     } else {
-      location.replace(BASE_URL + 'login' + (from ? '?from=' + from : ''));
+      location.replace(window.location.origin + '/login');
     }
   }
 

+ 1 - 1
src/views/login/index.vue

@@ -277,7 +277,7 @@
       /* 跳转到首页 */
       goHome() {
         localStorage.setItem('singleUserInfo', '0');
-        this.$router.push(this.$route?.query?.from ?? '/').catch(() => {});
+        this.$router.push('/').catch(() => {});
       },
       /* 更换图形验证码 */
       changeCaptcha() {