diff --git a/src/api/interfaces/user.ts b/src/api/interfaces/user.ts index b55664a..ca655f6 100644 --- a/src/api/interfaces/user.ts +++ b/src/api/interfaces/user.ts @@ -1,10 +1,15 @@ -import { BaseInfo } from '@/types/user' +import { BaseInfo, UserIndex } from '@/types/user' import request from '@/utils/request' +const index = (): Promise => { + return request.get('user') +} + const info = (): Promise => { return request.get('user/info') } export default { + index, info } diff --git a/src/router/index.ts b/src/router/index.ts index a5fbb3f..88e1f2f 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -55,7 +55,7 @@ router.beforeEach((to, from, next) => { if (to.name !== 'AuthLogin' && to.meta.requiresAuth && !isAuthenticated) { next({ name: 'AuthLogin', query: { to: to.path }}) } else if (isAuthenticated && (to.name == 'AuthLogin' || to.name == 'AuthRegister')) { - next({ name: 'Home' }) + next({ name: 'User' }) } else { next() } diff --git a/src/store/modules/auth.ts b/src/store/modules/auth.ts index 6a24003..64da89a 100644 --- a/src/store/modules/auth.ts +++ b/src/store/modules/auth.ts @@ -1,4 +1,4 @@ -import { auth } from '@/api' +import { auth, user } from '@/api' import { PERSISTED_KEY, State } from '@/store' import { LoginData } from '@/types/auth' import { Module } from 'vuex' @@ -16,6 +16,9 @@ export default { commit('setAccessToken', response, { root: true }) // 刷新用户中心页面 commit('refresh/setUser', true, { root: true }) + user.info().then(info => { + commit('setUserInfo', info, { root: true }) + }) resolve(response) }).catch(error => { reject(error) diff --git a/src/types/user.d.ts b/src/types/user.d.ts index e8e36a2..36ca347 100644 --- a/src/types/user.d.ts +++ b/src/types/user.d.ts @@ -5,6 +5,6 @@ export declare interface BaseInfo { avatar: string } -export declare type UserInfo = BaseInfo & { - level: number +export declare type UserIndex = BaseInfo & { + balance: string } diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index 342dd16..8a6f183 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -7,18 +7,15 @@ - -