From 656ea3b2b410ca483f06b6625a2fd37d097bf83e Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 16:27:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20bug2786=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Forget.vue | 101 +++++++++++++++++++++++---
 1 file changed, 92 insertions(+), 9 deletions(-)

diff --git a/src/views/login/components/Forget.vue b/src/views/login/components/Forget.vue
index 3137f70..5588ac0 100644
--- a/src/views/login/components/Forget.vue
+++ b/src/views/login/components/Forget.vue
@@ -50,14 +50,86 @@ const formSure: FormSure = reactive({
   loginname: "13311111111",
 });
 const tab = ref(0);
+const loginSuccess = ref(true);
+const loginRejectMessge = ref("");
 const countTime = ref("获取验证码");
 const rules = {
-  enterprisecode: { required: true, message: "请输入企业编码", trigger: "blur" },
-  agentcode: { required: true, message: "请输入企业编码", trigger: "blur" },
-  loginname: { required: true, message: "请输入用户名", trigger: "blur" },
-  phone: { required: true, message: "请输入手机号", trigger: "blur" },
+  enterprisecode: [
+    { required: true, message: "请输入企业编码", trigger: "blur" },
+    {
+      trigger: ["blur", "input", "change"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value || !value) {
+          return true;
+        }
+        if (loginRejectMessge.value.indexOf("企业") > -1) {
+          return new Error(loginRejectMessge.value);
+        }
+      },
+    },
+  ],
+  agentcode: [
+    { required: true, message: "请输入企业编码", trigger: "blur" },
+    {
+      trigger: ["blur", "input", "change"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value || !value) {
+          return true;
+        }
+        if (loginRejectMessge.value.indexOf("企业") > -1) {
+          return new Error(loginRejectMessge.value);
+        }
+      },
+    },
+  ],
+  loginname: [
+    { required: true, message: "请输入用户名", trigger: "blur" },
+    {
+      trigger: ["blur", "input", "change"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value || !value) {
+          return true;
+        }
+        if (loginRejectMessge.value.indexOf("用户名") > -1) {
+          return new Error(loginRejectMessge.value);
+        }
+      },
+    },
+  ],
+  phone: [
+    { required: true, message: "请输入手机号", trigger: "blur" },
+    {
+      trigger: ["blur", "input", "change"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value || !value) {
+          return true;
+        }
+        if (loginRejectMessge.value.indexOf("手机号") > -1) {
+          return new Error(loginRejectMessge.value);
+        }
+      },
+    },
+  ],
   password: { required: true, message: "请输入密码", trigger: "blur" },
-  phonecode: { required: true, message: "请输入验证码", trigger: "blur" },
+  phonecode: [
+    { required: true, message: "请输入验证码", trigger: "blur" },
+    {
+      trigger: ["blur", "input", "change"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value || !value) {
+          return true;
+        }
+        if (loginRejectMessge.value.indexOf("验证码") > -1) {
+          return new Error(loginRejectMessge.value);
+        }
+      },
+    },
+  ],
   newPassword: { required: true, message: "请输入新密码", trigger: "blur" },
   rePasswrod: [
     {
@@ -74,35 +146,46 @@ const rules = {
 };
 
 function validatePasswordSame(rule: any, value: string): boolean {
-  return value === formSure.newPassword;
+  if (Boolean(formSure.rePasswrod)) {
+    if (value == formSure.newPassword) {
+      return true;
+    } else {
+      return false;
+    }
+  } else {
+    return true;
+  }
 }
 
 function handleSubmit(e) {
   e.preventDefault();
+  loginSuccess.value = true;
   formRef.value.validate(async (errors) => {
     if (!errors) {
       const { loginname, phone, phonecode, agentcode } = formForget;
       loading.value = true;
-
       const params = {
         loginname,
         phone,
         phonecode,
         agentcode,
       };
-
       try {
         const res = await forgetPassword(params);
         if (res.code === "OK") {
+          loginSuccess.value = true;
           formSure.loginname = res.data?.loginname;
           tab.value = 1;
         } else {
+          loginSuccess.value = false;
           message.error(res.message);
+          loginRejectMessge.value = res.message;
+          formRef.value.validate();
         }
       } finally {
         loading.value = false;
       }
-    } 
+    }
   });
 }
 

From ab4adcb70f6c08df2b1a5e28376aa3646831c9d6 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 29 Mar 2024 16:32:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=202785=E3=80=812786=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Forget.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/login/components/Forget.vue b/src/views/login/components/Forget.vue
index 5588ac0..e6c4e10 100644
--- a/src/views/login/components/Forget.vue
+++ b/src/views/login/components/Forget.vue
@@ -237,6 +237,9 @@ function computedFormSure() {
 async function sendCode(value) {
   if (!flag.value) return;
   flag.value = false;
+  if(!(formForget.phone.length == 11)){
+    return
+  }
   const res = await getCode({
     phone: formForget.phone,
     agentcode: formForget.agentcode,