From ca814dcaf4f331e0db617c8c359ca29da698e891 Mon Sep 17 00:00:00 2001
From: archer <545436317@qq.com>
Date: Wed, 28 Jun 2023 15:26:11 +0800
Subject: [PATCH] fix: admin chart

---
 admin/src/Dashboard.tsx | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/admin/src/Dashboard.tsx b/admin/src/Dashboard.tsx
index 5fa321c39..41583f958 100644
--- a/admin/src/Dashboard.tsx
+++ b/admin/src/Dashboard.tsx
@@ -77,13 +77,16 @@ export const Dashboard: React.FC = React.memo(() => {
         }).then((res) => res.json())
       ]);
 
-      const data = userResponse.map((item, i) => ({
-        date: dayjs(item.date).format('MM/DD'),
-        userCount: item.count,
-        userIncrease: item.increase,
-        userIncreaseRate: item.increaseRate,
-        payCount: payResponse[i].count / PRICE_SCALE
-      }));
+      const data = userResponse.map((item, i) => {
+        const pay = payResponse.find((pay) => item.date === pay.date);
+        return {
+          date: dayjs(item.date).format('MM/DD'),
+          userCount: item.count,
+          userIncrease: item.increase,
+          userIncreaseRate: item.increaseRate,
+          payCount: pay ? pay.count / PRICE_SCALE : 0
+        };
+      });
       setChatData(data);
     };
 
@@ -198,6 +201,9 @@ const CustomTooltip = ({ active, payload }: any) => {
           boxShadow: '2px 2px 5px rgba(0,0,0,0.2)'
         }}
       >
+        <p className="label">
+          日期: <strong>{data.date}</strong>
+        </p>
         <p className="label">
           用户总数: <strong>{data.userCount}</strong>
         </p>