diff --git a/src/models/user/index.ts b/src/models/user/index.ts index 4f3209e6c..dc14a5889 100755 --- a/src/models/user/index.ts +++ b/src/models/user/index.ts @@ -92,7 +92,7 @@ const UserModel: UserModelType = { }, *getUserInfo({ payload }, { call, put }) { // location.search,,debug:"admin" - const response = yield call(getUserInfo, { ...payload,debug:"student"}) + const response = yield call(getUserInfo, { ...payload}) localStorage.userInfo = JSON.stringify(response); yield put({ diff --git a/src/pages/Competitions/Detail/components/WorkSubmit/index.less b/src/pages/Competitions/Detail/components/WorkSubmit/index.less index 7a43a1c1f..2f5ce75d9 100644 --- a/src/pages/Competitions/Detail/components/WorkSubmit/index.less +++ b/src/pages/Competitions/Detail/components/WorkSubmit/index.less @@ -1,8 +1,11 @@ [class^='ant-upload-list-item-info']{ - padding:10px; + padding-top:3px; height: 26px; background: #F6F7F9; border-radius: 15px; + span[role^='img']{ + top:7px!important; + } } [class^="ant-table-cell"]::before{ background: rgba(255,255,255,0); diff --git a/src/pages/Competitions/Detail/components/WorkSubmit/index.tsx b/src/pages/Competitions/Detail/components/WorkSubmit/index.tsx index f81e095bd..9490ada64 100644 --- a/src/pages/Competitions/Detail/components/WorkSubmit/index.tsx +++ b/src/pages/Competitions/Detail/components/WorkSubmit/index.tsx @@ -180,7 +180,7 @@ const WorkSubmit: FC = ({ type: 'competitions/Results', payload: { identifier: identifier, - stage_id: gameItem?.id, + stage_id: gameItem?.id || null, module_type:'worksubmit', ...urlData, } @@ -194,7 +194,7 @@ const WorkSubmit: FC = ({ type: 'competitions/updateMdContent', payload: { identifier: identifier, - stage_id: gameItem?.id, + stage_id: gameItem?.id || null, competition_module_id:ItemData.id, content:mdContent, md_content_id:data?.id, @@ -216,18 +216,18 @@ const WorkSubmit: FC = ({ login:userinfo?.login, container_type:"Competition", file_name:fileList?.[0]?.name, - stage_type:gameItem?.id, + stage_type:gameItem?.id || null, container_id:HeaderDetail?.id, result_id:rowTable?.id, module_type:'worksubmit', } if(modelType==1){ - const res:any = await Fetch(`/api/competitions/${identifier}/check_result_url.json`, + const res:any = await Fetch(`https://data.educoder.net/api/competitions/${identifier}/check_result_url.json`, { method:"GET", params:{ url:values.url, - stage_id:gameItem?.id, + stage_id:gameItem?.id || null, result_id:rowTable?.id, } } @@ -244,7 +244,7 @@ const WorkSubmit: FC = ({ result_id:rowTable?.id, name:values.name, url:values.url, - stage_id:gameItem?.id, + stage_id:gameItem?.id || null, result_url:rowTable?.result_url, module_type:'worksubmit', } @@ -267,7 +267,7 @@ const WorkSubmit: FC = ({ type: 'competitions/Results', payload: { identifier: identifier, - stage_id: gameItem?.id, + stage_id: gameItem?.id || null, page:1, per_page:9999999, // TODO :查询所有列表数据 keyword:"", @@ -425,14 +425,14 @@ const WorkSubmit: FC = ({ color: "#000000", marginTop:"10px" }}>参数作品提交} - open={isSubmitModel} + visible={isSubmitModel} bodyStyle={{padding:" 0px 25px 10px 25px"}} footer={null} onCancel={()=>{setIsSubmitModel(false);setFileList([]);setRowTable(null);}}>
说明:参赛作品不支持删除,大赛进行中上传后的作品如需修改,可在【作品提交】列表点击“编辑”进行修改。
{modelType==1&&<> - +