diff --git a/src/pages/course/index.tsx b/src/pages/course/index.tsx index cfd66e7..f5b89b6 100644 --- a/src/pages/course/index.tsx +++ b/src/pages/course/index.tsx @@ -232,7 +232,9 @@ const CoursePage = () => { p="course" onClick={() => { setCid(Number(record.id)); - navigate("/course/user/" + Number(record.id)); + navigate( + "/course/user/" + Number(record.id) + "?title=" + record.title + ); }} disabled={null} /> diff --git a/src/pages/course/user.tsx b/src/pages/course/user.tsx index 68b46db..dad37df 100644 --- a/src/pages/course/user.tsx +++ b/src/pages/course/user.tsx @@ -11,7 +11,7 @@ import { Image, } from "antd"; import { course } from "../../api"; -import { useParams } from "react-router-dom"; +import { useParams, useLocation } from "react-router-dom"; import type { ColumnsType } from "antd/es/table"; import { BackBartment } from "../../compenents"; import { ExclamationCircleFilled } from "@ant-design/icons"; @@ -31,6 +31,7 @@ interface DataType { const CourseUserPage = () => { const params = useParams(); + const result = new URLSearchParams(useLocation().search); const [list, setList] = useState([]); const [users, setUsers] = useState([]); const [refresh, setRefresh] = useState(false); @@ -42,10 +43,11 @@ const CourseUserPage = () => { const [email, setEmail] = useState(""); const [idCard, setIdCard] = useState(""); const [selectedRowKeys, setSelectedRowKeys] = useState([]); + const [title, setTitle] = useState(String(result.get("title"))); const columns: ColumnsType = [ { - title: "学员名称", + title: "学员", render: (_, record: any) => (
{
- +
diff --git a/src/pages/member/learn.tsx b/src/pages/member/learn.tsx index 2fe26e5..db0d435 100644 --- a/src/pages/member/learn.tsx +++ b/src/pages/member/learn.tsx @@ -269,16 +269,11 @@ const MemberLearnPage = () => { render: (_, record: any) => ( <> - 已完成课时: {record.finished_count}/{record.hour_count} + 已完成课时:{record.finished_count} / {record.hour_count} ), }, - { - title: "第一次学习时间", - dataIndex: "created_at", - render: (text: string) => {dateFormat(text)}, - }, { title: "学习进度", dataIndex: "is_finished", @@ -297,6 +292,16 @@ const MemberLearnPage = () => { ), }, + { + title: "第一次学习时间", + dataIndex: "created_at", + render: (text: string) => {dateFormat(text)}, + }, + { + title: "学习完成时间", + dataIndex: "finished_at", + render: (text: string) => {dateFormat(text)}, + }, ]; return ( @@ -315,6 +320,15 @@ const MemberLearnPage = () => { }} >
+
+ record.id} + /> + {/*
课时学习记录
@@ -328,18 +342,6 @@ const MemberLearnPage = () => { />
*/} -
-
线上课学习记录
-
-
record.id} - /> - - ); };