From 627f1fb838412262e492f049837761cf031604ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 24 Oct 2019 11:41:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Competitimain/CompetitionsIndex.js        | 30 ++++----------
 .../Competitimain/Competitionsindex.css       | 11 ++++-
 .../Competitioncommon/CompetitionCommon.css   | 14 ++++---
 .../Competitioncommon/CompetitionCommon.js    | 40 +++++++++++++++----
 4 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
index ba736e03e..61e6419b7 100644
--- a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
+++ b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
@@ -78,9 +78,9 @@ class CompetitionsIndex extends Component{
 	}
 	render() {
 		let {datas,page,count}=this.state;
-
-
-
+		admin: true
+		business: false
+		console.log(this.props.current_user&&this.props.current_user.business)
 		return (
 			<div>
 				<div className="clearfix">
@@ -100,7 +100,7 @@ class CompetitionsIndex extends Component{
 									`
 								}
 							</style>
-							<div className="courses-head pr" style={{"background":`url(${getImageUrl(`images/educoder/competitions/courses.png`)})`}}>
+							<div className="courses-head pr" style={{"background":`url(${getImageUrl(`images/educoder/competitions/courses.jpg`)})`}}>
 								<div className="edu-txt-center pathNavLine">
 									<div className="inline path-nav"></div>
 								</div>
@@ -126,22 +126,7 @@ class CompetitionsIndex extends Component{
 							</div>
 
 							<div className={"educontent clearfix mtf10 CompetitionsIndex "}>
-								<style>
-									{
-										`
-										.CompetitionsList{
-										     position: relative;
-										     max-height: 210px;
-										 }
-										 .competitonimg{
-										 		position: absolute;
-												right: -5px;
-												width: 80px;
-												top: 20px;
-										 }
-										`
-									}
-								</style>
+
 								{datas===undefined?"":datas.length===0?"":<List
 									itemLayout="vertical"
 									size="large"
@@ -195,9 +180,10 @@ class CompetitionsIndex extends Component{
 												}
 											>
 												<List.Item.Meta
-													title={<a className={item.competition_status==="ended"?"endedfont":""}>
+													title={<a className={item.competition_status==="ended"?"endedfont":item.competition_status==="nearly_published"?
+														this.props.current_user&&this.props.current_user.business===true?"":this.props.current_user&&this.props.current_user.admin===true?"":"endedfont":""}>
 														<span className={"competitionstitles"}
-																					onClick={()=>this.setcompetitonurl(item.competition_status==="ended"?null:item.competition_status==="nearly_published"?`/newcompetitions/${item.identifier}/common_header`:item.competition_status==="progressing"?`/newcompetitions/${item.identifier}/common_header`:null)}
+																					onClick={()=>this.setcompetitonurl(item.competition_status==="ended"?null: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)}
 													>{item.name}</span><span>{item.sub_title===null?"":<Tag className="competitionsrelative" color="#87d068">{
 														item.sub_title
 													}</Tag>}</span>
diff --git a/public/react/src/modules/competitions/Competitimain/Competitionsindex.css b/public/react/src/modules/competitions/Competitimain/Competitionsindex.css
index 61fc568aa..c711859c9 100644
--- a/public/react/src/modules/competitions/Competitimain/Competitionsindex.css
+++ b/public/react/src/modules/competitions/Competitimain/Competitionsindex.css
@@ -14,7 +14,16 @@
     background: #fff;
     width: 1200px;
 }
-
+.CompetitionsList{
+    position: relative;
+    max-height: 210px;
+}
+.competitonimg{
+    position: absolute;
+    right: -5px;
+    width: 80px;
+    top: 20px;
+}
 
 .ant-menu-horizontal {
     border-bottom:none !important;
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
index e7bd0b0e7..5f6a96173 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
@@ -63,6 +63,7 @@
     padding: 20px;
     background:rgba(255,255,255,1);
     box-shadow:3px 2px 12px 2px rgba(0,0,0,0.05);
+    position: relative;
 }
 
 .CompetitionCommonbannerfont{
@@ -92,11 +93,7 @@
     color:#05101A;
 }
 
-.CompetitionCommonbannerfont .competitionbannerdiv:nth-child(4),.CompetitionCommonbannerfont .competitionbannerdiv:nth-child(4) button{
-    height: 50px;
-    background: rgba(76,172,255,1);
-    border-radius: 4px;
-}
+
 
 .Competitioncolor9b{
     color: #9B9B9B;
@@ -209,4 +206,11 @@
 
 .Competitiontransparent table{
     background: transparent;
+}
+
+.Commonimg{
+    position: absolute;
+    right: -5px;
+    width:93px;
+    top: 20px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
index bc9387c08..f3177cece 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -66,6 +66,8 @@ debugger
 
 					<div className={"mt10"}>
 						<Row className={"CompetitionCommonbanner"}>
+							<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}>
 								<img src={getImageUrl(bannerdata&&bannerdata.image_url)}/>
 							</Col>
@@ -96,18 +98,42 @@ debugger
 													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">¥{data&&data.bonus}</div>
 												</Col>
 												<Col className="gutter-row" span={6}>
-													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data&&data.visits_count}</div>
+													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data.competition_status==="nearly_published"?"--":data&&data.visits_count}</div>
 												</Col>
 												<Col className="gutter-row" span={6}>
-													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data&&data.member_count}</div>
+													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data.competition_status==="nearly_published"?"--":data&&data.member_count}</div>
 												</Col>
 											</Row>
 									</Col>
 
+								{data.competition_status==="ended"?<style>
+									{
+										`
+										.Competitionfontsize22{
+													height: 50px;
+													border-radius: 4px;
+											}
+										`
+									}
+								</style>:<style>
+									{
+										`
+										.Competitionfontsize22{
+													height: 50px;
+													background: rgba(76,172,255,1);
+													border-radius: 4px;
+											}
+										`
+									}
+								</style>}
 									<Col className={"competitionbannerdiv mt20"}>
+										{data.competition_status==="ended"?
+										 <Button type="primary" block className={"Competitionfontsize22"} disabled={true}>
+										   已结束
+									  </Button>:
 										<Button type="primary" block className={"Competitionfontsize22"}>
-											<Link to={`/newcompetitions/${this.props.match.params.identifier}/enroll`}>立即报名</Link>
-									  </Button>
+								    	<Link to={`/newcompetitions/${this.props.match.params.identifier}/enroll`}>立即报名</Link>
+										</Button>}
 									</Col>
 									<Col className={"mt10 Competitionfontsize16"}>{data&&data.enroll_end_time===null?"":`报名截止时间：${data&&data.enroll_end_time}`}</Col>
 							</Col>
@@ -121,10 +147,10 @@ debugger
 									{data&&data.competition_modules.map((item,key)=>{
 										return(
 											<Menu.Item key={item.position}>
-												{item.module_url===null?<span onClick={()=>this.getrightdata(item.id,item.module_type)}>{item.name}</span>:<a
+												{item.has_url===false?<span onClick={()=>this.getrightdata(item.id,item.module_type)}>{item.name}</span>:<a
 													// target="_blank"
-													// href={item.module_url}
-													onClick={()=>this.getrightdata(item.id,item.module_type)}
+												   href={item.module_url}
+													// onClick={()=>this.getrightdata(item.id,item.module_type)}
 												>{item.name}</a>}
 											</Menu.Item>
 										)