|
@@ -914,17 +914,17 @@ export default {
|
|
* 微信登入—返回数据
|
|
* 微信登入—返回数据
|
|
*/
|
|
*/
|
|
wxLoginBack(res) {
|
|
wxLoginBack(res) {
|
|
- // if (res.data.full_info) {
|
|
|
|
|
|
+ if (res.data.full_info) {
|
|
localStorage.setItem("user_account", res.data.user_account);
|
|
localStorage.setItem("user_account", res.data.user_account);
|
|
localStorage.setItem("token", res.data.token);
|
|
localStorage.setItem("token", res.data.token);
|
|
this.getInfo();
|
|
this.getInfo();
|
|
- // } else {
|
|
|
|
|
|
+ } else {
|
|
this.indexUserAccount = res.data.user_account;
|
|
this.indexUserAccount = res.data.user_account;
|
|
this.indexToken = res.data.token;
|
|
this.indexToken = res.data.token;
|
|
- // this.isLogin = false;
|
|
|
|
- //弹窗
|
|
|
|
- // this.bindShow = true;
|
|
|
|
- // }
|
|
|
|
|
|
+ this.isLogin = false;
|
|
|
|
+ // 弹窗
|
|
|
|
+ this.bindShow = true;
|
|
|
|
+ }
|
|
},
|
|
},
|
|
goLast() {
|
|
goLast() {
|
|
if (this.recordList.goodsType == 6) {
|
|
if (this.recordList.goodsType == 6) {
|
|
@@ -1201,18 +1201,18 @@ export default {
|
|
this.$request
|
|
this.$request
|
|
.login(loginForm)
|
|
.login(loginForm)
|
|
.then((res) => {
|
|
.then((res) => {
|
|
- // if (res.data.full_info) {
|
|
|
|
|
|
+ if (res.data.full_info) {
|
|
localStorage.setItem("user_account", res.data.user_account);
|
|
localStorage.setItem("user_account", res.data.user_account);
|
|
localStorage.setItem("token", res.data.token);
|
|
localStorage.setItem("token", res.data.token);
|
|
|
|
|
|
this.getInfo();
|
|
this.getInfo();
|
|
- // } else {
|
|
|
|
|
|
+ } else {
|
|
this.indexUserAccount = res.data.user_account;
|
|
this.indexUserAccount = res.data.user_account;
|
|
this.indexToken = res.data.token;
|
|
this.indexToken = res.data.token;
|
|
- // this.isLogin = false;
|
|
|
|
- //弹窗
|
|
|
|
- // this.bindShow = true;
|
|
|
|
- // }
|
|
|
|
|
|
+ this.isLogin = false;
|
|
|
|
+ // 弹窗
|
|
|
|
+ this.bindShow = true;
|
|
|
|
+ }
|
|
})
|
|
})
|
|
.catch((err) => {
|
|
.catch((err) => {
|
|
this.isLogin = false;
|
|
this.isLogin = false;
|
|
@@ -1271,16 +1271,16 @@ export default {
|
|
.loginSms(this.loginSmsForm)
|
|
.loginSms(this.loginSmsForm)
|
|
.then((res) => {
|
|
.then((res) => {
|
|
this.isloginSms = false;
|
|
this.isloginSms = false;
|
|
- // if (res.data.full_info) {
|
|
|
|
|
|
+ if (res.data.full_info) {
|
|
localStorage.setItem("user_account", res.data.user_account);
|
|
localStorage.setItem("user_account", res.data.user_account);
|
|
localStorage.setItem("token", res.data.token);
|
|
localStorage.setItem("token", res.data.token);
|
|
this.$tools.setUuid(new Date().valueOf() + "");
|
|
this.$tools.setUuid(new Date().valueOf() + "");
|
|
this.getInfo();
|
|
this.getInfo();
|
|
- // } else {
|
|
|
|
|
|
+ } else {
|
|
this.indexUserAccount = res.data.user_account;
|
|
this.indexUserAccount = res.data.user_account;
|
|
this.indexToken = res.data.token;
|
|
this.indexToken = res.data.token;
|
|
- // this.bindShow = true;
|
|
|
|
- // }
|
|
|
|
|
|
+ this.bindShow = true;
|
|
|
|
+ }
|
|
})
|
|
})
|
|
.catch((err) => {
|
|
.catch((err) => {
|
|
this.isloginSms = false;
|
|
this.isloginSms = false;
|