diff --git a/src/components/AuthenticationModel/index.tsx b/src/components/AuthenticationModel/index.tsx index f304f908..15b1b07d 100644 --- a/src/components/AuthenticationModel/index.tsx +++ b/src/components/AuthenticationModel/index.tsx @@ -39,7 +39,7 @@ const AuthModal: FC = ({ type: 'shixunsDetail/setActionTabs', payload: {}, }); - window.location.href = '/account/certification'; + window.location.href = 'https://www.educoder.net/account/certification'; }} onCancel={() => { dispatch({ diff --git a/src/pages/Competitions/Detail/index.tsx b/src/pages/Competitions/Detail/index.tsx index c8a1676a..e392c86a 100644 --- a/src/pages/Competitions/Detail/index.tsx +++ b/src/pages/Competitions/Detail/index.tsx @@ -231,7 +231,6 @@ const competitionDetails: FC = ({ let subArr = globalSetting?.setting?.sub_competitions; if(subArr.length>0){ let filterArr = subArr.filter((i:any)=>i.identifier === item.identifier); - console.log(filterArr); if(filterArr && filterArr.length >0 ){ setSubComShow(true); setSubComList(filterArr[0]); @@ -536,12 +535,12 @@ async function JoinTeams(name: any) { setIsClick(true); } } - // console.log('-------',useLocation().query.type); + // console.log('-------',(HeaderDetail.identifier === "track1_2023" || HeaderDetail.identifier === "track2_2023" || HeaderDetail.identifier === "track4_2023" )?false:(StaffDetail.enrolled && !HeaderDetail.need_attachment)); return (
- setSubComShow(false)} filterlist={subComList}/> + < SubCompetition visible={subComShow} onClose={()=>setSubComShow(false)} filterlist={subComList}/> setSubGitlinkShow(false)}/> 在线竞赛 @@ -594,7 +593,12 @@ async function JoinTeams(name: any) { {HeaderDetail.competition_status === "ended" ? : null} {HeaderDetail.competition_status === 'nearly_published' ? : null} {HeaderDetail.competition_status !== 'nearly_published' && HeaderDetail.enroll_end && HeaderDetail.competition_status !== 'ended' ? : null} - {HeaderDetail.competition_status === 'progressing' && HeaderDetail.enroll_end != true ? : null} + }>{StaffDetail.enrolled ? ((HeaderDetail.identifier === "track1_2023" || HeaderDetail.identifier === "track2_2023" || HeaderDetail.identifier === "track4_2023" ) ? "立即报名" : HeaderDetail.need_attachment ? '上传作品' : '已报名') : (HeaderDetail?.enroll_url ? '前往大赛官网报名' : '立即报名')} : null}
diff --git a/src/pages/Competitions/Index/index.tsx b/src/pages/Competitions/Index/index.tsx index d52702f6..9a3e104e 100755 --- a/src/pages/Competitions/Index/index.tsx +++ b/src/pages/Competitions/Index/index.tsx @@ -324,7 +324,10 @@ const competitionsIndexPage: FC = ({ setshowphone(true) return } - + if(item.identifier === "track4_2023" || item.identifier === "track2_2023" || item.identifier === "track1_2023"){ + openNewWindow(`/competitions/index/${item.identifier}`); + return; + } let data =await dispatch({ type: 'competitions/GetKylinId', payload: {