优化找回密码页面验证逻辑

pages/deepMate/deepMate.vue

@@ -566,13 +566,6 @@ watch(messages, (arr) => {
   }
 });
 
-// 监听 isSending 状态变化，保持最新的状态
-watch(isSending, (newVal, oldVal) => {
-  console.log(`isSending changed from ${oldVal} to ${newVal}`);
-  // 可以在这里添加其他需要在 isSending 状态变化时执行的逻辑
-  // 例如更新 UI 状态、触发动画等
-});
-
 // 滚动到底部（仅聊天区域滚动）
 const scrollToBottom = () => {
   if (!shouldAutoScroll.value) return;

pages/start/recoverPassword/recoverPassword.vue

@@ -46,7 +46,7 @@
     <view v-else class="switch-container-occupy"> </view>
     <!-- 输入框 -->
     <view v-if="isRecovering" class="input-container">
-      <view v-if="switchType === 'Email'">
+      <view >
         <!-- 修改邮箱输入框容器，将图标包含在内 -->
         <view class="input-with-icon">
           <image
@@ -56,6 +56,7 @@
           />
           <input
             class="input-field"
+            
             :type="newPasswordLookFirst ? 'text' : 'password'"
             placeholder="输入新密码"
             v-model="newPasswordFirst"
@@ -78,6 +79,7 @@
             alt=""
           />
           <input
+            
             class="input-field"
             :type="newPasswordLookSecond ? 'text' : 'password'"
             placeholder="再次确认"
@@ -136,7 +138,7 @@
             class="input-field"
             type="text"
             placeholder="请输入验证码"
-            v-model="password"
+            v-model="verifyCode"
           />
         </view>
       </view>
@@ -182,7 +184,7 @@
           class="input-field"
           type="text"
           placeholder="请输入验证码"
-          v-model="password"
+          v-model="verifyCode"
         />
       </view>
     </view>
@@ -246,6 +248,7 @@ const { safeAreaInsets } = uni.getSystemInfoSync();
 const codeBtnText = ref("获取验证码");
 const isCodeBtnDisabled = ref(false); // 添加验证码按钮禁用状态
 const checkboxUrl = ref("../../../static/icons/Check-one-false.png");
+const verifyCode = ref("");
 const isRecovering = ref(false);
 const newPasswordLookFirst = ref(false);
 const newPasswordLookSecond = ref(false);
@@ -287,18 +290,18 @@ function goToBack() {
 function switchEmail() {
   // 切换到邮箱注册
   switchType.value = "Email";
+  verifyCode.value = "";
 }
 
 function switchPhone() {
   // 切换到手机注册
   switchType.value = "Phone";
+  verifyCode.value = "";
 }
 
-
 function register() {
   if (isRecovering.value) {
-
-	if(!newPasswordFirst.value || !newPasswordSecond.value){
+    if (!newPasswordFirst.value || !newPasswordSecond.value) {
       uni.showToast({
         title: "密码不能为空",
         icon: "none",
@@ -317,6 +320,7 @@ function register() {
     // 密码逻辑
     return;
   }
+
   if (switchType.value === "Phone") {
     // 登录逻辑
     if (!phone.value) {
@@ -327,21 +331,22 @@ function register() {
       return;
     }
 
-    if (!password.value) {
+    console.log("123");
+    
+
+    const phoneAll = `${country.value}${phone.value}`;
+    console.log("完整手机号" + phoneAll);
+    if (!validatePhoneNumber(country.value, phone.value)) {
+      return;
+    }
+
+    if (!verifyCode.value) {
       uni.showToast({
         title: "请输入验证码",
         icon: "none",
       });
       return;
     }
-    const phoneAll = `${country.value}${phone.value}`;
-    console.log("完整手机号" + phoneAll);
-    if (validatePhoneNumber(country.value, phone.value)) {
-      console.log("登录成功:", phoneAll);
-    }
-
-    // 发送登录请求
-    // console.log("登录:", phone.value);
   }
 
   if (switchType.value === "Email") {
@@ -354,14 +359,6 @@ function register() {
       return;
     }
 
-    if (!password.value) {
-      uni.showToast({
-        title: "请输入验证码",
-        icon: "none",
-      });
-      return;
-    }
-
     const bool = verificationEmail(email.value);
     console.log("验证是否成功", bool);
 
@@ -374,12 +371,18 @@ function register() {
       return;
     }
 
+    if (!verifyCode.value) {
+      uni.showToast({
+        title: "请输入验证码",
+        icon: "none",
+      });
+      return;
+    }
+
     // 发送登录请求
     console.log("登录:", email.value);
   }
 
-
-
   isRecovering.value = !isRecovering.value;
 
   // 如果已经同意，则继续登录流程
@@ -407,36 +410,15 @@ function onPhoneInput(e) {
   }
 }
 
-// function sendCode() {
-//   // 如果按钮已禁用，则不执行后续逻辑
-//   if (isCodeBtnDisabled.value) return;
-
-//   // 设置按钮为禁用状态
-//   isCodeBtnDisabled.value = true;
-//   codeBtnText.value = "重新发送";
-//   let time = 6;
-//   const timer = setInterval(() => {
-//     time--;
-//     codeBtnText.value = "重新发送 " + time + "S";
-//     if (time <= 0) {
-//       clearInterval(timer);
-//       codeBtnText.value = "重新发送";
-//       // 倒计时结束后启用按钮
-//       isCodeBtnDisabled.value = false;
-//     }
-//   }, 1000);
-
-//   return;
-// }
-
-function sendCode() {
+// 注册码码验证
+function VerCodeVerfifcation() {
   if (switchType.value === "Phone") {
     if (!phone.value) {
       uni.showToast({
         title: "请输入手机号",
         icon: "none",
       });
-      return;
+      return false;
     }
 
     const bool = verificationPhone(country.value, phone.value);
@@ -448,7 +430,7 @@ function sendCode() {
         title: "手机号格式不正确",
         icon: "none",
       });
-      return;
+      return false;
     }
   }
 
@@ -458,7 +440,7 @@ function sendCode() {
         title: "请输入邮箱地址",
         icon: "none",
       });
-      return;
+      return false;
     }
     const bool = verificationEmail(email.value);
     console.log("验证是否成功", bool);
@@ -469,10 +451,18 @@ function sendCode() {
         title: "邮箱格式不正确",
         icon: "none",
       });
-      return;
+      return false;
     }
   }
 
+  return true;
+}
+
+// 发送验证码
+function sendCode() {
+  if (!VerCodeVerfifcation()) {
+    return;
+  }
   // 如果按钮已禁用，则不执行后续逻辑
   if (isCodeBtnDisabled.value) return;
 
@@ -537,6 +527,7 @@ function validatePhoneNumber(countryCode, phoneNumber) {
       title: "手机号格式不正确",
       icon: "none",
     });
+
     return false;
   }