reghao 3 лет назад
Родитель
Сommit
9a7125d1c6
4 измененных файлов с 42 добавлено и 7 удалено
  1. 14 0
      src/api/account/user.js
  2. 14 0
      src/api/user/user.js
  3. 13 6
      src/store/modules/user.js
  4. 1 1
      src/views/user/home.vue

+ 14 - 0
src/api/account/user.js

@@ -0,0 +1,14 @@
+import $axios from '../index'
+
+const userApi = {
+  myInfoApi: '/api/user/info/my',
+  userInfoApi: '/api/user/info'
+}
+
+export function getMyInfo() {
+  return $axios.get(userApi.myInfoApi)
+}
+
+export function getUserInfo(userId) {
+  return $axios.get(userApi.userInfoApi + '?userId' + userId)
+}

+ 14 - 0
src/api/user/user.js

@@ -0,0 +1,14 @@
+import $axios from '../index'
+
+const userApi = {
+  myInfoApi: '/api/user/info/my',
+  userInfoApi: '/api/user/info'
+}
+
+export function getMyInfo() {
+  return $axios.get(userApi.myInfoApi)
+}
+
+export function getUserInfo(userId) {
+  return $axios.get(userApi.userInfoApi + '?userId' + userId)
+}

+ 13 - 6
src/store/modules/user.js

@@ -1,5 +1,6 @@
 import { login, logout } from '@/api/user/auth'
 import { register } from '@/api/user/account'
+import { getMyInfo } from '@/api/user/user'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 
 const getDefaultState = () => {
@@ -55,15 +56,21 @@ const actions = {
     return new Promise((resolve, reject) => {
       login(loginData).then(res => {
         if (res.code === 0) {
-          const userInfo = res.data
-          const token = userInfo.token
+          const token = res.data.token
           commit('SET_TOKEN', token)
           setToken(token)
 
-          const userId = userInfo.userId
-          console.log('userId: ' + userId)
-          commit('SET_USER_INFO', userInfo)
-          resolve()
+          getMyInfo().then(res => {
+            if (res.code === 0) {
+              const userInfo = res.data
+              commit('SET_USER_INFO', userInfo)
+              resolve()
+            } else {
+              console.log(res.data)
+            }
+          }).catch(error => {
+            reject(error)
+          })
         } else {
           console.log(res.data)
         }

+ 1 - 1
src/views/user/home.vue

@@ -45,7 +45,7 @@
           cols="6"
           md="4"
         >
-          关注数: {{ userInfo.followerCount }}
+          关注数: {{ userInfo.followingCount }}
           粉丝数: {{ userInfo.followerCount }}
         </v-col>
       </v-row>