@cloudbase/lowcode-builder 1.10.30 → 1.10.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.10.30",
+  "version": "1.10.31",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/mp/packages/$wd_system/pages/login/index.js

@@ -316,7 +316,7 @@ Component({
         verificationInfo,
         loginOnly: !this.data.settingData.userRegistry?.enable,
         isRegister: this.data.isRegister,
-        hasRegisterConfig: this.data.userRegistry?.enable && this.data.userRegistry?.web?.length, // 有注册配置，才会走注册配置的判断
+        hasRegisterConfig: this.data.settingData.userRegistry?.enable && !!this.data.settingData.userRegistry?.miniprogram?.find(v => v.id === this.data.currentLoginType), // 有注册配置，才会走注册配置的判断
         callback: (err, data) => {
           if (err) {
             // 错误处理：更新尝试次数
@@ -609,6 +609,14 @@ Component({
       loginSuccessCallBack(this);
     },
     methodClick(e) {
+      if (this.data.disableLoginSubmit) {
+        wx.showToast({
+          title: '请先阅读并同意协议',
+          icon: 'none'
+        })
+        return;
+      };
+
       const {
         id
       } = e.currentTarget.dataset.item || {};
@@ -620,13 +628,6 @@ Component({
       })
 
       if (AUTO_LOGIN_TYPE.includes(currentLoginType)) {
-        if (this.data.disableLoginSubmit) {
-          wx.showToast({
-            title: '请先阅读并同意协议',
-            icon: 'none'
-          })
-          return;
-        };
         this.dealOpenIdOrUnionIdLogin(currentLoginType)
         return;
       }

package/template/mp/packages/$wd_system/pages/login/methods/contants.js

@@ -4,4 +4,3 @@ export const emailVerifyInfoKey = 'sso_email_verifyInfo'; // 获取邮箱信息
 export const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
 export const verifyCodeFailedLimit = 8; // 同一个验证码使用8次即提示错误
 export const verifyDelay = 60; // 获取验证码倒计时，单位s
-export const loginOnly = false;

package/template/mp/packages/$wd_system/pages/login/methods/loginByEmail.js

@@ -39,8 +39,12 @@ export default async function loginByEmail(
       };
     }
 
-    if (isRegister && verificationInfo.isUser && verificationInfo.email === email) {
-      throw { error: 'user has already registered, please log in directly' };
+    if (isRegister && verificationInfo.isUser) {
+      throw new Error('user has already registered, please log in directly');
+    }
+
+    if (!isRegister && !verificationInfo.isUser) {
+      throw { error: 'user not registered, please register first' };
     }
 
     // 校验
@@ -63,7 +67,7 @@ export default async function loginByEmail(
           provider_token: bindInfo.providerToken,
         });
       }
-    } else if (!hasRegisterConfig || isRegister) {
+    } else if (hasRegisterConfig && isRegister) {
       // 3. 注册
       await auth.signUp({
         email,

package/template/mp/packages/$wd_system/pages/login/methods/loginBySms.js

@@ -1,11 +1,11 @@
 import { parseSmsLoginError } from './errorHandler';
 import { app } from '../../../../../app/weapps-api';
 import loginSuccessCallBack from './loginSuccessCallBack';
-import { phoneVerifyInfoKey, verifyCodeFailedLimit, loginOnly } from './contants';
+import { phoneVerifyInfoKey, verifyCodeFailedLimit } from './contants';
 
 export default async function loginBySms(
   instance,
-  { callback, verificationInfo, verificationCode, phoneNum, bindInfo, isRegister, hasRegisterConfig },
+  { callback, verificationInfo, verificationCode, phoneNum, bindInfo, loginOnly, isRegister, hasRegisterConfig },
 ) {
   wx.showLoading({ mask: true });
   const { usedCount = 0 } = wx.getStorageSync(phoneVerifyInfoKey) || {};
@@ -18,8 +18,12 @@ export default async function loginBySms(
       throw { error: 'get_verify_code' };
     }
 
-    if (isRegister && verificationInfo.isUser && verificationInfo.phoneNum === phoneNum) {
-      throw { error: 'user has already registered, please log in directly' };
+    if (isRegister && verificationInfo.isUser) {
+      throw new Error('user has already registered, please log in directly');
+    }
+
+    if (!isRegister && !verificationInfo.isUser) {
+      throw { error: 'user not registered, please register first' };
     }
 
     // 校验
@@ -44,7 +48,7 @@ export default async function loginBySms(
           provider_token: bindInfo.providerToken,
         });
       }
-    } else if (!hasRegisterConfig || isRegister) {
+    } else if (hasRegisterConfig && isRegister) {
       // 自定义应用走signUp逻辑
       await auth.signUp({
         phone_number: `+86 ${phoneNum}`,
@@ -60,7 +64,7 @@ export default async function loginBySms(
   } catch (e) {
     wx.hideLoading();
     wx.showModal({
-      title: '验证码登录失败',
+      title: `验证码${isRegister ? '注册' : '登录'}失败`,
       content: parseSmsLoginError(e),
     });
     callback?.(new Error(parseSmsLoginError(e)));