diff --git a/src/components/Plan/PlanCalendar.vue b/src/components/Plan/PlanCalendar.vue index 3789575..48266f4 100644 --- a/src/components/Plan/PlanCalendar.vue +++ b/src/components/Plan/PlanCalendar.vue @@ -78,7 +78,7 @@ const eventClickEvent = (eventClick: EventClickArg) => { diff --git a/src/components/Plan/PlanList.vue b/src/components/Plan/PlanList.vue deleted file mode 100644 index feaebcc..0000000 --- a/src/components/Plan/PlanList.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/src/components/Plan/PlanQuery.vue b/src/components/Plan/PlanQuery.vue index fab08d2..a375a3a 100644 --- a/src/components/Plan/PlanQuery.vue +++ b/src/components/Plan/PlanQuery.vue @@ -1,18 +1,18 @@ @@ -26,20 +26,20 @@ const planTypeOptions = [{ value: 'all' }, { - label: '已完成计划', + label: '已完成', value: 'completed' }, { - label: '未完成计划', + label: '未完成', value: 'notCompleted' }] const orderTypeOptions = [{ - label: '按时间排序', + label: '时间', value: 'date' }, { - label: '按重要性排序', + label: '重要性', value: 'priority' }] diff --git a/src/components/Plan/PlanStats.vue b/src/components/Plan/PlanStats.vue deleted file mode 100644 index 571dac5..0000000 --- a/src/components/Plan/PlanStats.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/src/store/bill.ts b/src/store/bill.ts index f488a05..06606ea 100644 --- a/src/store/bill.ts +++ b/src/store/bill.ts @@ -135,11 +135,12 @@ export const useBillStore = defineStore('bill', { const bookName = this.billQueryForm.billBook === 'all' ? '' : this.billQueryForm.billBook this.getBillDateList() + await this.queryBillSummary(bookName) + if (isStats) { await this.queryBillStats(bookName) - } else { - await this.queryBillSummary(bookName) } + this.isRefresh = !this.isRefresh this.isLoading = false }, diff --git a/src/styles/home/plan.mobile.module.scss b/src/styles/home/plan.mobile.module.scss deleted file mode 100644 index 4b2c22b..0000000 --- a/src/styles/home/plan.mobile.module.scss +++ /dev/null @@ -1,28 +0,0 @@ -.mobile-plan-view { - display: flex; - flex-direction: column; - gap: 10px; - - #planCalendar { - .fc-view { - height: calc(100vh - 210px); - - .fc-timegrid-body { - // 单元格高度 - tr { - height: 3.5vh; - } - } - } - } - - .plan-list { - .el-scrollbar { - .el-scrollbar__view { - display: flex; - flex-direction: column; - gap: 2vh; - } - } - } -} diff --git a/src/styles/home/plan.module.scss b/src/styles/home/plan.module.scss deleted file mode 100644 index d1603cc..0000000 --- a/src/styles/home/plan.module.scss +++ /dev/null @@ -1,13 +0,0 @@ -.plan-view { - .plan-list { - height: calc(100vh - 120px); - - .el-scrollbar { - .el-scrollbar__view { - display: flex; - flex-direction: column; - gap: 2vh; - } - } - } -} diff --git a/src/views/bill/chart.vue b/src/views/bill/chart.vue index b9dffa2..2259ba8 100644 --- a/src/views/bill/chart.vue +++ b/src/views/bill/chart.vue @@ -6,12 +6,12 @@ + @change="billStore.refreshInfo(true)"/> + @change="billStore.refreshInfo(true)"/> diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 27649fb..a03841a 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -30,6 +30,10 @@ title="物品记录" sub-title="收纳生活琐碎" router="/product/list"/> + + diff --git a/src/views/meta.ts b/src/views/meta.ts index 804c204..b2d57cb 100644 --- a/src/views/meta.ts +++ b/src/views/meta.ts @@ -93,10 +93,28 @@ export const mobileHomeMeta: IRouteMetaConfig = { title: '统计', icon: '' }, + '/plan': { + title: '时光日程', + icon: '', + order: 5, + redirect: '/plan/calendar' + }, + '/plan/calendar': { + title: '日程安排', + icon: '' + }, + '/plan/list': { + title: '日程清单', + icon: '' + }, + '/plan/detail/id': { + title: '日程内容', + icon: '' + }, '/anniversary': { title: '纪念日', icon: 'home-anniversary', - order: 5, + order: 6, redirect: '/anniversary/list' }, '/anniversary/list': { @@ -114,7 +132,7 @@ export const mobileHomeMeta: IRouteMetaConfig = { '/period': { title: '月经记录', icon: 'home-period', - order: 6, + order: 7, redirect: '/period/calendar' }, '/period/calendar': { @@ -132,7 +150,7 @@ export const mobileHomeMeta: IRouteMetaConfig = { '/product': { title: '物品记录', icon: 'home-product', - order: 7, + order: 8, redirect: '/product/list' }, '/product/list': { @@ -146,7 +164,7 @@ export const mobileHomeMeta: IRouteMetaConfig = { '/journal': { title: '日记', icon: 'home-product', - order: 8, + order: 9, redirect: '/journal/record' }, '/journal/record': { @@ -164,7 +182,7 @@ export const mobileHomeMeta: IRouteMetaConfig = { '/kpi': { title: '绩效', icon: 'home-kpi', - order: 9, + order: 10, redirect: '/kpi/record' }, '/kpi/record': { @@ -178,7 +196,7 @@ export const mobileHomeMeta: IRouteMetaConfig = { '/asset': { title: '资产', icon: 'home-asset', - order: 10, + order: 11, redirect: '/asset/list' }, '/asset/list': { @@ -192,7 +210,7 @@ export const mobileHomeMeta: IRouteMetaConfig = { '/ledger': { title: '账本', icon: 'home-ledger', - order: 11, + order: 12, redirect: '/ledger/list' }, '/ledger/list': { @@ -210,7 +228,7 @@ export const mobileHomeMeta: IRouteMetaConfig = { '/password': { title: '密码', icon: 'home-password', - order: 12, + order: 13, redirect: '/password/list' }, '/password/list': { @@ -220,7 +238,7 @@ export const mobileHomeMeta: IRouteMetaConfig = { '/award': { title: '奖状证书', icon: 'home-award', - order: 13, + order: 14, redirect: '/award/list' }, '/award/list': { @@ -234,7 +252,7 @@ export const mobileHomeMeta: IRouteMetaConfig = { '/profile': { title: '个人信息', icon: '', - order: 14, + order: 15, hidden: true, redirect: '/profile/index' }, diff --git a/src/views/plan/calendar.vue b/src/views/plan/calendar.vue new file mode 100644 index 0000000..3da4aeb --- /dev/null +++ b/src/views/plan/calendar.vue @@ -0,0 +1,34 @@ + + + + + diff --git a/src/views/plan/detail[id].vue b/src/views/plan/detail[id].vue new file mode 100644 index 0000000..c7401a1 --- /dev/null +++ b/src/views/plan/detail[id].vue @@ -0,0 +1,205 @@ + + + diff --git a/src/views/plan/list.vue b/src/views/plan/list.vue new file mode 100644 index 0000000..2787305 --- /dev/null +++ b/src/views/plan/list.vue @@ -0,0 +1,31 @@ + + +