mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-17 00:12:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't show verify email has sent to when there are no valid verify tokens

Browse Source
This commit is contained in:
MaysWind
2023-09-17 18:01:10 +08:00
parent 92273d2fc6
commit 4cecc78a74
7 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/desktop/LoginPage.vue
+1 -1
View File
@@ -320,7 +320,7 @@ export default {
self.logining = false;
if (self.isUserVerifyEmailEnabled && error.error && error.error.errorCode === 201020 && error.error.context && error.error.context.email) {
self.$router.push('/verify_email?email=' + encodeURIComponent(error.error.context.email));
self.$router.push(`/verify_email?email=${encodeURIComponent(error.error.context.email)}&emailSent=${error.error.context.hasValidEmailVerifyToken || false}`);
return;
}
src/views/desktop/VerifyEmailPage.vue
+7 -4
View File
@@ -28,9 +28,11 @@
<p class="mb-0" v-if="token && !verified && errorMessage">{{ errorMessage }}</p>
<p class="mb-0" v-if="!token && !email">{{ $t('Parameter Invalid') }}</p>
<p class="mb-0" v-if="!token && email">
<span>{{ $t('Account activation link has been sent to your email address:') }}</span>
<span class="ml-1">{{ email }}</span>
<span class="ml-1">{{ $t(', If you don\'t receive the mail, fill password and click the button below to resend the verify mail.') }}</span>
<span v-if="hasValidEmailVerifyToken">{{ $t('Account activation link has been sent to your email address:') }}</span>
<span class="ml-1" v-if="hasValidEmailVerifyToken">{{ email }}</span>
<span class="ml-1" v-if="hasValidEmailVerifyToken">{{ $t(', If you don\'t receive the mail, fill password and click the button below to resend the verify mail.') }}</span>
<span v-if="!hasValidEmailVerifyToken">{{ $t('If you don\'t receive the mail, fill password and click the button below to resend the verify mail to:') }}</span>
<span class="ml-1" v-if="!hasValidEmailVerifyToken">{{ email }}</span>
</p>
</v-card-text>
@@ -135,7 +137,8 @@ import {
export default {
props: [
'email',
'token'
'token',
'hasValidEmailVerifyToken'
],
data() {
return {