diff --git a/src/api/person.ts b/src/api/person.ts index 9abd9e8..a38c13b 100644 --- a/src/api/person.ts +++ b/src/api/person.ts @@ -1,10 +1,5 @@ import request from '@/utils/requset' -request.interceptors.response.use(response => { - // @ts-ignore - if (response.code >= 200 && response.code < 300) return response; - else return Promise.reject(response); -}) enum api { liststu = '/abilityEvaluation/personalAbilityEvaluationCollect/liststu', // 个人能力评价列表 diff --git a/src/permissions.ts b/src/permissions.ts index b3281c2..08812e3 100644 --- a/src/permissions.ts +++ b/src/permissions.ts @@ -2,7 +2,11 @@ import router from '@/router/index' import userStore from './store/module/user' // 定义要求登录访问的名单 -const asyncRouterName = ['UserInfo','RegistrationPersonage','RegistrationGroup'] +const asyncRouterName = [ + 'UserInfo', + 'RegistrationPersonage', + 'RegistrationGroup', +] const asyncRouter = (path: string) => { return asyncRouterName.includes(path) @@ -10,23 +14,20 @@ const asyncRouter = (path: string) => { router.beforeEach(async (to, form, next) => { const useuserStore = userStore() - - if (useuserStore.token) { if (to.path === '/login') { next({ path: '/' }) } else { - useuserStore.getUserInfo() - next() - } - } else { - if (!Object.keys(useuserStore.userInfo).length) { - if (asyncRouter(to.name as string)) { - next('/login') + if (!Object.keys(useuserStore.userInfo).length) { + useuserStore.getUserInfo() + next() } else { - next() } + } + } else { + if (asyncRouter(to.name as string)) { + next('/login') } else { next() }