From fe91765ab02057e7100dc7fa756a71c2f8368bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com>
Date: Wed, 9 Mar 2022 09:52:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E9=A1=B5=E9=9D=A2=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/UsersController.php    | 4 ++--
 resources/assets/js/pages/single/validEmail.vue | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index b2b507daf..9b6629b1b 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -598,7 +598,7 @@ class UsersController extends AbstractController
             return Base::retError($validator->errors()->first());
         $res = UserEmailVerification::where('code', $data['code'])->first();
         if (empty($res)) {
-            return Base::retError('链接已失效');
+            return Base::retError('无效连接,请重新注册');
         }
         // 如果已经校验过
         if (intval($res->status) === 1)
@@ -610,7 +610,7 @@ class UsersController extends AbstractController
         if (abs($time - $oldTime) > 86400) {
             $user = User::whereUserid($res->userid)->first();
             UserEmailVerification::userEmailSend($user);
-            return Base::retError("链接已失效");
+            return Base::retError("链接已过期，已重新发送");
         }
         UserEmailVerification::where('code', $data['code'])
             ->update([
diff --git a/resources/assets/js/pages/single/validEmail.vue b/resources/assets/js/pages/single/validEmail.vue
index fecac2348..3d08cd516 100644
--- a/resources/assets/js/pages/single/validEmail.vue
+++ b/resources/assets/js/pages/single/validEmail.vue
@@ -8,7 +8,7 @@
                 <p>{{$L('今后您可以通过此邮箱重置您的账号密码')}}</p>
             </div>
             <div class="validation-text" v-if="error">
-                <div>{{$L('链接已过期，已重新发送')}}</div>
+                <div>{{errorText}}</div>
             </div>
             <div slot="footer" v-if="success">
                 <Button type="primary" @click="userLogout" long>{{$L('返回首页')}}</Button>
@@ -26,6 +26,7 @@ export default {
         return {
             success: false,
             error: false,
+            errorText: this.$L('链接已过期，已重新发送'),
         }
     },
     mounted() {
@@ -50,6 +51,7 @@ export default {
                 } else {
                     this.success = false;
                     this.error = true;
+                    this.errorText =  this.$L(msg);
                 }
             });
         },