From b7e881f57c5912e1b6700f5890c684a11de7f25b Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sat, 19 Dec 2020 23:53:49 +0800 Subject: [PATCH] code refactor --- src/consts/category.js | 7 +++++++ src/views/mobile/categories/Default.vue | 17 ++++++++++------- src/views/mobile/categories/Edit.vue | 4 +++- src/views/mobile/categories/List.vue | 10 ++++++---- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/consts/category.js b/src/consts/category.js index d83e2542..5c8e33a4 100644 --- a/src/consts/category.js +++ b/src/consts/category.js @@ -1,3 +1,9 @@ +const allCategoryTypes = { + Income: 1, + Expense: 2, + Transfer: 3 +}; + const defaultExpenseCategories = [ { name: 'Food & Drink', @@ -443,6 +449,7 @@ const defaultTransferCategories = [ ]; export default { + allCategoryTypes: allCategoryTypes, defaultExpenseCategories: defaultExpenseCategories, defaultIncomeCategories: defaultIncomeCategories, defaultTransferCategories: defaultTransferCategories, diff --git a/src/views/mobile/categories/Default.vue b/src/views/mobile/categories/Default.vue index 766065a4..dc06ede3 100644 --- a/src/views/mobile/categories/Default.vue +++ b/src/views/mobile/categories/Default.vue @@ -85,7 +85,10 @@ export default { const query = self.$f7route.query; const router = self.$f7router; - if (query.type !== '0' && query.type !== '1' && query.type !== '2' && query.type !== '3') { + if (query.type !== '0' && + query.type !== this.$constants.category.allCategoryTypes.Income && + query.type !== this.$constants.category.allCategoryTypes.Expense && + query.type !== this.$constants.category.allCategoryTypes.Transfer) { self.$toast('Parameter Invalid'); router.back(); return; @@ -110,11 +113,11 @@ export default { methods: { getDefaultCategories(categoryType) { switch (categoryType) { - case '1': + case this.$constants.category.allCategoryTypes.Income: return this.$constants.category.defaultIncomeCategories; - case '2': + case this.$constants.category.allCategoryTypes.Expense: return this.$constants.category.defaultExpenseCategories; - case '3': + case this.$constants.category.allCategoryTypes.Transfer: return this.$constants.category.defaultTransferCategories; default: return []; @@ -187,11 +190,11 @@ export default { filters: { categoryTypeName(categoryType) { switch (categoryType) { - case '1': + case this.$constants.category.allCategoryTypes.Income: return 'Income Categories'; - case '2': + case this.$constants.category.allCategoryTypes.Expense: return 'Expense Categories'; - case '3': + case this.$constants.category.allCategoryTypes.Transfer: return 'Transfer Categories'; default: return 'Transaction Categories'; diff --git a/src/views/mobile/categories/Edit.vue b/src/views/mobile/categories/Edit.vue index bd3787ce..c68ff78f 100644 --- a/src/views/mobile/categories/Edit.vue +++ b/src/views/mobile/categories/Edit.vue @@ -175,7 +175,9 @@ export default { } }); } else if (query.parentId) { - if (query.type !== '1' && query.type !== '2' && query.type !== '3') { + if (query.type !== this.$constants.category.allCategoryTypes.Income && + query.type !== this.$constants.category.allCategoryTypes.Expense && + query.type !== this.$constants.category.allCategoryTypes.Transfer) { self.$toast('Parameter Invalid'); router.back(); return; diff --git a/src/views/mobile/categories/List.vue b/src/views/mobile/categories/List.vue index 1ed341eb..a4ee0ad2 100644 --- a/src/views/mobile/categories/List.vue +++ b/src/views/mobile/categories/List.vue @@ -103,13 +103,13 @@ export default { let title = ''; switch (this.categoryType) { - case '1': + case this.$constants.category.allCategoryTypes.Income: title = 'Income'; break; - case '2': + case this.$constants.category.allCategoryTypes.Expense: title = 'Expense'; break; - case '3': + case this.$constants.category.allCategoryTypes.Transfer: title = 'Transfer'; break; default: @@ -143,7 +143,9 @@ export default { const query = self.$f7route.query; const router = self.$f7router; - if (query.type !== '1' && query.type !== '2' && query.type !== '3') { + if (query.type !== this.$constants.category.allCategoryTypes.Income && + query.type !== this.$constants.category.allCategoryTypes.Expense && + query.type !== this.$constants.category.allCategoryTypes.Transfer) { self.$toast('Parameter Invalid'); router.back(); return;