fix incorrect style when switch pages but some error occurs

This commit is contained in:
MaysWind
2021-03-05 01:27:32 +08:00
parent c74077fb13
commit b0cff71b24
16 changed files with 150 additions and 87 deletions
+10 -7
View File
@@ -1,5 +1,5 @@
<template>
<f7-page ptr @ptr:refresh="reload">
<f7-page ptr @ptr:refresh="reload" @page:afterin="onPageAfterIn">
<f7-navbar>
<f7-nav-left :back-link="$t('Back')"></f7-nav-left>
<f7-nav-title :title="$t('Device & Sessions')"></f7-nav-title>
@@ -47,12 +47,12 @@ export default {
data() {
return {
tokens: [],
loading: true
loading: true,
loadingError: null
};
},
created() {
const self = this;
const router = self.$f7router;
self.loading = true;
@@ -60,15 +60,18 @@ export default {
self.tokens = tokens;
self.loading = false;
}).catch(error => {
self.loading = false;
if (!error.processed) {
if (error.processed) {
self.loading = false;
} else {
self.loadingError = error;
self.$toast(error.message || error);
router.back();
}
});
},
methods: {
onPageAfterIn() {
this.$routeBackOnError('loadingError');
},
reload(done) {
const self = this;
+9 -6
View File
@@ -1,5 +1,5 @@
<template>
<f7-page>
<f7-page @page:afterin="onPageAfterIn">
<f7-navbar :title="$t('Two-Factor Authentication')" :back-link="$t('Back')"></f7-navbar>
<f7-card class="skeleton-text" v-if="loading">
@@ -80,6 +80,7 @@ export default {
return {
status: null,
loading: true,
loadingError: null,
new2FASecret: '',
new2FAQRCode: '',
currentPasscodeForEnable: '',
@@ -98,7 +99,6 @@ export default {
},
created() {
const self = this;
const router = self.$f7router;
self.loading = true;
@@ -106,15 +106,18 @@ export default {
self.status = response.enable;
self.loading = false;
}).catch(error => {
self.loading = false;
if (!error.processed) {
if (error.processed) {
self.loading = false;
} else {
self.loadingError = error;
self.$toast(error.message || error);
router.back();
}
});
},
methods: {
onPageAfterIn() {
this.$routeBackOnError('loadingError');
},
enable() {
const self = this;
+9 -6
View File
@@ -1,5 +1,5 @@
<template>
<f7-page>
<f7-page @page:afterin="onPageAfterIn">
<f7-navbar>
<f7-nav-left :back-link="$t('Back')"></f7-nav-left>
<f7-nav-title :title="$t('User Profile')"></f7-nav-title>
@@ -122,6 +122,7 @@ export default {
},
currentPassword: '',
loading: true,
loadingError: null,
saving: false,
showInputPasswordSheet: false
};
@@ -172,7 +173,6 @@ export default {
},
created() {
const self = this;
const router = self.$f7router;
self.loading = true;
@@ -189,15 +189,18 @@ export default {
self.loading = false;
}).catch(error => {
self.loading = false;
if (!error.processed) {
if (error.processed) {
self.loading = false;
} else {
self.loadingError = error;
self.$toast(error.message || error);
router.back();
}
});
},
methods: {
onPageAfterIn() {
this.$routeBackOnError('loadingError');
},
save() {
const self = this;
const router = self.$f7router;