yexuejc007/PlayEdu-backend
1
0
Fork 0
mirror of https://github.com/PlayEdu/backend synced 2025-06-08 19:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
xxx 2023-11-13 14:39:52 +08:00
parent 2b8e8777c7
commit e479ec7848
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/member/compenents/progress.tsx
View File

@ -215,7 +215,7 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
maskClosable={false} maskClosable={false}
footer={null} footer={null}
> >
<div className="mt-24"> <div className="w-100 d-flex mt-24">
<PerButton <PerButton
type="primary" type="primary"
text="重置学习记录" text="重置学习记录"
@ -228,7 +228,10 @@ export const MemberLearnProgressDialog: React.FC<PropInterface> = ({
disabled={null} disabled={null}
/> />
</div> </div>
<div className="mt-24" style={{ maxHeight: 800, overflowY: "auto" }}> <div
className="w-100 d-flex mt-24"
style={{ maxHeight: 800, overflowY: "auto" }}
>
<Table <Table
columns={column} columns={column}
dataSource={list} dataSource={list}