Merge branch 'hotfix/requireAuth'

Former-commit-id: 836238215c7dd91cf951b5a5e15126a3f2353e2c [formerly 836238215c7dd91cf951b5a5e15126a3f2353e2c [formerly 836238215c7dd91cf951b5a5e15126a3f2353e2c [formerly 836238215c7dd91cf951b5a5e15126a3f2353e2c [formerly 6f241ee65a6bef976421bfdde133e002a4eae935 [formerly 49ef89c90ec29ae88beb5fff944a9f9a529d5e56]]]]]
Former-commit-id: dbfd6018a3d0aec848d2d5a3464be2526a4b9f8f
Former-commit-id: 779518ca8fc707c1642f88cd80bc3a6ee4c4976e
Former-commit-id: 993f58ec14d0bb701c97efdca02f07cc27c040af [formerly 5e87d739d1a5d07e68d24c97adc0483a35d5666b]
Former-commit-id: c2ca454b036d3d2d47618a8c9ef1bc811cc99b7a
Former-commit-id: 841f7beb6f666e47284b12c3af261f19aef2be8a
Former-commit-id: 739d84e318361239f59cef7222dcdd782515b96d
Former-commit-id: 904361087f17d22181fa60f18388544362d041ac
Former-commit-id: e8d465ad7a13a142e8db85b84b33adbca7c1b5dd
This commit is contained in:
liyang
2018-12-04 10:18:49 +08:00
11 changed files with 11 additions and 11 deletions

View File

@@ -29,7 +29,7 @@ router.beforeEach((to, from, next) => {
// 关闭搜索面板
store.commit('d2admin/search/set', false)
// 验证当前路由所有的匹配中是否需要有登录验证的
if (to.matched.some(r => r.meta.requiresAuth)) {
if (to.matched.some(r => r.meta.auth)) {
// 这里暂时将cookie里是否存有token作为验证是否登录的条件
// 请根据自身业务需要修改
const token = util.cookies.get('token')

View File

@@ -1,6 +1,6 @@
import layoutHeaderAside from '@/layout/header-aside'
const meta = { requiresAuth: true }
const meta = { auth: true }
export default {
path: '/demo/business',

View File

@@ -1,6 +1,6 @@
import layoutHeaderAside from '@/layout/header-aside'
const meta = { requiresAuth: true }
const meta = { auth: true }
export default {
path: '/demo/charts',

View File

@@ -1,6 +1,6 @@
import layoutHeaderAside from '@/layout/header-aside'
const meta = { requiresAuth: true }
const meta = { auth: true }
export default {
path: '/demo/components',

View File

@@ -1,6 +1,6 @@
import layoutHeaderAside from '@/layout/header-aside'
const meta = { requiresAuth: true }
const meta = { auth: true }
export default {
path: '/demo/d2-crud',

View File

@@ -1,6 +1,6 @@
import layoutHeaderAside from '@/layout/header-aside'
const meta = { requiresAuth: true }
const meta = { auth: true }
export default {
path: '/demo/element',

View File

@@ -1,6 +1,6 @@
import layoutHeaderAside from '@/layout/header-aside'
const meta = { requiresAuth: true }
const meta = { auth: true }
export default {
path: '/demo/frame',

View File

@@ -1,6 +1,6 @@
import layoutHeaderAside from '@/layout/header-aside'
const meta = { requiresAuth: true }
const meta = { auth: true }
export default {
path: '/demo/playground',

View File

@@ -1,6 +1,6 @@
import layoutHeaderAside from '@/layout/header-aside'
const meta = { requiresAuth: true }
const meta = { auth: true }
export default {
path: '/demo/plugins',

View File

@@ -9,7 +9,7 @@ import business from './modules/business'
import layoutHeaderAside from '@/layout/header-aside'
const meta = { requiresAuth: true }
const meta = { auth: true }
/**
* 在主框架内显示

View File

@@ -21,7 +21,7 @@ export default {
fullPath: '/index',
meta: {
title: '首页',
requiresAuth: false
auth: false
}
}
]