diff --git a/yudao-ui-admin/src/permission.js b/yudao-ui-admin/src/permission.js index 6b8e5f586..d40972193 100644 --- a/yudao-ui-admin/src/permission.js +++ b/yudao-ui-admin/src/permission.js @@ -21,10 +21,8 @@ router.beforeEach((to, from, next) => { // 获取字典数据 store.dispatch('dict/loadDictDatas') // 判断当前用户是否已拉取完user_info信息 - store.dispatch('GetInfo').then(res => { - // 拉取user_info - const roles = res.roles - store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => { + store.dispatch('GetInfo').then(() => { + store.dispatch('GenerateRoutes').then(accessRoutes => { // 根据roles权限生成可访问的路由表 router.addRoutes(accessRoutes) // 动态添加可访问路由表 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 diff --git a/yudao-ui-admin/src/store/modules/user.js b/yudao-ui-admin/src/store/modules/user.js index 1f868ff1e..78da4ece4 100644 --- a/yudao-ui-admin/src/store/modules/user.js +++ b/yudao-ui-admin/src/store/modules/user.js @@ -90,7 +90,7 @@ const user = { // 获取用户信息 GetInfo({ commit, state }) { return new Promise((resolve, reject) => { - getInfo(state.token).then(res => { + getInfo().then(res => { // 没有 data 数据,赋予个默认值 if (!res) { res = {