From 09fb474921c946f08bec36626ce994dfb680e897 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Thu, 4 Jul 2024 23:41:02 +0800 Subject: [PATCH] code refactor --- src/lib/services.js | 8 ++++---- src/stores/transaction.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/services.js b/src/lib/services.js index 4ae54d8f..43a2d77c 100644 --- a/src/lib/services.js +++ b/src/lib/services.js @@ -279,15 +279,15 @@ export default { id }); }, - getTransactions: ({ maxTime, minTime, count, page, withCount, type, categoryId, accountId, amountFilter, keyword }) => { + getTransactions: ({ maxTime, minTime, count, page, withCount, type, categoryIds, accountIds, amountFilter, keyword }) => { amountFilter = encodeURIComponent(amountFilter); keyword = encodeURIComponent(keyword); - return axios.get(`v1/transactions/list.json?max_time=${maxTime}&min_time=${minTime}&type=${type}&category_ids=${categoryId}&account_ids=${accountId}&amount_filter=${amountFilter}&keyword=${keyword}&count=${count}&page=${page}&with_count=${withCount}&trim_account=true&trim_category=true&trim_tag=true`); + return axios.get(`v1/transactions/list.json?max_time=${maxTime}&min_time=${minTime}&type=${type}&category_ids=${categoryIds}&account_ids=${accountIds}&amount_filter=${amountFilter}&keyword=${keyword}&count=${count}&page=${page}&with_count=${withCount}&trim_account=true&trim_category=true&trim_tag=true`); }, - getAllTransactionsByMonth: ({ year, month, type, categoryId, accountId, amountFilter, keyword }) => { + getAllTransactionsByMonth: ({ year, month, type, categoryIds, accountIds, amountFilter, keyword }) => { amountFilter = encodeURIComponent(amountFilter); keyword = encodeURIComponent(keyword); - return axios.get(`v1/transactions/list/by_month.json?year=${year}&month=${month}&type=${type}&category_ids=${categoryId}&account_ids=${accountId}&amount_filter=${amountFilter}&keyword=${keyword}&trim_account=true&trim_category=true&trim_tag=true`); + return axios.get(`v1/transactions/list/by_month.json?year=${year}&month=${month}&type=${type}&category_ids=${categoryIds}&account_ids=${accountIds}&amount_filter=${amountFilter}&keyword=${keyword}&trim_account=true&trim_category=true&trim_tag=true`); }, getTransactionStatistics: ({ startTime, endTime, useTransactionTimezone }) => { const queryParams = []; diff --git a/src/stores/transaction.js b/src/stores/transaction.js index c5ed27bb..1f988c9e 100644 --- a/src/stores/transaction.js +++ b/src/stores/transaction.js @@ -511,8 +511,8 @@ export const useTransactionsStore = defineStore('transactions', { page: page || 1, withCount: (!!withCount) || false, type: self.transactionsFilter.type, - categoryId: self.transactionsFilter.categoryId, - accountId: self.transactionsFilter.accountId, + categoryIds: self.transactionsFilter.categoryId, + accountIds: self.transactionsFilter.accountId, amountFilter: self.transactionsFilter.amountFilter, keyword: self.transactionsFilter.keyword }).then(response => { @@ -586,8 +586,8 @@ export const useTransactionsStore = defineStore('transactions', { year: year, month: month, type: self.transactionsFilter.type, - categoryId: self.transactionsFilter.categoryId, - accountId: self.transactionsFilter.accountId, + categoryIds: self.transactionsFilter.categoryId, + accountIds: self.transactionsFilter.accountId, amountFilter: self.transactionsFilter.amountFilter, keyword: self.transactionsFilter.keyword }).then(response => {