update

app/service/login.js

@@ -19,7 +19,8 @@ class LoginService extends CrudService {
   async login(data) {
     const { phone, passwd, role } = data;
     // 根据用户输入的手机号查询其他用户表中是否存在相应数据
-    const user = await this.model.findOne({ phone, role });
+    let user = await this.model.findOne({ phone, role });
+    user = JSON.parse(JSON.stringify(user));
     // 如果用户不存在抛出异常
     if (!user) {
       throw new BusinessError(ErrorCode.USER_NOT_EXIST);
@@ -31,8 +32,8 @@ class LoginService extends CrudService {
     if (pas !== _user.passwd.secret) {
       throw new BusinessError(ErrorCode.BAD_PASSWORD);
     }
-    console.log('-------------------------------_user.role');
-    console.log(_user.role);
+    // console.log('-------------------------------_user.role');
+    // console.log(_user.role);
     if (_user.role === '4' || _user.role === '5') {
       const url = 'http://127.0.0.1:9004/api/market/user/' + _user.uid;
       const marketuser = await this.ctx.curl(url, {
@@ -67,8 +68,15 @@ class LoginService extends CrudService {
         dataType: 'json',
       });
       // console.log('------------------------------------>>>>>>>>>>>>>>vipuser<<<<<<<<<<<*-----------------');
-      // console.log(vipuser);
-      user.remark = vipuser.data.id;
+      if (vipuser.status === 200) {
+        if (vipuser.data.errcode === 0) {
+          const vd = vipuser.data.res;
+          user = { ...user, remark: vd };
+        }
+      }
+      console.log('user');
+      console.log(user);
+
     }
     // 取出用户的类型，根据用户类型返回相应信息
     const state = uuid();
@@ -84,6 +92,7 @@ class LoginService extends CrudService {
     const token = await this.createJwt(user);
     await this.app.redis.set(key, token, 'EX', 60 * 60 * 24);
 
+
     const operationlogdata = { login_id: user.id, login_name: user.name, login_role: user.role, type: '0', operation_edit: '登录' };
     const url = 'http://127.0.0.1:9004/api/market/operationlog/';
     const operationlog = await this.ctx.curl(url, {
@@ -129,7 +138,7 @@ class LoginService extends CrudService {
   // 删除操作
   async destroy({ key }) {
     const res = await this.app.redis.del(key);
-    console.log(res);
+    // console.log(res);
     return res;
   }