|
@@ -3,7 +3,7 @@ import store from './store'
|
|
|
import { Message } from 'element-ui'
|
|
|
import NProgress from 'nprogress' // progress bar
|
|
|
import 'nprogress/nprogress.css' // progress bar style
|
|
|
-import { getToken,setUserUrl, setUseType,setWebSiteId} from '@/utils/auth' // get token from cookie
|
|
|
+import { getToken,setUserUrl, setUseType,setWebSiteId,hashParams} from '@/utils/auth' // get token from cookie
|
|
|
import getPageTitle from '@/utils/get-page-title'
|
|
|
import URL from '@/utils/baseUrl';
|
|
|
import {getInfo} from '@/api/user'
|
|
@@ -25,13 +25,19 @@ router.beforeEach(async(to, from, next) => {
|
|
|
|
|
|
if (hasToken) {
|
|
|
if (to.path === '/login') {
|
|
|
+
|
|
|
+ // Retrieve userurl
|
|
|
+ const userurl = hashParams();
|
|
|
+ if(userurl){
|
|
|
+ setUserUrl(userurl, 86400)
|
|
|
+ }
|
|
|
+
|
|
|
const userInfo = await getInfo();
|
|
|
console.log("User Info:", userInfo);
|
|
|
if (userInfo.code === 200) {
|
|
|
console.log("####")
|
|
|
setUseType(userInfo.data.userType, 86400)
|
|
|
setWebSiteId(userInfo.data.siteId, 86400)
|
|
|
- setUserUrl(URL.webUrl, 86400)
|
|
|
next({ path: '/' })
|
|
|
NProgress.done() // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939
|
|
|
}else{
|