From 67e1dc48ea9ad8e7c8663f0cf8f99ec07d0f63a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 26 Oct 2019 19:04:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/competition/Registration.js      | 6 +++---
 .../modules/competition/personal/PersonalCompetititem.js  | 4 ++--
 .../competitions/Competitimain/CompetitionsIndex.js       | 4 ++--
 .../competitions/Competition_teams/Competitionteams.js    | 4 ++--
 .../competitions/Competitioncommon/CompetitionCommon.js   | 8 ++++----
 public/react/src/modules/competitions/Competitions.js     | 8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)

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 {
 
 					<div style={{marginBottom: '12px'}}>
 						<Breadcrumb separator=">">
-							<Breadcrumb.Item><Link to={"/newcompetitions"}>在线竞赛</Link></Breadcrumb.Item>
+							<Breadcrumb.Item><Link to={"/competitions"}>在线竞赛</Link></Breadcrumb.Item>
 							<Breadcrumb.Item><Link
-								to={`/newcompetitions/${this.props.match.params.identifier}/common_header`}>{competition_name === undefined || competition_name === null || competition_name === "" ? "全国高校计算机大赛" : competition_name}</Link></Breadcrumb.Item>
+								to={`/competitions/${this.props.match.params.identifier}/common_header`}>{competition_name === undefined || competition_name === null || competition_name === "" ? "全国高校计算机大赛" : competition_name}</Link></Breadcrumb.Item>
 							{/*<Breadcrumb.Item*/}
-							{/*	href={`/newcompetitions/${this.props.match.params.identifier}/common_header`}></Breadcrumb.Item>*/}
+							{/*	href={`/competitions/${this.props.match.params.identifier}/common_header`}></Breadcrumb.Item>*/}
 							<Breadcrumb.Item>报名</Breadcrumb.Item>
 						</Breadcrumb>
 					</div>
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 {
 											>
 												<div className="regitemimgs555">
 													<a
-														href={`/newcompetitions/${this.props.match.params.identifier}/competition_teams/${item.id}`}
+														href={`/competitions/${this.props.match.params.identifier}/competition_teams/${item.id}`}
 														style={{
 														color: "#459be5",
 														width: "100%",
@@ -364,7 +364,7 @@ class PersonalCompetititem extends React.Component {
 											>
 												<div className="regitemimgs555">
 													<a
-														href={`/newcompetitions/${this.props.match.params.identifier}/competition_teams/${item.id}`}
+														href={`/competitions/${this.props.match.params.identifier}/competition_teams/${item.id}`}
 														style={{
 														color: "#459be5",
 														width: "100%",
diff --git a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
index 1d721b2e9..b7cff6f0b 100644
--- a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
+++ b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
@@ -124,7 +124,7 @@ class CompetitionsIndex extends Component{
 									size="large"
 									dataSource={datas&&datas}
 									renderItem={(item,key) => (
-										<a href={item.competition_status==="ended"?`/newcompetitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?	this.props.current_user&&this.props.current_user.business===true?`/newcompetitions/${item.identifier}/common_header`:this.props.current_user&&this.props.current_user.admin===true?`/newcompetitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/newcompetitions/${item.identifier}/common_header`:null}
+										<a href={item.competition_status==="ended"?`/competitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?	this.props.current_user&&this.props.current_user.business===true?`/competitions/${item.identifier}/common_header`:this.props.current_user&&this.props.current_user.admin===true?`/competitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/competitions/${item.identifier}/common_header`:null}
 											className={item.competition_status==="ended"?"competitionstitlesshou":item.competition_status==="nearly_published"?
 												this.props.current_user&&this.props.current_user.admin===true?"competitionstitlesshou":this.props.current_user&&this.props.current_user.business===true?"competitionstitlesshou":"endedfont":"competitionstitlesshou"}
 										  >
@@ -182,7 +182,7 @@ class CompetitionsIndex extends Component{
 													title={<a className={item.competition_status==="ended"?"competitionstitlesshou":item.competition_status==="nearly_published"?
 														this.props.current_user&&this.props.current_user.admin===true?"competitionstitlesshou":this.props.current_user&&this.props.current_user.business===true?"competitionstitlesshou":"endedfont":"competitionstitlesshou"}>
 														<a className={"competitionstitles"}
-																					href={item.competition_status==="ended"?`/newcompetitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?	this.props.current_user&&this.props.current_user.business===true?`/newcompetitions/${item.identifier}/common_header`:this.props.current_user&&this.props.current_user.admin===true?`/newcompetitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/newcompetitions/${item.identifier}/common_header`:null}
+																					href={item.competition_status==="ended"?`/competitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?	this.props.current_user&&this.props.current_user.business===true?`/competitions/${item.identifier}/common_header`:this.props.current_user&&this.props.current_user.admin===true?`/competitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/competitions/${item.identifier}/common_header`:null}
 													>{item.name}{item.sub_title===null?"":`——${item.sub_title}`}</a>
 														{/*<span>{item.sub_title===null?"":*/}
 															{/*<Tag className="competitionsrelative" color="#87d068">{item.sub_title}</Tag>}*/}
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{
 
 				<div className={"educontent clearfix mt20 "}>
 					<Breadcrumb separator=">">
-						<Breadcrumb.Item><Link to={"/newcompetitions"}>{data&&data.name}</Link></Breadcrumb.Item>
-						<Breadcrumb.Item><Link to={`/newcompetitions/${this.props.match.params.identifier}/enroll`}>报名</Link></Breadcrumb.Item>
+						<Breadcrumb.Item><Link to={"/competitions"}>{data&&data.name}</Link></Breadcrumb.Item>
+						<Breadcrumb.Item><Link to={`/competitions/${this.props.match.params.identifier}/enroll`}>报名</Link></Breadcrumb.Item>
 						<Breadcrumb.Item>战队详情</Breadcrumb.Item>
 					</Breadcrumb>
 
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?"":<div className={"educontent clearfix mt20 "}>
 
 					<Breadcrumb separator=">">
-						<Breadcrumb.Item><Link to={"/newcompetitions"}>在线竞赛</Link></Breadcrumb.Item>
+						<Breadcrumb.Item><Link to={"/competitions"}>在线竞赛</Link></Breadcrumb.Item>
 						<Breadcrumb.Item>{data&&data.name}</Breadcrumb.Item>
 					</Breadcrumb>
 
@@ -284,7 +284,7 @@ class CompetitionCommon extends Component{
 													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data.competition_status==="nearly_published"?"--":data&&data.visits_count}</div>
 												</Col>
 												<Col className="gutter-row rankbeicenter" span={6}>
-													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516" onClick={data.competition_status==="nearly_published"?"":()=>this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}</div>
+													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516" onClick={data.competition_status==="nearly_published"?"":()=>this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}</div>
 												</Col>
 											</Row>
 									</Col>
@@ -317,7 +317,7 @@ class CompetitionCommon extends Component{
 													报名截止
 												</Button>:
 											data.competition_status==="progressing"?<Button type="primary" block className={"Competitionfontsize22"}>
-												{data.mode===2?<a onClick={()=>this.gotocourse()}>立即报名</a>:<a onClick={()=>this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>立即报名</a>}
+												{data.mode===2?<a onClick={()=>this.gotocourse()}>立即报名</a>:<a onClick={()=>this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>立即报名</a>}
 										</Button>:""}
 									</Col>
 									<Col className={"mt10 Competitionfontsize16"}>{data&&data.enroll_end_time===null?"":`报名截止时间：${data&&data.enroll_end_time}`}</Col>
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 {
 				<Switch>
 
 					{/*新版竞赛战队详情*/}
-					<Route path="/newcompetitions/:identifier/competition_teams/:competition_team_id"
+					<Route path="/competitions/:identifier/competition_teams/:competition_team_id"
 								 render={
 									 (props) => (<CompetitionTeams {...this.props} {...props} {...this.state} />)
 								 }
@@ -62,21 +62,21 @@ class Competitions extends Component {
 
 					{/*新版竞赛报名*/}
 					<Route
-						path="/newcompetitions/:identifier/enroll"
+						path="/competitions/:identifier/enroll"
 						render={
 							(props) => (<Registration {...this.props} {...props} {...this.state}/>)
 						}
 					/>
 
 					{/*新版竞赛详情页面*/}
-					<Route path="/newcompetitions/:identifier/common_header"
+					<Route path="/competitions/:identifier/common_header"
 								 render={
 									 (props) => (<CompetitionCommon {...this.props} {...props} {...this.state} />)
 								 }
 					></Route>
 
 					{/*新版竞赛首页*/}
-					<Route path="/newcompetitions"
+					<Route path="/competitions"
 								 render={
 									 (props) => (<CompetitionsIndex {...this.props} {...props} {...this.state} />)
 								 }