|
@@ -45,11 +45,11 @@ const user = {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
login(userInfo).then(res => {
|
|
|
console.log(res, 'login success')
|
|
|
- if (res.userid) {
|
|
|
+ if (res && res.userid) {
|
|
|
Vue.ls.set('hasError', 0)
|
|
|
commit('SET_TOKEN', res.userid)
|
|
|
commit('SET_STORENAME', res.orgName)
|
|
|
- commit('SET_NAME', { name: res.username, welcome: welcome() })
|
|
|
+ commit('SET_NAME', { name: res.userNameCN, welcome: welcome() })
|
|
|
commit('SET_AVATAR', res.avatar ? res.avatar : '')
|
|
|
Vue.ls.set('rolesAccess', { permissionList: res.permCodes }, 7 * 24 * 60 * 60 * 1000)
|
|
|
// 记住密码
|