From 1e1cc79daa8e6d52d4055fe997fa2eb22ad53b5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 29 Oct 2019 14:12:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9B=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Competitioncommon/CompetitionCommon.js             |  4 ++--
 .../Competitioncommon/CompetitionContents.js           |  4 ++--
 .../Competitioncommon/CompetitionContentsChart.js      | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
index 7b622949e..2d1aae16f 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -268,7 +268,7 @@ class CompetitionCommon extends Component{
 					 
 						<Row className={"CompetitionCommonbanner"}>
 							{data.competition_status==="nearly_published"?
-								this.props.current_user&&this.props.current_user.admin===true?"":this.props.current_user&&this.props.current_user.business===true?"":<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>:""}
+								data&&data.permission.editable===true?"":<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>:""}
 							<img className={"Commonimg"}
 									 src={data.competition_status==="ended"?getImageUrl(`images/educoder/competitions/groups1.png`):data.competition_status==="nearly_published"?getImageUrl(`images/educoder/competitions/groups2.png`):data.competition_status==="progressing"?getImageUrl(`images/educoder/competitions/groups3.png`):""} />
 							<Col span={15} className={"Commonimgbox"}>
@@ -334,7 +334,7 @@ class CompetitionCommon extends Component{
 										 <Button type="primary" block className={"Competitionfontsize22"} disabled={true}>
 										   已结束
 									  </Button>:data.enroll_end===true?<Button type="primary" block className={"Competitionfontsize22"} disabled={true}>
-													报名截止
+													{data.competition_status==="nearly_published"?"未发布":"报名截止"}
 												</Button>:
 											data.competition_status==="progressing"?<Button type="primary" block className={"Competitionfontsize22"}>
 												{data.mode===2?<a onClick={()=>this.gotocourse()}>立即报名</a>:<a onClick={()=>this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>立即报名</a>}
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
index df21e4872..909479c2a 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
@@ -19,13 +19,13 @@ class CompetitionContents extends Component{
 	}
 
 	render() {
-    let{mdContentdata}=this.props;
+    let{mdContentdata,data}=this.props;
 		//mdhash滚动
 		this.props.MdifHasAnchorJustScorll();
 		return (
 
 				<div className={"fr"}>
-					{this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?this.props.Competitionedittype===false?this.props.has_url===false?<Button className={"fr"} type="primary" ghost onClick={()=>this.props.Competitionedit()}>
+					{data&&data.permission.editable===true?this.props.Competitionedittype===false?this.props.has_url===false?<Button className={"fr"} type="primary" ghost onClick={()=>this.props.Competitionedit()}>
 						编辑
 					</Button>:"":"":""}
 					<div className={this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?"mt50 mb100 ":"mb100 "}>
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
index 5e2dec3bc..ac09b2e6c 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
@@ -115,8 +115,8 @@ class CompetitionContents extends Component{
 			},
 		];
 
-		const data = [];
-		let {chart_rules,chartdata}=this.props;
+		const datas = [];
+		let {chart_rules,chartdata,data}=this.props;
 		let {personal}=this.state;
 		 chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<3?"":chartdata.teams.map((item,key)=>{
 
@@ -130,7 +130,7 @@ class CompetitionContents extends Component{
 					score:item.score,
 					user_login:item.user_login
 				}
-				data.push(list)
+				datas.push(list)
 			}
 		 })
 
@@ -139,7 +139,7 @@ class CompetitionContents extends Component{
     //console.log(chartdata&&chartdata.teams)
     return (
 			<div>
-				{chart_rules===undefined?"":<Tabs  onChange={(e)=>this.props.Competitioncallback(e)} activeKey={this.props.tabkey} tabBarExtraContent={this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?this.props.Competitionedittype===false?this.props.has_url===false?operations:"":"":""}>
+				{chart_rules===undefined?"":<Tabs  onChange={(e)=>this.props.Competitioncallback(e)} activeKey={this.props.tabkey} tabBarExtraContent={data&&data.permission.editable===true?this.props.Competitionedittype===false?this.props.has_url===false?operations:"":"":""}>
 					{chart_rules.stages.map((item,key)=>{
 						return(
 							<TabPane tab={item.name} key={item.id===null?0:item.id}>
@@ -343,7 +343,7 @@ class CompetitionContents extends Component{
 							`
 						}
 					</style>
-					{chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<4?"":<Table className="Competitiontransparent" columns={columns} dataSource={data} showHeader={false} pagination={false}/>}
+					{chartdata===undefined?"":chartdata.teams.length===0||chartdata.teams.length<4?"":<Table className="Competitiontransparent" columns={columns} dataSource={datas} showHeader={false} pagination={false}/>}
 				</Row>