|
|
@@ -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)
|
|
|
}
|