diff --git a/src/permission.js b/src/permission.js index 5d88bee..c7b2106 100644 --- a/src/permission.js +++ b/src/permission.js @@ -75,13 +75,17 @@ import 'nprogress/nprogress.css' const whiteList = ['/login', '/404'] // 全局前置路由守卫 -router.beforeEach((to, from, next) => { +router.beforeEach(async(to, from, next) => { NProgress.start() // 判断是否有token if (store.getters.token) { // 有token if (to.path === '/login') { // 在登录页 next('/') } else { + // 有token, 不在登录页, 会用到用户信息, 可以开始获取 + if (!store.getters.userId) { + await store.dispatch('user/getUserInfo') + } next() } } else { // 没有token diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 7e5cc5f..dfc5cc6 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -19,7 +19,7 @@ export default { // getUserInfo().then(res => { // console.log(res) // }) - this.$store.dispatch('user/getUserInfo') + // this.$store.dispatch('user/getUserInfo') } }