From 535dfb820464bea5b73bc778de0be4bc8b33ae8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Wed, 10 May 2023 15:56:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A6=82=E8=A7=88=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E6=8E=92=E8=A1=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/dashboard/index.tsx | 220 ++++++++++++++--------------------
 1 file changed, 90 insertions(+), 130 deletions(-)

diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx
index e66ef10..d3dfed7 100644
--- a/src/pages/dashboard/index.tsx
+++ b/src/pages/dashboard/index.tsx
@@ -258,19 +258,15 @@ const DashboardPage = () => {
                         src={iconN1}
                         alt=""
                       />
-                      {basicData.user_learn_top10[0] &&
-                        basicData.user_learn_top10[0].user_id &&
-                        basicData.user_learn_top10_users[
-                          basicData.user_learn_top10[0].user_id
-                        ](
-                          <div className={styles["item-name"]}>
-                            {
-                              basicData.user_learn_top10_users[
-                                basicData.user_learn_top10[0].user_id
-                              ].name
-                            }
-                          </div>
-                        )}
+                      {basicData.user_learn_top10[0] && (
+                        <div className={styles["item-name"]}>
+                          {
+                            basicData.user_learn_top10_users[
+                              basicData.user_learn_top10[0].user_id
+                            ]?.name
+                          }
+                        </div>
+                      )}
                     </div>
                     {basicData.user_learn_top10[0] && (
                       <div className={styles["item-time"]}>
@@ -287,19 +283,15 @@ const DashboardPage = () => {
                         src={iconN2}
                         alt=""
                       />
-                      {basicData.user_learn_top10[1] &&
-                        basicData.user_learn_top10[1].user_id &&
-                        basicData.user_learn_top10_users[
-                          basicData.user_learn_top10[1].user_id
-                        ] && (
-                          <div className={styles["item-name"]}>
-                            {
-                              basicData.user_learn_top10_users[
-                                basicData.user_learn_top10[1].user_id
-                              ].name
-                            }
-                          </div>
-                        )}
+                      {basicData.user_learn_top10[1] && (
+                        <div className={styles["item-name"]}>
+                          {
+                            basicData.user_learn_top10_users[
+                              basicData.user_learn_top10[1].user_id
+                            ]?.name
+                          }
+                        </div>
+                      )}
                     </div>
                     {basicData.user_learn_top10[1] && (
                       <div className={styles["item-time"]}>
@@ -316,19 +308,15 @@ const DashboardPage = () => {
                         src={iconN3}
                         alt=""
                       />
-                      {basicData.user_learn_top10[2] &&
-                        basicData.user_learn_top10[2].user_id &&
-                        basicData.user_learn_top10_users[
-                          basicData.user_learn_top10[2].user_id
-                        ] && (
-                          <div className={styles["item-name"]}>
-                            {
-                              basicData.user_learn_top10_users[
-                                basicData.user_learn_top10[2].user_id
-                              ].name
-                            }
-                          </div>
-                        )}
+                      {basicData.user_learn_top10[2] && (
+                        <div className={styles["item-name"]}>
+                          {
+                            basicData.user_learn_top10_users[
+                              basicData.user_learn_top10[2].user_id
+                            ]?.name
+                          }
+                        </div>
+                      )}
                     </div>
                     {basicData.user_learn_top10[2] && (
                       <div className={styles["item-time"]}>
@@ -341,19 +329,15 @@ const DashboardPage = () => {
                   <div className={styles["rank-item"]}>
                     <div className={styles["left-item"]}>
                       <div className={styles["item-num"]}>4</div>
-                      {basicData.user_learn_top10[3] &&
-                        basicData.user_learn_top10[3].user_id &&
-                        basicData.user_learn_top10_users[
-                          basicData.user_learn_top10[3].user_id
-                        ] && (
-                          <div className={styles["item-name"]}>
-                            {
-                              basicData.user_learn_top10_users[
-                                basicData.user_learn_top10[3].user_id
-                              ].name
-                            }
-                          </div>
-                        )}
+                      {basicData.user_learn_top10[3] && (
+                        <div className={styles["item-name"]}>
+                          {
+                            basicData.user_learn_top10_users[
+                              basicData.user_learn_top10[3].user_id
+                            ]?.name
+                          }
+                        </div>
+                      )}
                     </div>
                     {basicData.user_learn_top10[3] && (
                       <div className={styles["item-time"]}>
@@ -366,19 +350,15 @@ const DashboardPage = () => {
                   <div className={styles["rank-item"]}>
                     <div className={styles["left-item"]}>
                       <div className={styles["item-num"]}>5</div>
-                      {basicData.user_learn_top10[4] &&
-                        basicData.user_learn_top10[4].user_id &&
-                        basicData.user_learn_top10_users[
-                          basicData.user_learn_top10[4].user_id
-                        ] && (
-                          <div className={styles["item-name"]}>
-                            {
-                              basicData.user_learn_top10_users[
-                                basicData.user_learn_top10[4].user_id
-                              ].name
-                            }
-                          </div>
-                        )}
+                      {basicData.user_learn_top10[4] && (
+                        <div className={styles["item-name"]}>
+                          {
+                            basicData.user_learn_top10_users[
+                              basicData.user_learn_top10[4].user_id
+                            ]?.name
+                          }
+                        </div>
+                      )}
                     </div>
                     {basicData.user_learn_top10[4] && (
                       <div className={styles["item-time"]}>
@@ -395,19 +375,15 @@ const DashboardPage = () => {
                   <div className={styles["rank-item"]}>
                     <div className={styles["left-item"]}>
                       <div className={styles["item-num"]}>6</div>
-                      {basicData.user_learn_top10[5] &&
-                        basicData.user_learn_top10[5].user_id &&
-                        basicData.user_learn_top10_users[
-                          basicData.user_learn_top10[5].user_id
-                        ] && (
-                          <div className={styles["item-name"]}>
-                            {
-                              basicData.user_learn_top10_users[
-                                basicData.user_learn_top10[5].user_id
-                              ].name
-                            }
-                          </div>
-                        )}
+                      {basicData.user_learn_top10[5] && (
+                        <div className={styles["item-name"]}>
+                          {
+                            basicData.user_learn_top10_users[
+                              basicData.user_learn_top10[5].user_id
+                            ]?.name
+                          }
+                        </div>
+                      )}
                     </div>
                     {basicData.user_learn_top10[5] && (
                       <div className={styles["item-time"]}>
@@ -420,19 +396,15 @@ const DashboardPage = () => {
                   <div className={styles["rank-item"]}>
                     <div className={styles["left-item"]}>
                       <div className={styles["item-num"]}>7</div>
-                      {basicData.user_learn_top10[6] &&
-                        basicData.user_learn_top10[6].user_id &&
-                        basicData.user_learn_top10_users[
-                          basicData.user_learn_top10[6].user_id
-                        ] && (
-                          <div className={styles["item-name"]}>
-                            {
-                              basicData.user_learn_top10_users[
-                                basicData.user_learn_top10[6].user_id
-                              ].name
-                            }
-                          </div>
-                        )}
+                      {basicData.user_learn_top10[6] && (
+                        <div className={styles["item-name"]}>
+                          {
+                            basicData.user_learn_top10_users[
+                              basicData.user_learn_top10[6].user_id
+                            ]?.name
+                          }
+                        </div>
+                      )}
                     </div>
                     {basicData.user_learn_top10[6] && (
                       <div className={styles["item-time"]}>
@@ -445,19 +417,15 @@ const DashboardPage = () => {
                   <div className={styles["rank-item"]}>
                     <div className={styles["left-item"]}>
                       <div className={styles["item-num"]}>8</div>
-                      {basicData.user_learn_top10[7] &&
-                        basicData.user_learn_top10[7].user_id &&
-                        basicData.user_learn_top10_users[
-                          basicData.user_learn_top10[7].user_id
-                        ] && (
-                          <div className={styles["item-name"]}>
-                            {
-                              basicData.user_learn_top10_users[
-                                basicData.user_learn_top10[7].user_id
-                              ].name
-                            }
-                          </div>
-                        )}
+                      {basicData.user_learn_top10[7] && (
+                        <div className={styles["item-name"]}>
+                          {
+                            basicData.user_learn_top10_users[
+                              basicData.user_learn_top10[7].user_id
+                            ]?.name
+                          }
+                        </div>
+                      )}
                     </div>
                     {basicData.user_learn_top10[7] && (
                       <div className={styles["item-time"]}>
@@ -470,19 +438,15 @@ const DashboardPage = () => {
                   <div className={styles["rank-item"]}>
                     <div className={styles["left-item"]}>
                       <div className={styles["item-num"]}>9</div>
-                      {basicData.user_learn_top10[8] &&
-                        basicData.user_learn_top10[8].user_id &&
-                        basicData.user_learn_top10_users[
-                          basicData.user_learn_top10[8].user_id
-                        ] && (
-                          <div className={styles["item-name"]}>
-                            {
-                              basicData.user_learn_top10_users[
-                                basicData.user_learn_top10[8].user_id
-                              ].name
-                            }
-                          </div>
-                        )}
+                      {basicData.user_learn_top10[8] && (
+                        <div className={styles["item-name"]}>
+                          {
+                            basicData.user_learn_top10_users[
+                              basicData.user_learn_top10[8].user_id
+                            ]?.name
+                          }
+                        </div>
+                      )}
                     </div>
                     {basicData.user_learn_top10[8] && (
                       <div className={styles["item-time"]}>
@@ -495,19 +459,15 @@ const DashboardPage = () => {
                   <div className={styles["rank-item"]}>
                     <div className={styles["left-item"]}>
                       <div className={styles["item-num"]}>10</div>
-                      {basicData.user_learn_top10[9] &&
-                        basicData.user_learn_top10[9].user_id &&
-                        basicData.user_learn_top10_users[
-                          basicData.user_learn_top10[9].user_id
-                        ] && (
-                          <div className={styles["item-name"]}>
-                            {
-                              basicData.user_learn_top10_users[
-                                basicData.user_learn_top10[9].user_id
-                              ].name
-                            }
-                          </div>
-                        )}
+                      {basicData.user_learn_top10[9] && (
+                        <div className={styles["item-name"]}>
+                          {
+                            basicData.user_learn_top10_users[
+                              basicData.user_learn_top10[9].user_id
+                            ]?.name
+                          }
+                        </div>
+                      )}
                     </div>
                     {basicData.user_learn_top10[9] && (
                       <div className={styles["item-time"]}>