|
@@ -4,7 +4,7 @@
|
|
|
import store from '@/store';
|
|
import store from '@/store';
|
|
|
import router from '@/router';
|
|
import router from '@/router';
|
|
|
import { Message } from 'element-ui';
|
|
import { Message } from 'element-ui';
|
|
|
-import { removeToken,removeCurrentUser } from '@/utils/token-util';
|
|
|
|
|
|
|
+import { removeToken, removeCurrentUser } from '@/utils/token-util';
|
|
|
import { setDocumentTitle } from '@/utils/document-title-util';
|
|
import { setDocumentTitle } from '@/utils/document-title-util';
|
|
|
import {
|
|
import {
|
|
|
HOME_PATH,
|
|
HOME_PATH,
|
|
@@ -242,11 +242,11 @@ export function logout(route, from) {
|
|
|
removeCurrentUser();
|
|
removeCurrentUser();
|
|
|
if (route) {
|
|
if (route) {
|
|
|
router.push({
|
|
router.push({
|
|
|
- path: '/login',
|
|
|
|
|
- query: from ? { from } : void 0
|
|
|
|
|
|
|
+ path: '/login'
|
|
|
|
|
+ // query: from ? { from } : void 0
|
|
|
});
|
|
});
|
|
|
} else {
|
|
} else {
|
|
|
// 这样跳转避免再次登录重复注册动态路由
|
|
// 这样跳转避免再次登录重复注册动态路由
|
|
|
- location.replace(BASE_URL + 'login' + (from ? '?from=' + from : ''));
|
|
|
|
|
|
|
+ location.replace(window.location.origin + '/login');
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|