|
@@ -88,7 +88,7 @@ const router = new VueRouter({
|
|
const ignore = ["/404"]
|
|
const ignore = ["/404"]
|
|
|
|
|
|
router.beforeEach(async (to, from, next) => {
|
|
router.beforeEach(async (to, from, next) => {
|
|
- console.log('to', from.path, to.path)
|
|
|
|
|
|
+ console.log('to', from.path, to)
|
|
// 取出刷新时的 ssoToken, 路由拦截时app.vue 生命周期还没有执行,store中还没有数据,
|
|
// 取出刷新时的 ssoToken, 路由拦截时app.vue 生命周期还没有执行,store中还没有数据,
|
|
let beforeunload = localStorage.getItem("beforeunload"),
|
|
let beforeunload = localStorage.getItem("beforeunload"),
|
|
__token = null
|
|
__token = null
|
|
@@ -140,16 +140,17 @@ router.beforeEach(async (to, from, next) => {
|
|
await store.dispatch("getFloors")
|
|
await store.dispatch("getFloors")
|
|
await store.dispatch("getBrand")
|
|
await store.dispatch("getBrand")
|
|
// 如果在跳转获取token之前保存了指定的路径,则后去token后需要跳转到相关页面
|
|
// 如果在跳转获取token之前保存了指定的路径,则后去token后需要跳转到相关页面
|
|
- // if (sessionStorage.getItem("TOURL")) {
|
|
|
|
- // // 如果去的地址等于缓存的地址
|
|
|
|
- // if (sessionStorage.getItem("TOURL") == to.path) {
|
|
|
|
- // next()
|
|
|
|
- // } else {
|
|
|
|
- // next(sessionStorage.getItem("TOURL"))
|
|
|
|
- // }
|
|
|
|
- // } else {
|
|
|
|
|
|
+ if (sessionStorage.getItem("TOURL")) {
|
|
|
|
+ // 如果去的地址等于缓存的地址
|
|
|
|
+ if (sessionStorage.getItem("TOURL") == to.path) {
|
|
|
|
+ sessionStorage.setItem("TOURL", '')
|
|
|
|
+ next()
|
|
|
|
+ } else {
|
|
|
|
+ next(sessionStorage.getItem("TOURL"))
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
next()
|
|
next()
|
|
- // }
|
|
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
let lastRoute = {
|
|
let lastRoute = {
|
|
path: to.path,
|
|
path: to.path,
|
|
@@ -165,12 +166,12 @@ router.beforeEach(async (to, from, next) => {
|
|
signal = new Date().getTime(),
|
|
signal = new Date().getTime(),
|
|
version = "1.0.0";
|
|
version = "1.0.0";
|
|
// 获取token前需要保存跳转前路径
|
|
// 获取token前需要保存跳转前路径
|
|
- // if (!ignore.includes(to.path)) {
|
|
|
|
- // sessionStorage.setItem("TOURL", to.path)
|
|
|
|
- // } else {
|
|
|
|
- // // 如果重定向前为404则跳入/
|
|
|
|
- // sessionStorage.setItem("TOURL", '/')
|
|
|
|
- // }
|
|
|
|
|
|
+ if (!ignore.includes(to.path)) {
|
|
|
|
+ sessionStorage.setItem("TOURL", to.path)
|
|
|
|
+ } else {
|
|
|
|
+ // 如果重定向前为404则跳入/
|
|
|
|
+ sessionStorage.setItem("TOURL", '/')
|
|
|
|
+ }
|
|
window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
|
|
window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|