From 66e1235c3b1c126fc6d60957a6cdd997e2b0da22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 8 Nov 2021 16:39:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=BE=E5=9B=9E=E5=AF=86=E7=A0=81=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0=E4=B8=8A=E9=99=90+=E6=89=BE=E5=9B=9E=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E7=A1=AE=E8=AE=A4=E5=AF=86=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/loginRegister/Login.jsx         | 2 +-
 src/modules/loginRegister/ResetPassword.jsx | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/modules/loginRegister/Login.jsx b/src/modules/loginRegister/Login.jsx
index 2262b76c1..f8206e03e 100644
--- a/src/modules/loginRegister/Login.jsx
+++ b/src/modules/loginRegister/Login.jsx
@@ -33,7 +33,7 @@ function Login(props){
           autologin: values.remember?1:0,
         }).then((response) => {
           if (!response.data.login) {
-            setMessage("错误的账号或密码");
+            response.data.status === -2 ? setMessage(response.data.message) : setMessage("错误的账号或密码");
           } else {
             //判断用户是否选择【下次自动登录】
             cookie.save('autologin',values.remember);
diff --git a/src/modules/loginRegister/ResetPassword.jsx b/src/modules/loginRegister/ResetPassword.jsx
index bdff44331..1147de8b9 100644
--- a/src/modules/loginRegister/ResetPassword.jsx
+++ b/src/modules/loginRegister/ResetPassword.jsx
@@ -75,7 +75,12 @@ function ResetPassword(props) {
   //确认密码
   function comfirmPassWord(rule, value, callback, index) {
     if ((index === 2 && value && form.getFieldValue('psd') && value !== form.getFieldValue('psd')) || (index === 1 && value && form.getFieldValue('psdComfirm') && value !== form.getFieldValue('psdComfirm'))) {
-      callback('密码不一致，请重新输入');
+      if(index===1){
+        form.setFields({psdComfirm: {value:form.getFieldValue('psdComfirm'),errors:[new Error('密码不一致，请重新输入')]}});
+        callback();
+      }else{
+        callback('密码不一致，请重新输入');
+      }
     } else {
       callback();
     }