|
|
@@ -7,9 +7,10 @@ import { HomeOutlined } from "@ant-design/icons";
|
|
|
import { IUser } from "../auth/User";
|
|
|
import { API_HOST } from "../../request";
|
|
|
import UserName from "../auth/UserName";
|
|
|
-import { TCourseExpRequest, TCourseJoinMode } from "../api/Course";
|
|
|
+import { TCourseJoinMode } from "../api/Course";
|
|
|
import { useIntl } from "react-intl";
|
|
|
import Status from "./Status";
|
|
|
+import moment from "moment";
|
|
|
|
|
|
const { Title, Text } = Typography;
|
|
|
|
|
|
@@ -22,7 +23,6 @@ interface IWidget {
|
|
|
endAt?: string;
|
|
|
teacher?: IUser;
|
|
|
join?: TCourseJoinMode;
|
|
|
- exp?: TCourseExpRequest;
|
|
|
}
|
|
|
const CourseHeadWidget = ({
|
|
|
id,
|
|
|
@@ -33,7 +33,6 @@ const CourseHeadWidget = ({
|
|
|
startAt,
|
|
|
endAt,
|
|
|
join,
|
|
|
- exp,
|
|
|
}: IWidget) => {
|
|
|
const intl = useIntl();
|
|
|
|
|
|
@@ -70,7 +69,15 @@ const CourseHeadWidget = ({
|
|
|
<Title level={5}>{subtitle}</Title>
|
|
|
|
|
|
<Text>
|
|
|
- {startAt}——{endAt}
|
|
|
+ {moment(startAt).format("YYYY-MM-DD")}——
|
|
|
+ {moment(endAt).format("YYYY-MM-DD")}
|
|
|
+ </Text>
|
|
|
+ <Text>
|
|
|
+ {moment().isBefore(startAt)
|
|
|
+ ? "尚未开始"
|
|
|
+ : moment().isBefore(endAt)
|
|
|
+ ? "进行中"
|
|
|
+ : "已经结束"}
|
|
|
</Text>
|
|
|
<Text>
|
|
|
{join
|
|
|
@@ -79,12 +86,15 @@ const CourseHeadWidget = ({
|
|
|
})
|
|
|
: undefined}
|
|
|
</Text>
|
|
|
- <Status
|
|
|
- courseId={id ? id : ""}
|
|
|
- expRequest={exp}
|
|
|
- joinMode={join}
|
|
|
- startAt={startAt}
|
|
|
- />
|
|
|
+ {id ? (
|
|
|
+ <Status
|
|
|
+ courseId={id}
|
|
|
+ courseName={title}
|
|
|
+ joinMode={join}
|
|
|
+ startAt={startAt}
|
|
|
+ endAt={endAt}
|
|
|
+ />
|
|
|
+ ) : undefined}
|
|
|
</Space>
|
|
|
</Space>
|
|
|
|