From 1a8b53b2445941553a3eda4d8a18b4cebfb2a6b5 Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Tue, 12 May 2026 17:40:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pageSubPack/loginSub/login.vue            | 23 +++++++++-
 .../pageSubPack/loginSub/pwd-login.vue        | 43 +++++++++++--------
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
index 953d470..d302bab 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
@@ -43,7 +43,7 @@
 		</view>
 
 		<!-- 登录按钮 -->
-		<button class="login-btn" :disabled="!canLogin" @click="handleLogin">
+		<button class="login-btn" @click="handleLogin">
 			登录
 		</button>
 
@@ -159,7 +159,26 @@
 
 	// 登录处理
 	const handleLogin = () => {
-		if (!canLogin.value) return;
+		  if (!phoneNumber.value) {
+		    uni.showToast({ title: '请输入手机号', icon: 'none' });
+		    return;
+		  }
+		  if (!/^1[3-9]\d{9}$/.test(phoneNumber.value)) {
+		    uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
+		    return;
+		  }
+		  if (!verifyCode.value) {
+		    uni.showToast({ title: '请输入验证码', icon: 'none' });
+		    return;
+		  }
+		  if (!/^\d{6}$/.test(verifyCode.value)) {
+		    uni.showToast({ title: '验证码为 6 位数字', icon: 'none' });
+		    return;
+		  }
+		  if (!agreeAgreement.value) {
+		    uni.showToast({ title: '请勾选协议', icon: 'none' });
+		    return;
+		  }
 		uni.showLoading({
 			title: '登录中...',
 			mask: true
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
index 8d17e11..d7d2b18 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
@@ -44,7 +44,7 @@
 		</view>
 
 		<!-- 登录按钮 -->
-		<button class="login-btn" :disabled="!canLogin" @click="handleLogin">
+		<button class="login-btn"  @click="handleLogin">
 			登录
 		</button>
 
@@ -104,23 +104,30 @@
 
 	// 登录逻辑
 	const handleLogin = () => {
-		if (!canLogin.value) {
-		 uni.showToast({ title: '请输入账号和密码', icon: 'none' });
-		 return
-		}
-
-		 if (!phoneNumber.value) {
-			uni.showToast({ title: '请输入账号', icon: 'none' });
-			return;
-		 }
-		 if (!password.value) {
-			uni.showToast({ title: '请输入密码', icon: 'none' });
-			return;
-		 }
-		 if(!agreeAgreement.value){
-		  uni.showToast({ title: '请勾选协议', icon: 'none' });
-		  return;
-		 }
+      if (!phoneNumber.value) {
+    		uni.showToast({ title: '请输入账号', icon: 'none' });
+    		return;
+      }
+      if (phoneNumber.value.length < 4 || phoneNumber.value.length > 16) {
+    		uni.showToast({ title: '账号长度需为 4-16 位', icon: 'none' });
+    		return;
+      }
+      if (!password.value) {
+    		uni.showToast({ title: '请输入密码', icon: 'none' });
+    		return;
+      }
+      if (password.value.length < 6) {
+    		uni.showToast({ title: '密码至少输入 6 位', icon: 'none' });
+    		return;
+      }
+      if (password.value.length > 16) {
+    		uni.showToast({ title: '密码不能超过 16 位', icon: 'none' });
+    		return;
+      }
+      if(!agreeAgreement.value){
+    	  uni.showToast({ title: '请勾选协议', icon: 'none' });
+    	  return;
+      }
 		  uni.showLoading({ title: '登录中...', mask: true });
 		 	let params = {
 		 		username:phoneNumber.value,