From 0ec0bba2fa77698f3790edde03af6d8f2eae34bd Mon Sep 17 00:00:00 2001 From: Cxx0822 <1556464090@qq.com> Date: Thu, 2 Jul 2026 21:44:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E6=94=AF=E5=87=BA?= =?UTF-8?q?=E5=8D=95=E8=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Bill/BillCalendar.vue | 2 +- src/components/Bill/BillChart.vue | 4 ++-- src/components/Bill/BillDailyItem.vue | 6 +++--- src/components/Bill/BillStats.vue | 4 ++-- src/store/bill.ts | 2 +- src/types/bill.ts | 6 +++--- src/utils/home/billUtil.ts | 20 ++++++++++---------- src/views/bill/detail[id].vue | 2 +- src/views/bill/search.vue | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/components/Bill/BillCalendar.vue b/src/components/Bill/BillCalendar.vue index a77f268..8e3d113 100644 --- a/src/components/Bill/BillCalendar.vue +++ b/src/components/Bill/BillCalendar.vue @@ -67,7 +67,7 @@ const getCalendarAttrDates = () => { }) dailyInfo.attrs.push({ dot: 'red', - dates: getCalendarDateList(billStore.billRecordList, 'expensive') + dates: getCalendarDateList(billStore.billRecordList, 'expense') }) dailyInfo.attrs.push({ dot: 'green', diff --git a/src/components/Bill/BillChart.vue b/src/components/Bill/BillChart.vue index 5d7dde8..d07374f 100644 --- a/src/components/Bill/BillChart.vue +++ b/src/components/Bill/BillChart.vue @@ -76,7 +76,7 @@ const updateChart = () => { billDailyChart.setOption({ series: [{ itemStyle: { - color: billStore.billType === 'expensive' ? '#CA6C65' : '#6FBB69' + color: billStore.billType === 'expense' ? '#CA6C65' : '#6FBB69' }, markPoint: { label: { @@ -96,7 +96,7 @@ const updateChart = () => { billBookChart.setOption({ series: [{ itemStyle: { - color: billStore.billType === 'expensive' ? '#CA6C65' : '#6FBB69' + color: billStore.billType === 'expense' ? '#CA6C65' : '#6FBB69' }, markPoint: { label: { diff --git a/src/components/Bill/BillDailyItem.vue b/src/components/Bill/BillDailyItem.vue index 4c2a5da..42e46ce 100644 --- a/src/components/Bill/BillDailyItem.vue +++ b/src/components/Bill/BillDailyItem.vue @@ -5,7 +5,7 @@ @@ -70,7 +70,7 @@ onMounted(() => { const dailyItemInfo = reactive({ date: '', - totalExpensive: 0, + totalExpense: 0, totalIncome: 0, itemList: [] as IBillRecord[] }) @@ -86,7 +86,7 @@ const getBillDailyByDate = (date: string) => { const calendarDaily = getCalendarDailyCount(billStore.billRecordList, date) dailyItemInfo.itemList = calendarDaily.dailyRecordList dailyItemInfo.totalIncome = calendarDaily.totalIncome - dailyItemInfo.totalExpensive = calendarDaily.totalExpensive + dailyItemInfo.totalExpense = calendarDaily.totalExpense } else { dailyItemInfo.itemList = [] } diff --git a/src/components/Bill/BillStats.vue b/src/components/Bill/BillStats.vue index f8568f5..836c249 100644 --- a/src/components/Bill/BillStats.vue +++ b/src/components/Bill/BillStats.vue @@ -2,7 +2,7 @@
+ :value="formatAmount(billStats.expense)" /> billStore.isRefresh, () => { const billStats = ref({ balance: 0, - expensive: 0, + expense: 0, income: 0, rate: 0 }) diff --git a/src/store/bill.ts b/src/store/bill.ts index 06606ea..88b951d 100644 --- a/src/store/bill.ts +++ b/src/store/bill.ts @@ -34,7 +34,7 @@ export const useBillStore = defineStore('bill', { billPayList: [] as IBillPay[], billBookList: [] as IBillBook[], billCategoryList: [] as IBillCategory[], - billType: 'expensive' as IBillType, + billType: 'expense' as IBillType, billDateType: 'month' as IDateType, billDateList: [] as string[], billImagePath: ImagePathEnum.BILL, diff --git a/src/types/bill.ts b/src/types/bill.ts index 74c23c3..c0152f8 100644 --- a/src/types/bill.ts +++ b/src/types/bill.ts @@ -1,4 +1,4 @@ -export type IBillType = 'expensive' | 'income' | '' +export type IBillType = 'expense' | 'income' | '' /** * 账单记录 @@ -68,12 +68,12 @@ export interface IBillSearch { export interface IBillCalendarDaily { dailyRecordList: IBillRecord[]; - totalExpensive: number; + totalExpense: number; totalIncome: number; } export interface IBillSummaryStats { - expensive: number; + expense: number; income: number; balance: number; rate: number; diff --git a/src/utils/home/billUtil.ts b/src/utils/home/billUtil.ts index 6938802..732332f 100644 --- a/src/utils/home/billUtil.ts +++ b/src/utils/home/billUtil.ts @@ -11,7 +11,7 @@ import { formatDate } from 'vue3-common/utils/dateUtil' * @param billRecordList 账单记录 * @param type 账单类型 */ -export const getCalendarDateList = (billRecordList: IBillRecord[], type: 'expensive' | 'income'): string[] => { +export const getCalendarDateList = (billRecordList: IBillRecord[], type: 'expense' | 'income'): string[] => { const resultSet = new Set() billRecordList.forEach((item) => { if (item.type === type) { @@ -31,7 +31,7 @@ export const getCalendarDailyCount = (billRecordList: IBillRecord[], date: string): IBillCalendarDaily => { const calendarDaily: IBillCalendarDaily = { dailyRecordList: [], - totalExpensive: 0, + totalExpense: 0, totalIncome: 0 } @@ -40,8 +40,8 @@ export const getCalendarDailyCount = (billRecordList: IBillRecord[], if (formatDate(value.date) === date) { calendarDaily.dailyRecordList.push(value) // 统计当前日期的收入和支出总和 - if (value.type === 'expensive') { - calendarDaily.totalExpensive += value.amount + if (value.type === 'expense') { + calendarDaily.totalExpense += value.amount } else { calendarDaily.totalIncome += value.amount } @@ -58,29 +58,29 @@ export const getCalendarDailyCount = (billRecordList: IBillRecord[], export const getBillSummaryStats = (billRecordList: IBillRecord[]): IBillSummaryStats => { const billSummaryStats: IBillSummaryStats = { balance: 0, - expensive: 0, + expense: 0, income: 0, rate: 0 } billRecordList.forEach((value) => { // 统计当前日期的支出和收入总和 - if (value.type === 'expensive') { - billSummaryStats.expensive += value.amount + if (value.type === 'expense') { + billSummaryStats.expense += value.amount } else { billSummaryStats.income += value.amount } }) - billSummaryStats.balance = billSummaryStats.income - billSummaryStats.expensive + billSummaryStats.balance = billSummaryStats.income - billSummaryStats.expense // 计算支出/收入 - if (billSummaryStats.expensive === 0) { + if (billSummaryStats.expense === 0) { billSummaryStats.rate = 0 } else if (billSummaryStats.income === 0) { billSummaryStats.rate = 1 } else { - billSummaryStats.rate = Math.min(billSummaryStats.expensive / billSummaryStats.income, 1) + billSummaryStats.rate = Math.min(billSummaryStats.expense / billSummaryStats.income, 1) } return billSummaryStats diff --git a/src/views/bill/detail[id].vue b/src/views/bill/detail[id].vue index accc53c..e60cbbb 100644 --- a/src/views/bill/detail[id].vue +++ b/src/views/bill/detail[id].vue @@ -152,7 +152,7 @@ const initImageFileList = () => { * @param type 账单类型 */ const getBillTypeName = (type: string) => { - return type === 'expensive' ? '支出' : '收入' + return type === 'expense' ? '支出' : '收入' } /** diff --git a/src/views/bill/search.vue b/src/views/bill/search.vue index 6adfbb1..739ab9e 100644 --- a/src/views/bill/search.vue +++ b/src/views/bill/search.vue @@ -9,7 +9,7 @@
收入：{{ formatAmount(getTotalAmount(billStore.billRecordList, 'income')) }} - 支出：{{ formatAmount(getTotalAmount(billStore.billRecordList, 'expensive')) }} + 支出：{{ formatAmount(getTotalAmount(billStore.billRecordList, 'expense')) }}