From 9b5e2807b5d44f6d6378f0c0b439aaf03d87248d Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Sat, 8 Aug 2026 18:40:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../events/list/components/EventRegulationModal.module.less | 2 ++
 src/pages/events/list/index.tsx                             | 2 +-
 src/pages/finance/reports/index.tsx                         | 6 +++++-
 src/pages/finance/reports/model/useReportsModel.ts          | 4 +++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/pages/events/list/components/EventRegulationModal.module.less b/src/pages/events/list/components/EventRegulationModal.module.less
index 9db2931..0eb0b52 100644
--- a/src/pages/events/list/components/EventRegulationModal.module.less
+++ b/src/pages/events/list/components/EventRegulationModal.module.less
@@ -25,6 +25,8 @@
     padding: 12px 16px;
     border-radius: 4px;
     border: 1px solid #f0f0f0;
+    max-height: 360px;
+    overflow-y: auto;
   }
 
   .imageGrid {
diff --git a/src/pages/events/list/index.tsx b/src/pages/events/list/index.tsx
index f817754..b2abbff 100644
--- a/src/pages/events/list/index.tsx
+++ b/src/pages/events/list/index.tsx
@@ -89,7 +89,7 @@ export default defineComponent({
     const renderAction = (record: any) => {
       const status = record.status;
 
-      if (status === '0' || status === '1') {
+      if (['0', '1', '2'].includes(status)) {
         return (
           <Space>
             <Button type="link" size="small" onClick={() => openDetailModal(record)}>
diff --git a/src/pages/finance/reports/index.tsx b/src/pages/finance/reports/index.tsx
index 9cbd18c..52da201 100644
--- a/src/pages/finance/reports/index.tsx
+++ b/src/pages/finance/reports/index.tsx
@@ -224,7 +224,11 @@ export default defineComponent({
                 <div class={styles.statValue} style={{ color: item.accentColor }}>
                   ¥{formatMoney(item.value)}
                 </div>
-                {/* 趋势文字暂时隐藏 */}
+                {item.key === 'totalBalance' && (
+                  <div class={styles.statDesc} style={{ color: 'rgba(0, 0, 0, 0.45)' }}>
+                    = 总收入 - 提现金额
+                  </div>
+                )}
               </div>
             ))}
           </div>
diff --git a/src/pages/finance/reports/model/useReportsModel.ts b/src/pages/finance/reports/model/useReportsModel.ts
index 4916a81..711aa15 100644
--- a/src/pages/finance/reports/model/useReportsModel.ts
+++ b/src/pages/finance/reports/model/useReportsModel.ts
@@ -126,7 +126,9 @@ export function useReportsModel() {
   // ===== 图表数据 =====
   const chartData = computed(() => {
     const list = data.value?.monthList || [];
-    return list.map((item) => ({
+    // 按月份升序排列，确保图表 X 轴时间顺序正确
+    const sorted = [...list].sort((a, b) => a.month.localeCompare(b.month));
+    return sorted.map((item) => ({
       month: dayjs(item.month).format('MM月'),
       order: toNumber(item.orderAmount),
       refund: toNumber(item.refundAmount),

From 79a7ea8c560540e0fb649bf86270c750853be77a Mon Sep 17 00:00:00 2001
From: ZhuRui <GodRuiCollection@163.com>
Date: Mon, 10 Aug 2026 09:44:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/finance/reports/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/finance/reports/index.tsx b/src/pages/finance/reports/index.tsx
index 52da201..18138b2 100644
--- a/src/pages/finance/reports/index.tsx
+++ b/src/pages/finance/reports/index.tsx
@@ -180,7 +180,7 @@ export default defineComponent({
         },
         {
           key: 'totalBalance',
-          label: '平台余额（所有用户余额总和）',
+          label: '平台余额（所有用户余额总和 = 总收入 - 提现金额）',
           value: s.totalBalance,
           bgColor: '#e6f4ff',
           accentColor: '#1677ff',
@@ -224,11 +224,11 @@ export default defineComponent({
                 <div class={styles.statValue} style={{ color: item.accentColor }}>
                   ¥{formatMoney(item.value)}
                 </div>
-                {item.key === 'totalBalance' && (
+                {/* {item.key === 'totalBalance' && (
                   <div class={styles.statDesc} style={{ color: 'rgba(0, 0, 0, 0.45)' }}>
                     = 总收入 - 提现金额
                   </div>
-                )}
+                )} */}
               </div>
             ))}
           </div>