From f17f1d6a6baac63b3d4f530b400b256fae4ed77f Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Mon, 23 Sep 2024 15:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/forgetpassword/index.vue | 32 ++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index 3e6cfd91..1f18d6f4 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -64,13 +64,13 @@
         {{ $t('passwordReset:button:verify') }}
       </el-button>
     </div>
-    <div class="box-wrapper" v-if="active === 1">
+    <div class="box-wrapper" v-show="active === 1">
       <el-form
-        ref="resetForm"
+        ref="resetForm2"
         v-loading="formLoading"
         :model="form"
         :label-width="$i18n.locale === 'en' ? '180px' : '100px'"
-        :rules="rules"
+        :rules="rules2"
         class="demo-ruleForm"
         size="small"
       >
@@ -213,6 +213,7 @@ export default {
         EmailOrPhone: '',
         VerificationCode: '',
         NewPwd: '',
+        CheckPass: '',
         UserId: '',
         UserType: '',
       },
@@ -255,6 +256,29 @@ export default {
           },
         ],
       },
+      rules2: {
+        NewPwd: [
+          {
+            required: true,
+            validator: this.$validatePassword,
+            trigger: ['blur', 'change'],
+          },
+        ],
+        CheckPass: [
+          {
+            required: true,
+            validator: validatePass2,
+            trigger: ['blur', 'change'],
+          },
+        ],
+        UserId: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
       sendDisabled: true,
       sendTitle: this.$t('passwordReset:button:send'),
       formLoading: false,
@@ -262,7 +286,7 @@ export default {
   },
   methods: {
     onSubmit() {
-      this.$refs['resetForm'].validate((valid) => {
+      this.$refs['resetForm2'].validate((valid) => {
         if (valid) {
           this.formLoading = true
           anonymousSetPassword(this.form.UserId, md5(this.form.NewPwd))