diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js index cce00b5ae..aaf0891af 100644 --- a/public/react/src/modules/competition/Registration.js +++ b/public/react/src/modules/competition/Registration.js @@ -814,11 +814,11 @@ class Registration extends React.Component {
- 在线竞赛 + 在线竞赛 {competition_name === undefined || competition_name === null || competition_name === "" ? "全国高校计算机大赛" : competition_name} + to={`/competitions/${this.props.match.params.identifier}/common_header`}>{competition_name === undefined || competition_name === null || competition_name === "" ? "全国高校计算机大赛" : competition_name} {/**/} + {/* href={`/competitions/${this.props.match.params.identifier}/common_header`}>*/} 报名
diff --git a/public/react/src/modules/competition/personal/PersonalCompetititem.js b/public/react/src/modules/competition/personal/PersonalCompetititem.js index 0900f1e90..fe709972c 100644 --- a/public/react/src/modules/competition/personal/PersonalCompetititem.js +++ b/public/react/src/modules/competition/personal/PersonalCompetititem.js @@ -304,7 +304,7 @@ class PersonalCompetititem extends React.Component { >
( - @@ -182,7 +182,7 @@ class CompetitionsIndex extends Component{ title={ {item.name}{item.sub_title===null?"":`——${item.sub_title}`} {/*{item.sub_title===null?"":*/} {/*{item.sub_title}}*/} diff --git a/public/react/src/modules/competitions/Competition_teams/Competitionteams.js b/public/react/src/modules/competitions/Competition_teams/Competitionteams.js index 6dd0de767..5206476ef 100644 --- a/public/react/src/modules/competitions/Competition_teams/Competitionteams.js +++ b/public/react/src/modules/competitions/Competition_teams/Competitionteams.js @@ -241,8 +241,8 @@ class Competitionteams extends Component{
- {data&&data.name} - 报名 + {data&&data.name} + 报名 战队详情 diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js index 850c82e1e..8712ec907 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js @@ -122,7 +122,7 @@ class CompetitionCommon extends Component{ getrightdata=(id,typeid,module_url,has_url,listkey)=>{ // if(typeid==="enroll"){ - // this.props.history.replace(`/newcompetitions/${this.props.match.params.identifier}/enroll`); + // this.props.history.replace(`/competitions/${this.props.match.params.identifier}/enroll`); // return // } @@ -240,7 +240,7 @@ class CompetitionCommon extends Component{ data===undefined?"":
- 在线竞赛 + 在线竞赛 {data&&data.name} @@ -284,7 +284,7 @@ class CompetitionCommon extends Component{
{data.competition_status==="nearly_published"?"--":data&&data.visits_count}
-
this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}
+
this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}
@@ -317,7 +317,7 @@ class CompetitionCommon extends Component{ 报名截止 : data.competition_status==="progressing"?:""} {data&&data.enroll_end_time===null?"":`报名截止时间:${data&&data.enroll_end_time}`} diff --git a/public/react/src/modules/competitions/Competitions.js b/public/react/src/modules/competitions/Competitions.js index 4ec33b43b..2a9ab6990 100644 --- a/public/react/src/modules/competitions/Competitions.js +++ b/public/react/src/modules/competitions/Competitions.js @@ -53,7 +53,7 @@ class Competitions extends Component { {/*新版竞赛战队详情*/} - () } @@ -62,21 +62,21 @@ class Competitions extends Component { {/*新版竞赛报名*/} () } /> {/*新版竞赛详情页面*/} - () } > {/*新版竞赛首页*/} - () }