no message

src/biz/member/user.ts

@@ -37,7 +37,7 @@ export async function login({loginId, pwd}) {
 
     let token = "";
     const Now = new Date().valueOf();
-    if (userInfo.isAdmin == STATE.是 || (userInfo.userRegisterState == USERREGISTERSTATE.通过 && userInfo.isAdmin == STATE.否)) {
+    if (userInfo.isAdmin == STATE.是 || (userInfo.userRegisterState != USERREGISTERSTATE.驳回修改 && userInfo.isAdmin == STATE.否)) {
         token = generateToken(userInfo.userId);
         await updateOneData(TABLEENUM.用户表, {userId:userInfo.userId}, {token, tokenMs:Now, lastLoginMs:Now});
     }

src/biz/register.ts

@@ -45,6 +45,7 @@ export async function memberRegister1({form}) {
 
     /**初始化账号信息 */
     let userId = sysTools.generateUserId();//系统生成唯一id
+    let token = sysTools.generateToken(userId);
     let addInfo = {
         userId,
         memberType:MEMBERTYPE.个人会员, 
@@ -52,12 +53,13 @@ export async function memberRegister1({form}) {
         registerFlow:REGISTERFLOW.完成第一步,//会员注册流程状态
         askForTime:NowMs,//申请时间
         loginId, mail, pwd, phone,
+        token
     };
     await addOneData(TABLEENUM.用户表, addInfo);
 
     await updateOneData(TABLEENUM.验证码表, {phone, code:codeNum, isUse:false }, {isUse:true});
 
-    return {userId}
+    return {userId, token}
 }
 
 
@@ -138,6 +140,7 @@ export async function memberRegister2({form, id}) {
 
     /**初始化账号信息 */
     let userId = sysTools.generateUserId();
+    let token = sysTools.generateToken(userId);
     let addInfo = {
         userId,
         memberType:MEMBERTYPE.单位会员,
@@ -147,14 +150,15 @@ export async function memberRegister2({form, id}) {
         loginId,
         mail,
         pwd,
-        phone
+        phone,
+        token
     };
     await addOneData(TABLEENUM.用户表, addInfo);
 
     /**修改验证码状态为已使用 */
     await updateOneData(TABLEENUM.验证码表, {phone, code:codeNum, isUse:false }, {isUse:true});
 
-    return {userId};
+    return {userId, token};
 }