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 @@

{{$L('今后您可以通过此邮箱重置您的账号密码')}}

-
{{$L('链接已过期,已重新发送')}}
+
{{errorText}}
@@ -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); } }); },