From 28e4e6f6cbc7b13bdc1ac7962c4f2a7890185909 Mon Sep 17 00:00:00 2001
From: SunCheng <cheng2.sun@ly.com>
Date: Tue, 10 Feb 2026 19:47:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BB=E9=A2=98=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=BE=B9=E6=A1=86=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E5=8F=98=E9=87=8F=EF=BC=9B=E4=BC=98=E5=8C=96=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E8=83=8C=E6=99=AF=E5=92=8C=E6=A0=87=E9=A2=98=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=9B=E8=B0=83=E6=95=B4=E6=9C=88=E5=BA=A6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8A=A0=E8=BD=BD=E6=A0=BC=E5=BC=8F=EF=BC=9B=E6=94=B9?=
 =?UTF-8?q?=E8=BF=9B=E5=9B=BE=E8=A1=A8=E5=88=9D=E5=A7=8B=E5=8C=96=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/assets/theme.css                               |  8 +++++++-
 Web/src/components/CategoryBillPopup.vue               |  3 +++
 Web/src/components/PopupContainer.vue                  |  7 ++++---
 Web/src/views/statisticsV2/Index.vue                   | 10 +++++++++-
 .../views/statisticsV2/modules/MonthlyExpenseCard.vue  |  7 ++++++-
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/Web/src/assets/theme.css b/Web/src/assets/theme.css
index 3365887..2da4cdf 100644
--- a/Web/src/assets/theme.css
+++ b/Web/src/assets/theme.css
@@ -87,6 +87,9 @@
   --text-secondary: #a1a1aa;
   --text-tertiary: #71717a;
   
+  /* 边框颜色 */
+  --border-color: #3f3f46;
+  
   /* 强调色 (深色主题调整) */
   --accent-primary: #FF6B6B;
   --accent-danger: #f87171;
@@ -134,7 +137,10 @@
   background-color: var(--bg-tertiary);
 }
 
-/* 布局容器 */
+  /* 边框颜色 */
+  --border-color: #E5E7EB;
+  
+  /* 布局容器 */
 .container-fluid {
   width: 100%;
   max-width: 402px;
diff --git a/Web/src/components/CategoryBillPopup.vue b/Web/src/components/CategoryBillPopup.vue
index 1f82d4e..64b890b 100644
--- a/Web/src/components/CategoryBillPopup.vue
+++ b/Web/src/components/CategoryBillPopup.vue
@@ -343,6 +343,7 @@ watch(visible, (newValue) => {
   padding: var(--spacing-2xl);
   padding-bottom: var(--spacing-lg);
   border-bottom: 1px solid var(--border-color);
+  background: var(--bg-secondary);
 }
 
 .popup-title {
@@ -352,6 +353,7 @@ watch(visible, (newValue) => {
   color: var(--text-primary);
   margin: 0;
   text-align: center;
+  letter-spacing: -0.02em;
 }
 
 .popup-subtitle {
@@ -389,6 +391,7 @@ watch(visible, (newValue) => {
   border-radius: var(--radius-md);
   cursor: pointer;
   transition: opacity 0.2s;
+  margin-top: 10px;
 }
 
 .txn-card:active {
diff --git a/Web/src/components/PopupContainer.vue b/Web/src/components/PopupContainer.vue
index 61606fa..bb84f3f 100644
--- a/Web/src/components/PopupContainer.vue
+++ b/Web/src/components/PopupContainer.vue
@@ -1,4 +1,4 @@
-<!-- eslint-disable vue/no-v-html -->
+<!-- eslint-disable vue/no-v-html -->
 <template>
   <van-popup
     v-model:show="visible"
@@ -111,7 +111,7 @@ const hasActions = computed(() => !!slots['header-actions'])
 .popup-header-fixed {
   flex-shrink: 0;
   padding: 16px;
-  background-color: var(--van-background-2);
+  background: linear-gradient(180deg, var(--van-background) 0%, var(--van-background-2) 100%);
   border-bottom: 1px solid var(--van-border-color);
   position: sticky;
   top: 0;
@@ -138,10 +138,11 @@ const hasActions = computed(() => !!slots['header-actions'])
 
 .popup-title {
   font-size: 16px;
-  font-weight: 500;
+  font-weight: 600;
   margin: 0;
   text-align: center;
   color: var(--van-text-color);
+  letter-spacing: -0.02em;
   /*超出长度*/
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/Web/src/views/statisticsV2/Index.vue b/Web/src/views/statisticsV2/Index.vue
index c570dc6..833dff9 100644
--- a/Web/src/views/statisticsV2/Index.vue
+++ b/Web/src/views/statisticsV2/Index.vue
@@ -314,7 +314,15 @@ const loadMonthlyData = async (year, month) => {
     // 加载每日统计
     const dailyResult = await getDailyStatistics({ year, month })
     if (dailyResult?.success && dailyResult.data) {
-      trendStats.value = dailyResult.data.filter(item => item != null)
+      // 转换数据格式：添加完整的 date 字段
+      trendStats.value = dailyResult.data
+        .filter(item => item != null)
+        .map(item => ({
+          date: `${year}-${month.toString().padStart(2, '0')}-${item.day.toString().padStart(2, '0')}`,
+          expense: item.expense || 0,
+          income: item.income || 0,
+          count: item.count || 0
+        }))
     }
   } catch (error) {
     console.error('加载月度数据失败:', error)
diff --git a/Web/src/views/statisticsV2/modules/MonthlyExpenseCard.vue b/Web/src/views/statisticsV2/modules/MonthlyExpenseCard.vue
index 884cc83..fff4621 100644
--- a/Web/src/views/statisticsV2/modules/MonthlyExpenseCard.vue
+++ b/Web/src/views/statisticsV2/modules/MonthlyExpenseCard.vue
@@ -108,7 +108,12 @@ const initChart = async () => {
   await nextTick()
 
   if (!chartRef.value) {
-    console.warn('图表容器未找到')
+    // 如果容器还未准备好，等待一小段时间后重试
+    setTimeout(() => {
+      if (chartRef.value && !chartInstance) {
+        initChart()
+      }
+    }, 100)
     return
   }