diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue index b311c29..09b112d 100644 --- a/src/pages/login/Login.vue +++ b/src/pages/login/Login.vue @@ -53,14 +53,18 @@ export default { async loginApi () { try { let res = await loginApi(this.loginname, encrypt(this.password)) - let obj = {} - if (this.memberName) { - obj = Object.assign({}, res.user.user, {token: res.token, loginname: this.loginname}) + if (res.code === '1') { + let obj = {} + if (this.memberName) { + obj = Object.assign({}, res.result.user.user, {token: res.token, loginname: this.loginname}) + } else { + obj = Object.assign({}, res.result.user.user, {token: res.token, loginname: ''}) + } + this.$store.dispatch('userInfo', JSON.stringify(obj)) + this.$router.push('/home') } else { - obj = Object.assign({}, res.user.user, {token: res.token, loginname: ''}) + this.toast(res.desc) } - this.$store.dispatch('userInfo', JSON.stringify(obj)) - this.$router.push('/home') this.disabled = false } catch (err) { this.disabled = false diff --git a/src/pages/login/Setup.vue b/src/pages/login/Setup.vue index 237adee..93cccfb 100644 --- a/src/pages/login/Setup.vue +++ b/src/pages/login/Setup.vue @@ -5,11 +5,11 @@