From a18d7319130be8819d9a8ca8eb2f55fdf4a8caac 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 11:18:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=AD=A6=E4=B9=A0=E7=BA=BF?=
 =?UTF-8?q?=E4=B8=8A=E8=AF=BE=E8=BF=9B=E5=BA=A6=E5=88=97=E8=A1=A8=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/member/learn.tsx | 40 ++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/pages/member/learn.tsx b/src/pages/member/learn.tsx
index b1c8a39..4bb43c8 100644
--- a/src/pages/member/learn.tsx
+++ b/src/pages/member/learn.tsx
@@ -237,7 +237,7 @@ const MemberLearnPage = () => {
 
   const column2: ColumnsType<DataType> = [
     {
-      title: "课程",
+      title: "课程名称",
       dataIndex: "title",
       render: (_, record: any) => (
         <div className="d-flex">
@@ -253,37 +253,39 @@ const MemberLearnPage = () => {
       ),
     },
     {
-      title: "总课时",
+      title: "课程进度",
       dataIndex: "total_duration",
       render: (_, record: any) => (
         <>
-          <span>{record.hour_count}</span>
+          <span>
+            已完成课时: {record.finished_count}/{record.hour_count}
+          </span>
         </>
       ),
     },
     {
-      title: "已学习课时",
-      dataIndex: "finished_duration",
-      render: (_, record: any) => (
-        <>
-          <span>{record.finished_count}</span>
-        </>
-      ),
+      title: "第一次学习时间",
+      dataIndex: "created_at",
+      render: (text: string) => <span>{dateFormat(text)}</span>,
     },
     {
-      title: "状态",
+      title: "学习进度",
       dataIndex: "is_finished",
       render: (_, record: any) => (
         <>
-          {record.is_finished === 1 ? <span>已学完</span> : <span>未学完</span>}
+          <span
+            className={
+              Math.floor((record.finished_count / record.hour_count) * 100) >=
+              100
+                ? "c-green"
+                : "c-red"
+            }
+          >
+            {Math.floor((record.finished_count / record.hour_count) * 100)}%
+          </span>
         </>
       ),
     },
-    {
-      title: "时间",
-      dataIndex: "created_at",
-      render: (text: string) => <span>{dateFormat(text)}</span>,
-    },
   ];
 
   return (
@@ -303,7 +305,7 @@ const MemberLearnPage = () => {
           ></div>
         </div>
       </Row>
-      <div className="playedu-main-top mb-24">
+      {/* <div className="playedu-main-top mb-24">
         <div className={styles["large-title"]}>课时学习记录</div>
         <div className="float-left mt-24">
           <Table
@@ -314,7 +316,7 @@ const MemberLearnPage = () => {
             rowKey={(record) => record.id}
           />
         </div>
-      </div>
+      </div> */}
       <div className="playedu-main-top">
         <div className={styles["large-title"]}>线上课学习记录</div>
         <div className="float-left mt-24">