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

fix incorrect style when switch pages but some error occurs

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/views/mobile/statistics/AccountFilterSettings.vue
+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(title)"></f7-nav-title>
@@ -121,6 +121,7 @@ export default {
return {
loading: true,
loadingError: null,
modifyDefault: false,
filterAccountIds: {},
collapseStates: self.getCollapseStates(),
@@ -145,7 +146,6 @@ export default {
created() {
const self = this;
const query = self.$f7route.query;
const router = self.$f7router;
self.modifyDefault = !!query.modifyDefault;
@@ -171,15 +171,18 @@ export default {
self.filterAccountIds = self.$utilities.copyObjectTo(self.$store.state.transactionStatisticsFilter.filterAccountIds, allAccountIds);
}
}).catch(error => {
self.logining = 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;
src/views/mobile/statistics/CategoryFilterSettings.vue
+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(title)"></f7-nav-title>
@@ -123,6 +123,7 @@ export default {
return {
loading: true,
loadingError: null,
modifyDefault: false,
filterCategoryIds: {},
collapseStates: self.getCollapseStates(),
@@ -144,7 +145,6 @@ export default {
created() {
const self = this;
const query = self.$f7route.query;
const router = self.$f7router;
self.modifyDefault = !!query.modifyDefault;
@@ -170,15 +170,18 @@ export default {
self.filterCategoryIds = self.$utilities.copyObjectTo(self.$store.state.transactionStatisticsFilter.filterCategoryIds, allCategoryIds);
}
}).catch(error => {
self.logining = 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;
src/views/mobile/statistics/Transaction.vue
+7 -5
View File
@@ -253,6 +253,7 @@ export default {
return {
loading: true,
loadingError: null,
sortBy: self.$settings.getStatisticsSortingType(),
showChartDataTypePopover: false,
showDatePopover: false,
@@ -374,7 +375,6 @@ export default {
},
created() {
const self = this;
const router = self.$f7router;
let defaultChartType = self.$settings.getStatisticsDefaultChartType();
@@ -416,11 +416,11 @@ export default {
}).then(() => {
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();
}
});
},
@@ -433,6 +433,8 @@ export default {
if (this.$store.state.transactionStatisticsStateInvalid && !this.loading) {
this.reload(null);
}
this.$routeBackOnError('loadingError');
},
reload(done) {
const self = this;