From a6b76fbd751c45bfcf71d5e7730d5693e425f50c Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sat, 18 May 2024 14:40:15 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=AE=8C=E5=96=84=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=9B=B8=E5=85=B3=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/setting/components/VerifyModel.vue | 44 +++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/views/setting/components/VerifyModel.vue b/src/views/setting/components/VerifyModel.vue
index a4eeb90..60b32db 100644
--- a/src/views/setting/components/VerifyModel.vue
+++ b/src/views/setting/components/VerifyModel.vue
@@ -59,6 +59,15 @@ const options: Options = {
   btns: { hide: true }
 }
 
+const { form, resetForm } = useForm({
+  phone: '',
+  email: '',
+  captcha: '',
+  oldPassword: '',
+  newPassword: '',
+  rePassword: ''
+})
+
 const columns: Columns = [
   {
     label: '手机号',
@@ -106,7 +115,18 @@ const columns: Columns = [
     label: '新密码',
     field: 'newPassword',
     type: 'input-password',
-    rules: [{ required: true, message: '请输入新密码' }],
+    rules: [
+      { required: true, message: '请输入新密码' },
+      {
+        validator: (value, callback) => {
+          if (value === form.oldPassword) {
+            callback('新密码不能与当前密码相同')
+          } else {
+            callback()
+          }
+        }
+      }
+    ],
     hide: () => {
       return verifyType.value !== 'password'
     }
@@ -115,25 +135,27 @@ const columns: Columns = [
     label: '确认新密码',
     field: 'rePassword',
     type: 'input-password',
-    rules: [{ required: true, message: '请再次输入新密码' }],
     props: {
       placeholder: '请再次输入新密码'
     },
+    rules: [
+      { required: true, message: '请再次输入新密码' },
+      {
+        validator: (value, callback) => {
+          if (value !== form.newPassword) {
+            callback('两次输入的密码不一致')
+          } else {
+            callback()
+          }
+        }
+      }
+    ],
     hide: () => {
       return verifyType.value !== 'password'
     }
   }
 ]
 
-const { form, resetForm } = useForm({
-  phone: '',
-  email: '',
-  captcha: '',
-  oldPassword: '',
-  newPassword: '',
-  rePassword: ''
-})
-
 const VerifyRef = ref<InstanceType<any>>()
 const captchaType = ref('blockPuzzle')
 const captchaMode = ref('pop')