From e32ecd205e5d6cf45b9f3fe8b92aea46784ce05a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Thu, 20 Apr 2023 12:02:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=AF=BE=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/user.tsx  | 14 +++++++++-----
 src/pages/member/learn.tsx | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/pages/course/user.tsx b/src/pages/course/user.tsx
index 9c9278b..fb74011 100644
--- a/src/pages/course/user.tsx
+++ b/src/pages/course/user.tsx
@@ -72,11 +72,6 @@ const CourseUserPage = () => {
         </span>
       ),
     },
-    {
-      title: "学习进度",
-      dataIndex: "progress",
-      render: (progress: number) => <span>{progress / 100}%</span>,
-    },
     {
       title: "第一次学习时间",
       dataIndex: "created_at",
@@ -87,6 +82,15 @@ const CourseUserPage = () => {
       dataIndex: "finished_at",
       render: (text: string) => <span>{dateFormat(text)}</span>,
     },
+    {
+      title: "学习进度",
+      dataIndex: "progress",
+      render: (progress: number) => (
+        <span className={progress >= 10000 ? "c-green" : "c-red"}>
+          {progress / 100}%
+        </span>
+      ),
+    },
   ];
 
   useEffect(() => {
diff --git a/src/pages/member/learn.tsx b/src/pages/member/learn.tsx
index db0d435..ec3d42a 100644
--- a/src/pages/member/learn.tsx
+++ b/src/pages/member/learn.tsx
@@ -274,6 +274,16 @@ const MemberLearnPage = () => {
         </>
       ),
     },
+    {
+      title: "第一次学习时间",
+      dataIndex: "created_at",
+      render: (text: string) => <span>{dateFormat(text)}</span>,
+    },
+    {
+      title: "学习完成时间",
+      dataIndex: "finished_at",
+      render: (text: string) => <span>{dateFormat(text)}</span>,
+    },
     {
       title: "学习进度",
       dataIndex: "is_finished",
@@ -292,16 +302,6 @@ const MemberLearnPage = () => {
         </>
       ),
     },
-    {
-      title: "第一次学习时间",
-      dataIndex: "created_at",
-      render: (text: string) => <span>{dateFormat(text)}</span>,
-    },
-    {
-      title: "学习完成时间",
-      dataIndex: "finished_at",
-      render: (text: string) => <span>{dateFormat(text)}</span>,
-    },
   ];
 
   return (