|
@@ -1,5 +1,5 @@
|
|
|
import { login, logout, getInfo, getMenu ,getImgCode,updateUserAvatarNickname,loginapi,logoutapi,logoutStatus} from '@/api/user'
|
|
|
-import { getToken, setToken, setUserUrl, removeToken ,removUserUrl,getUserUrl,getUseType,removUseType,setUseType,getExp,setExp,removeExp,setWebSiteId,getWebSiteId,removeWebSiteId } from '@/utils/auth'
|
|
|
+import { setUserInfo,getToken, setToken, setUserUrl, removeToken ,removUserUrl,getUserUrl,getUseType,removUseType,setUseType,getExp,setExp,removeExp,setWebSiteId,getWebSiteId,removeWebSiteId } from '@/utils/auth'
|
|
|
import router, { resetRouter } from '@/router'
|
|
|
import axios from 'axios'
|
|
|
import { getUserInfo } from '@/api/userMember'
|
|
@@ -93,6 +93,7 @@ const actions = {
|
|
|
if(data.token==undefined){
|
|
|
console.log("登录失败!userurl非法!")
|
|
|
}else{
|
|
|
+ // console.log("#########:",userInfo)
|
|
|
//会员登录跳转 但不储存
|
|
|
if(userInfo.backurl){
|
|
|
console.log("不储存用户的userurl!")
|
|
@@ -150,6 +151,16 @@ const actions = {
|
|
|
getInfo({ commit, state }) {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
getInfo(state.token).then(response => {
|
|
|
+ // console.log("#########$$$$$$$$$$$$$$$$$::",response)
|
|
|
+ let userInfo = {
|
|
|
+ id:response.data.id,
|
|
|
+ uid: response.data.id,
|
|
|
+ nickname: response.data.nickname,
|
|
|
+ // signature: response.data.signature,
|
|
|
+ avatar: response.data.avatar,
|
|
|
+ }
|
|
|
+
|
|
|
+ setUserInfo(JSON.stringify(userInfo),state.exp)
|
|
|
const { data } = response
|
|
|
// if (!data) {
|
|
|
// reject('Verification failed, please Login again.')
|
|
@@ -166,10 +177,10 @@ const actions = {
|
|
|
commit('SET_ROLES', roles)
|
|
|
commit('SET_USERID', data.id)
|
|
|
commit('SET_NAME', nickname)
|
|
|
- //console.log("开始设置身份详情")
|
|
|
- //console.log(nickname)
|
|
|
+ console.log("开始设置身份详情")
|
|
|
+ console.log(nickname)
|
|
|
commit('SET_AVATAR', avatar)
|
|
|
- //console.log(avatar)
|
|
|
+ console.log(avatar)
|
|
|
commit('SET_INTRODUCTION', introduction)
|
|
|
commit('SET_ROLE_ID', role_id)
|
|
|
//设置用户等级
|