Merge branch 'feature/menu_search' into develop

Former-commit-id: 1b92128e89b29eda735f274243b152009c9fda1d [formerly 1b92128e89b29eda735f274243b152009c9fda1d [formerly 1b92128e89b29eda735f274243b152009c9fda1d [formerly 1b92128e89b29eda735f274243b152009c9fda1d [formerly 6d0ad889c8a55b39aed1234f33bd4289becb382f [formerly 628b796b47811eac1da0c6ef7a2857a0dc93762a]]]]]
Former-commit-id: b643ffbe716bc602991a675857c899fe4598de6b
Former-commit-id: 89177da3733ab7fd98ff5c038c2c2618353d1521
Former-commit-id: 1d1328895a0adc0e43e207167b48db8a77ea49f9 [formerly 75f6252347dc0048f1ce40a56690da8f0971f95a]
Former-commit-id: 422e9a18552f63ec5390a3f79688bdd733a72047
Former-commit-id: facbc0e703cfb4a43a2af3348cd69f63b7e1f425
Former-commit-id: 27f70579ee35411203e52c565854c81af6060e89
Former-commit-id: 85d532f0d569c2681dc4bd6cf2f39c3078ea30c5
Former-commit-id: 76aa5b8cc5b7097c23ddb18c93817d47591e100b
This commit is contained in:
liyang
2018-08-29 14:22:51 +08:00
15 changed files with 523 additions and 21 deletions

View File

@@ -1,6 +1,8 @@
import Vue from 'vue'
import VueRouter from 'vue-router'
import store from '@/store/index'
import util from '@/libs/util.js'
// 路由数据
@@ -18,6 +20,8 @@ const router = new VueRouter({
* 权限验证
*/
router.beforeEach((to, from, next) => {
// 关闭搜索面板
store.commit('d2admin/search/set', false)
// 验证当前路由所有的匹配中是否需要有登陆验证的
if (to.matched.some(r => r.meta.requiresAuth)) {
// 这里暂时将cookie里是否存有token作为验证是否登陆的条件