|
@@ -101,7 +101,6 @@ class WeixinController extends Controller {
|
|
if (type === '0') {
|
|
if (type === '0') {
|
|
// 通过openid取得用户信息
|
|
// 通过openid取得用户信息
|
|
if (user) {
|
|
if (user) {
|
|
-
|
|
|
|
console.log('用户信息2--->' + user.role);
|
|
console.log('用户信息2--->' + user.role);
|
|
// user_ = await this.checkVip(user_);
|
|
// user_ = await this.checkVip(user_);
|
|
let remark = '';
|
|
let remark = '';
|
|
@@ -114,7 +113,6 @@ class WeixinController extends Controller {
|
|
},
|
|
},
|
|
dataType: 'json',
|
|
dataType: 'json',
|
|
});
|
|
});
|
|
- console.log('取得vipuser--' + vipuser);
|
|
|
|
if (vipuser.status === 200) {
|
|
if (vipuser.status === 200) {
|
|
if (vipuser.data.errcode === 0) {
|
|
if (vipuser.data.errcode === 0) {
|
|
const vd = vipuser.data.res;
|
|
const vd = vipuser.data.res;
|
|
@@ -126,9 +124,10 @@ class WeixinController extends Controller {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- const user_ = { ...user, remark };
|
|
|
|
|
|
+ console.log('用户信息remark--->' + remark);
|
|
|
|
+ const user_ = { ...JSON.parse(JSON.stringify(user)), remark };
|
|
|
|
+ console.log('用户信息重组' + user_);
|
|
console.log(user_);
|
|
console.log(user_);
|
|
- console.log('用户信息remark--->' + user_.remark);
|
|
|
|
const token = await this.ctx.service.login.createJwt(user_);
|
|
const token = await this.ctx.service.login.createJwt(user_);
|
|
console.log('token--->' + token);
|
|
console.log('token--->' + token);
|
|
const to_uri = urljoin(redirect_uri, `?token=${token}`);
|
|
const to_uri = urljoin(redirect_uri, `?token=${token}`);
|