|
@@ -88,12 +88,17 @@ const router = new VueRouter({
|
|
})
|
|
})
|
|
const ignore = ['/404']
|
|
const ignore = ['/404']
|
|
router.beforeEach(async (to, from, next) => {
|
|
router.beforeEach(async (to, from, next) => {
|
|
|
|
+ // 取出刷新时的 ssoToken, 路由拦截时app.vue 生命周期还没有执行,store中还没有数据,
|
|
|
|
+ let beforeunload = localStorage.getItem('beforeunload'),
|
|
|
|
+ __token = null
|
|
|
|
+ beforeunload && (__token = JSON.parse(beforeunload).ssoToken)
|
|
if (!ignore.includes(to.path)) {
|
|
if (!ignore.includes(to.path)) {
|
|
- let token = store.getters['ssoToken'] || query().token;
|
|
|
|
|
|
+ let token = __token || store.getters['ssoToken'] || query().token
|
|
// 开发环境模式token有模式值
|
|
// 开发环境模式token有模式值
|
|
- if(process.env.NODE_ENV=='aly'|| process.env.NODE_ENV=='serve'){
|
|
|
|
|
|
+ if (process.env.NODE_ENV == 'aly' || process.env.NODE_ENV == 'serve') {
|
|
token = 'admin:chuyushu'
|
|
token = 'admin:chuyushu'
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
+ // console.log('token====', token)
|
|
if (token) {
|
|
if (token) {
|
|
store.commit('SETSSOTOKEN', token)
|
|
store.commit('SETSSOTOKEN', token)
|
|
if (to.path == '/') {
|
|
if (to.path == '/') {
|
|
@@ -118,7 +123,7 @@ router.beforeEach(async (to, from, next) => {
|
|
}
|
|
}
|
|
store.commit('SETLASTROUTER', lastRoute)
|
|
store.commit('SETLASTROUTER', lastRoute)
|
|
let ssoServer = 'http://oauth.wanda-dev.cn'
|
|
let ssoServer = 'http://oauth.wanda-dev.cn'
|
|
- if(process.env.NODE_ENV=="wanda_build"){
|
|
|
|
|
|
+ if (process.env.NODE_ENV == 'wanda_build') {
|
|
ssoServer = 'http://oauth.wanda.cn'
|
|
ssoServer = 'http://oauth.wanda.cn'
|
|
}
|
|
}
|
|
let systemcode = 'CAD156',
|
|
let systemcode = 'CAD156',
|