code refactor

This commit is contained in:
MaysWind
2020-12-19 23:53:49 +08:00
parent 5615111dce
commit b7e881f57c
4 changed files with 26 additions and 12 deletions
+7
View File
@@ -1,3 +1,9 @@
const allCategoryTypes = {
Income: 1,
Expense: 2,
Transfer: 3
};
const defaultExpenseCategories = [ const defaultExpenseCategories = [
{ {
name: 'Food & Drink', name: 'Food & Drink',
@@ -443,6 +449,7 @@ const defaultTransferCategories = [
]; ];
export default { export default {
allCategoryTypes: allCategoryTypes,
defaultExpenseCategories: defaultExpenseCategories, defaultExpenseCategories: defaultExpenseCategories,
defaultIncomeCategories: defaultIncomeCategories, defaultIncomeCategories: defaultIncomeCategories,
defaultTransferCategories: defaultTransferCategories, defaultTransferCategories: defaultTransferCategories,
+10 -7
View File
@@ -85,7 +85,10 @@ export default {
const query = self.$f7route.query; const query = self.$f7route.query;
const router = self.$f7router; 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'); self.$toast('Parameter Invalid');
router.back(); router.back();
return; return;
@@ -110,11 +113,11 @@ export default {
methods: { methods: {
getDefaultCategories(categoryType) { getDefaultCategories(categoryType) {
switch (categoryType) { switch (categoryType) {
case '1': case this.$constants.category.allCategoryTypes.Income:
return this.$constants.category.defaultIncomeCategories; return this.$constants.category.defaultIncomeCategories;
case '2': case this.$constants.category.allCategoryTypes.Expense:
return this.$constants.category.defaultExpenseCategories; return this.$constants.category.defaultExpenseCategories;
case '3': case this.$constants.category.allCategoryTypes.Transfer:
return this.$constants.category.defaultTransferCategories; return this.$constants.category.defaultTransferCategories;
default: default:
return []; return [];
@@ -187,11 +190,11 @@ export default {
filters: { filters: {
categoryTypeName(categoryType) { categoryTypeName(categoryType) {
switch (categoryType) { switch (categoryType) {
case '1': case this.$constants.category.allCategoryTypes.Income:
return 'Income Categories'; return 'Income Categories';
case '2': case this.$constants.category.allCategoryTypes.Expense:
return 'Expense Categories'; return 'Expense Categories';
case '3': case this.$constants.category.allCategoryTypes.Transfer:
return 'Transfer Categories'; return 'Transfer Categories';
default: default:
return 'Transaction Categories'; return 'Transaction Categories';
+3 -1
View File
@@ -175,7 +175,9 @@ export default {
} }
}); });
} else if (query.parentId) { } 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'); self.$toast('Parameter Invalid');
router.back(); router.back();
return; return;
+6 -4
View File
@@ -103,13 +103,13 @@ export default {
let title = ''; let title = '';
switch (this.categoryType) { switch (this.categoryType) {
case '1': case this.$constants.category.allCategoryTypes.Income:
title = 'Income'; title = 'Income';
break; break;
case '2': case this.$constants.category.allCategoryTypes.Expense:
title = 'Expense'; title = 'Expense';
break; break;
case '3': case this.$constants.category.allCategoryTypes.Transfer:
title = 'Transfer'; title = 'Transfer';
break; break;
default: default:
@@ -143,7 +143,9 @@ export default {
const query = self.$f7route.query; const query = self.$f7route.query;
const router = self.$f7router; 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'); self.$toast('Parameter Invalid');
router.back(); router.back();
return; return;