diff --git a/web/src/menu/index.js b/web/src/menu/index.js index d49e29c..422d23f 100644 --- a/web/src/menu/index.js +++ b/web/src/menu/index.js @@ -1,6 +1,5 @@ import { uniqueId } from 'lodash' import { request } from '@/api/service' -import store from '@/store' import XEUtils from 'xe-utils' import { frameInRoutes, frameOutRoutes } from '@/router/routes' const _import = require('@/libs/util.import.' + process.env.NODE_ENV) @@ -26,7 +25,6 @@ export const menuAside = supplementPath([]) // 请求菜单数据,用于解析路由和侧边栏菜单 export const getMenu = function () { - store.dispatch('d2admin/permission/load') return request({ url: '/api/system/menu/web_router/', method: 'get', diff --git a/web/src/router/index.js b/web/src/router/index.js index 69993b2..5e89ccc 100644 --- a/web/src/router/index.js +++ b/web/src/router/index.js @@ -56,6 +56,7 @@ router.beforeEach(async (to, from, next) => { }) await store.dispatch('d2admin/user/set', res.data, { root: true }) await store.dispatch('d2admin/account/load') + await store.dispatch('d2admin/permission/load', routes) store.dispatch('d2admin/dept/load') store.dispatch('d2admin/settings/init') }