From 3cbc868e9b8e82120becfb4556d4d27d9bfd763e Mon Sep 17 00:00:00 2001
From: SunCheng <cheng2.sun@ly.com>
Date: Sat, 17 Jan 2026 12:33:16 +0800
Subject: [PATCH] fix bug

---
 Web/src/assets/base.css        | 46 +++++++++++++++++-----------------
 Web/src/views/CalendarView.vue |  5 ++--
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/Web/src/assets/base.css b/Web/src/assets/base.css
index 1acaed8..9e6408d 100644
--- a/Web/src/assets/base.css
+++ b/Web/src/assets/base.css
@@ -19,29 +19,29 @@
   --section-gap: 160px;
 
   /* Chart Colors */
-  --chart-color-1: #FF6B6B;
-  --chart-color-2: #4ECDC4;
-  --chart-color-3: #45B7D1;
-  --chart-color-4: #FFA07A;
-  --chart-color-5: #98D8C8;
-  --chart-color-6: #F7DC6F;
-  --chart-color-7: #BB8FCE;
-  --chart-color-8: #85C1E2;
-  --chart-color-9: #F8B88B;
-  --chart-color-10: #AAB7B8;
-  --chart-color-11: #FF8ED4;
-  --chart-color-12: #67E6DC;
-  --chart-color-13: #FFAB73;
-  --chart-color-14: #C9B1FF;
-  --chart-color-15: #7BDFF2;
+  --chart-color-1: #ff6b6b;
+  --chart-color-2: #4ecdc4;
+  --chart-color-3: #45b7d1;
+  --chart-color-4: #ffa07a;
+  --chart-color-5: #98d8c8;
+  --chart-color-6: #f7dc6f;
+  --chart-color-7: #bb8fce;
+  --chart-color-8: #85c1e2;
+  --chart-color-9: #f8b88b;
+  --chart-color-10: #aab7b8;
+  --chart-color-11: #ff8ed4;
+  --chart-color-12: #67e6dc;
+  --chart-color-13: #ffab73;
+  --chart-color-14: #c9b1ff;
+  --chart-color-15: #7bdff2;
 
   /* Status Colors for Charts */
   --chart-success: #52c41a;
   --chart-warning: #faad14;
   --chart-danger: #f5222d;
   --chart-primary: #1890ff;
-  --chart-shadow: rgba(0,138,255,0.45);
-  --chart-axis: #E6EBF8;
+  --chart-shadow: rgba(0, 138, 255, 0.45);
+  --chart-axis: #e6ebf8;
   --chart-split: #eee;
   --chart-text-muted: #999;
 
@@ -58,13 +58,13 @@
     --chart-axis: #333;
     --chart-split: #333;
     --chart-text-muted: #666;
-    
+
     /* Heatmap Colors - Dark Mode (GitHub Style) */
-    --heatmap-level-0: #161b22;
-    --heatmap-level-1: #0e4429;
-    --heatmap-level-2: #006d32;
-    --heatmap-level-3: #26a641;
-    --heatmap-level-4: #39d353;
+    --heatmap-level-0: var(--van-gray-2);
+    --heatmap-level-1: #9be9a8;
+    --heatmap-level-2: #40c463;
+    --heatmap-level-3: #30a14e;
+    --heatmap-level-4: #216e39;
   }
 }
 
diff --git a/Web/src/views/CalendarView.vue b/Web/src/views/CalendarView.vue
index 1bcc089..cbea8bb 100644
--- a/Web/src/views/CalendarView.vue
+++ b/Web/src/views/CalendarView.vue
@@ -96,9 +96,10 @@ const fetchDailyStatistics = async (year, month) => {
       // 将数组转换为对象，key为日期
       const statsMap = {}
       response.data.forEach((item) => {
+        console.warn(item)
         statsMap[item.date] = {
           count: item.count,
-          amount: item.amount
+          amount: (item.income - item.expense).toFixed(1)
         }
       })
       dailyStatistics.value = {
@@ -262,7 +263,7 @@ const formatterCalendar = (day) => {
 
   if (stats) {
     dayCopy.topInfo = `${stats.count}笔` // 展示消费笔数
-    dayCopy.bottomInfo = `${(stats.amount || 0).toFixed(1)}元` // 展示消费金额
+    dayCopy.bottomInfo = `${stats.amount}元` // 展示消费金额
   }
 
   return dayCopy