|
@@ -8,7 +8,7 @@ import { validatenull } from '@/util/validate'
|
|
import NProgress from 'nprogress' // progress bar
|
|
import NProgress from 'nprogress' // progress bar
|
|
import 'nprogress/nprogress.css' // progress bar style
|
|
import 'nprogress/nprogress.css' // progress bar style
|
|
NProgress.configure({ showSpinner: false })
|
|
NProgress.configure({ showSpinner: false })
|
|
-const lockPage = store.getters.website.lockPage // 锁屏页
|
|
|
|
|
|
+
|
|
router.beforeEach((to, from, next) => {
|
|
router.beforeEach((to, from, next) => {
|
|
// 缓冲设置
|
|
// 缓冲设置
|
|
if (to.meta.keepAlive === true && store.state.tags.tagList.some(ele => {
|
|
if (to.meta.keepAlive === true && store.state.tags.tagList.some(ele => {
|
|
@@ -25,8 +25,8 @@ router.beforeEach((to, from, next) => {
|
|
}
|
|
}
|
|
const meta = to.meta || {}
|
|
const meta = to.meta || {}
|
|
if (store.getters.access_token) {
|
|
if (store.getters.access_token) {
|
|
- if (store.getters.isLock && to.path !== lockPage) {
|
|
|
|
- next({ path: lockPage })
|
|
|
|
|
|
+ if (store.getters.isLock && to.path !== '/lock') {
|
|
|
|
+ next({ path: '/lock' })
|
|
} else if (to.path === '/login') {
|
|
} else if (to.path === '/login') {
|
|
next({ path: '/' })
|
|
next({ path: '/' })
|
|
} else {
|
|
} else {
|