diff --git a/Web/src/App.vue b/Web/src/App.vue index 8dbcf0e..bdcf52b 100644 --- a/Web/src/App.vue +++ b/Web/src/App.vue @@ -6,14 +6,14 @@ 日历 - + 统计 - + 账单 - - 邮件 + + 消息 设置 @@ -56,9 +56,9 @@ const route = useRoute() const showTabbar = computed(() => { return route.path === '/' || route.path === '/calendar' || - route.path === '/email' || + route.path === '/message' || route.path === '/setting' || - route.path === '/statistics' + route.path === '/balance' }) const active = ref('') @@ -89,14 +89,14 @@ const setActive = (path) => { switch (path) { case '/calendar': return 'ccalendar' - case '/statistics': - return 'statistics' - case '/email': - return 'email' + case '/balance': + return 'balance' + case '/message': + return 'message' case '/setting': return 'setting' default: - return 'balance' + return 'statistics' } })() console.log(active.value, path) diff --git a/Web/src/router/index.js b/Web/src/router/index.js index f013920..c2ff511 100644 --- a/Web/src/router/index.js +++ b/Web/src/router/index.js @@ -11,9 +11,9 @@ const router = createRouter({ meta: { requiresAuth: false }, }, { - path: '/', - name: 'transactions', - component: () => import('../views/TransactionsRecord.vue'), + path: '/balance', + name: 'balance', + component: () => import('../views/BalanceView.vue'), meta: { requiresAuth: true }, }, { @@ -59,7 +59,7 @@ const router = createRouter({ meta: { requiresAuth: true }, }, { - path: '/statistics', + path: '/', name: 'statistics', component: () => import('../views/StatisticsView.vue'), meta: { requiresAuth: true }, @@ -69,6 +69,12 @@ const router = createRouter({ name: 'bill-analysis', component: () => import('../views/BillAnalysisView.vue'), meta: { requiresAuth: true }, + }, + { + path: '/message', + name: 'message', + component: () => import('../views/MessageView.vue'), + meta: { requiresAuth: true }, } ], }) diff --git a/Web/src/styles/common.css b/Web/src/styles/common.css index c6251de..4370673 100644 --- a/Web/src/styles/common.css +++ b/Web/src/styles/common.css @@ -189,7 +189,7 @@ flex: 1; overflow-y: auto; -webkit-overflow-scrolling: touch; - padding: 16px 0 0 0; + padding: 0 0 0 0; } /* ===== 粘性顶部元素样式 ===== */ diff --git a/Web/src/views/BalanceView.vue b/Web/src/views/BalanceView.vue new file mode 100644 index 0000000..9ec7ef2 --- /dev/null +++ b/Web/src/views/BalanceView.vue @@ -0,0 +1,57 @@ + + + + + \ No newline at end of file diff --git a/Web/src/views/CalendarView.vue b/Web/src/views/CalendarView.vue index 3603b21..dabb8c1 100644 --- a/Web/src/views/CalendarView.vue +++ b/Web/src/views/CalendarView.vue @@ -263,7 +263,8 @@ fetchDailyStatistics(now.getFullYear(), now.getMonth() + 1); } /* 设置页面容器背景色 */ -:deep(.van-nav-bar) { +:deep(.van-calendar__header-title) { background: transparent !important; } + diff --git a/Web/src/views/ClassificationEdit.vue b/Web/src/views/ClassificationEdit.vue index 6ac1015..cd89d11 100644 --- a/Web/src/views/ClassificationEdit.vue +++ b/Web/src/views/ClassificationEdit.vue @@ -52,18 +52,18 @@ + +
-
- - 新增分类 - -
+ + 新增分类 +
@@ -307,12 +307,11 @@ onMounted(() => {