From 132dd8134a8692a2b710ab9a974223435fa06262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com>
Date: Thu, 14 Jul 2022 12:24:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E5=8A=A0=E6=98=9F=E5=8F=B7=EF=BC=9B=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=E9=AA=8C=E8=AF=81=E7=A0=81=E5=8F=AF=E4=BB=A5=E5=A4=9A?=
 =?UTF-8?q?=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/UserEmailVerification.php          |  6 ++---
 .../assets/js/pages/manage/setting/delete.vue | 26 +++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/Models/UserEmailVerification.php b/app/Models/UserEmailVerification.php
index 8f98cfffd..221836a1b 100644
--- a/app/Models/UserEmailVerification.php
+++ b/app/Models/UserEmailVerification.php
@@ -45,7 +45,7 @@ class UserEmailVerification extends AbstractModel
     {
         $email = $type == 1 ? $user->email : $email;
         $res = self::whereEmail($email)->where('created_at', '>', Carbon::now()->subMinutes(30))->whereType($type)->first();
-        if ($res) return;
+        if ($res && $type == 1) return;
         //删除
         self::whereUserid($email)->delete();
         $code = $type == 1 ? Base::generatePassword(64) : rand(100000, 999999);
@@ -109,9 +109,9 @@ class UserEmailVerification extends AbstractModel
             throw new ApiException('请输入验证码');
         }
         /** @var UserEmailVerification $emailVerify */
-        $emailVerify = self::whereEmail($email)->whereCode($code)->whereType($type)->orderByDesc('id')->first();
+        $emailVerify = self::whereEmail($email)->whereType($type)->orderByDesc('id')->first();
 
-        if (empty($emailVerify)) {
+        if (empty($emailVerify) || $emailVerify->code != $code) {
             throw new ApiException('验证码错误');
         }
 
diff --git a/resources/assets/js/pages/manage/setting/delete.vue b/resources/assets/js/pages/manage/setting/delete.vue
index cf93bf98f..f169da81f 100644
--- a/resources/assets/js/pages/manage/setting/delete.vue
+++ b/resources/assets/js/pages/manage/setting/delete.vue
@@ -74,6 +74,32 @@ export default {
                         trigger: 'change'
                     },
                 ],
+                code: [
+                    {
+                        validator: (rule, value, callback) => {
+                            if (value.trim() === '' && this.isRegVerify == 1) {
+                                callback(new Error(this.$L('请输入邮箱验证码')));
+                            } else {
+                                callback();
+                            }
+                        },
+                        required: true,
+                        trigger: 'change'
+                    },
+                ],
+                password: [
+                    {
+                        validator: (rule, value, callback) => {
+                            if (value.trim() === '' && this.isRegVerify != 1) {
+                                callback(new Error(this.$L('请输入登录密码')));
+                            } else {
+                                callback();
+                            }
+                        },
+                        required: true,
+                        trigger: 'change'
+                    },
+                ],
             },
             count: 0,
             isSendButtonShow: true,