From 19451c22ee5804415348be7521814915600d7227 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Fri, 29 Jan 2021 00:18:54 +0800 Subject: [PATCH] code refactor --- src/lib/utils.js | 4 ++-- src/views/mobile/statistics/Transaction.vue | 20 +++++++++---------- src/views/mobile/transactions/List.vue | 22 ++++++++++----------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/lib/utils.js b/src/lib/utils.js index 8dadf0a2..9b676d97 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -137,7 +137,7 @@ function getThisYearLastUnixTime() { return moment.unix(getThisYearFirstUnixTime()).add(1, 'years').subtract(1, 'seconds').unix(); } -function getShiftedtDateRange(minTime, maxTime, scale) { +function getShiftedDateRange(minTime, maxTime, scale) { const minDateTime = parseDateFromUnixTime(minTime); const maxDateTime = parseDateFromUnixTime(maxTime); @@ -548,7 +548,7 @@ export default { getThisMonthLastUnixTime, getThisYearFirstUnixTime, getThisYearLastUnixTime, - getShiftedtDateRange, + getShiftedDateRange, getDateRangeByDateType, copyObjectTo, copyArrayTo, diff --git a/src/views/mobile/statistics/Transaction.vue b/src/views/mobile/statistics/Transaction.vue index 512a6ff3..81617b24 100644 --- a/src/views/mobile/statistics/Transaction.vue +++ b/src/views/mobile/statistics/Transaction.vue @@ -458,12 +458,12 @@ export default { const self = this; const router = self.$f7router; - const dateParam = self.$utilities.getDateRangeByDateType(self.query.dateType); + const dateRange = self.$utilities.getDateRangeByDateType(self.query.dateType); self.$store.dispatch('initTransactionStatisticsFilter', { - dateType: dateParam ? dateParam.dateType : undefined, - startTime: dateParam ? dateParam.minTime : undefined, - endTime: dateParam ? dateParam.maxTime : undefined, + dateType: dateRange ? dateRange.dateType : undefined, + startTime: dateRange ? dateRange.minTime : undefined, + endTime: dateRange ? dateRange.maxTime : undefined, }); Promise.all([ @@ -524,16 +524,16 @@ export default { return; } - const dateParam = this.$utilities.getDateRangeByDateType(dateType); + const dateRange = this.$utilities.getDateRangeByDateType(dateType); - if (!dateParam) { + if (!dateRange) { return; } this.$store.dispatch('updateTransactionStatisticsFilter', { - dateType: dateParam.dateType, - startTime: dateParam.minTime, - endTime: dateParam.maxTime + dateType: dateRange.dateType, + startTime: dateRange.minTime, + endTime: dateRange.maxTime }); this.showDatePopover = false; @@ -559,7 +559,7 @@ export default { return; } - const newDateRange = this.$utilities.getShiftedtDateRange(startTime, endTime, scale); + const newDateRange = this.$utilities.getShiftedDateRange(startTime, endTime, scale); let newDateType = this.$constants.datetime.allDateRanges.Custom.type; for (let dateRangeField in this.$constants.datetime.allDateRanges) { diff --git a/src/views/mobile/transactions/List.vue b/src/views/mobile/transactions/List.vue index 141de84d..3718f3e2 100644 --- a/src/views/mobile/transactions/List.vue +++ b/src/views/mobile/transactions/List.vue @@ -396,12 +396,12 @@ export default { const self = this; const query = self.$f7route.query; - let dateParam = self.$utilities.getDateRangeByDateType(query.dateType ? parseInt(query.dateType) : undefined); + let dateRange = self.$utilities.getDateRangeByDateType(query.dateType ? parseInt(query.dateType) : undefined); - if (!dateParam && + if (!dateRange && query.dateType === self.$constants.datetime.allDateRanges.Custom.type.toString() && parseInt(query.maxTime) > 0 && parseInt(query.minTime) > 0) { - dateParam = { + dateRange = { dateType: parseInt(query.dateType), maxTime: parseInt(query.maxTime), minTime: parseInt(query.minTime) @@ -409,9 +409,9 @@ export default { } this.$store.dispatch('initTransactionListFilter', { - dateType: dateParam ? dateParam.dateType : undefined, - maxTime: dateParam ? dateParam.maxTime : undefined, - minTime: dateParam ? dateParam.minTime : undefined, + dateType: dateRange ? dateRange.dateType : undefined, + maxTime: dateRange ? dateRange.maxTime : undefined, + minTime: dateRange ? dateRange.minTime : undefined, type: parseInt(query.type) > 0 ? parseInt(query.type) : undefined, categoryId: query.categoryId, accountId: query.accountId @@ -506,16 +506,16 @@ export default { return; } - const dateParam = this.$utilities.getDateRangeByDateType(dateType); + const dateRange = this.$utilities.getDateRangeByDateType(dateType); - if (!dateParam) { + if (!dateRange) { return; } this.$store.dispatch('updateTransactionListFilter', { - dateType: dateParam.dateType, - maxTime: dateParam.maxTime, - minTime: dateParam.minTime + dateType: dateRange.dateType, + maxTime: dateRange.maxTime, + minTime: dateRange.minTime }); this.showDatePopover = false;