From 8d910315810c026a59c3eece7eeb521200a6a8c3 Mon Sep 17 00:00:00 2001 From: "jqtmviyu@gmail.com" Date: Fri, 15 Jan 2021 18:18:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E8=B7=AF=E7=94=B1=E5=89=8D=E7=BD=AE?= =?UTF-8?q?=E5=AE=88=E5=8D=AB=E8=8E=B7=E5=8F=96=E5=AD=98=E5=82=A8=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 6 +++++- src/views/dashboard/index.vue | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) 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') } }