From 5aeac0a802f31e87b0245bafd8e0beeace08a55f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 6 Nov 2019 15:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AB=9E=E8=B5=9Bbanner?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Competitioncommon/CompetitionCommon.css   |  4 +++
 .../Competitioncommon/CompetitionCommon.js    | 34 +++++++++++++++++--
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
index f55c9a336..7603137e0 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
@@ -399,4 +399,8 @@
 
 .color000{
     color: #000;
+}
+
+.cursorpointer{
+    cursor: pointer;
 }
\ 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 ed129d8bd..86f22bcda 100755
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -224,6 +224,18 @@ class CompetitionCommon extends Component{
 			Competitionedittype:false
 		})
 
+	}
+	newgotocourse=(url)=>{
+		if(this.props.checkIfLogin()===false){
+			this.props.showLoginDialog()
+			return
+		}
+		if(this.props.checkIfProfileCompleted()===false){
+			this.props.showProfileCompleteDialog()
+			return
+		}
+		window.open(url);
+
 	}
 
 	gotocourse=(url)=>{
@@ -267,7 +279,7 @@ class CompetitionCommon extends Component{
 				let urls = `/competitions/${this.props.match.params.identifier}/enroll`;
 				this.Personalregistration(urls)
 			} else {
-				this.props.history.replace(url);
+				window.open(url);
 			}
 
 		}
@@ -379,8 +391,24 @@ class CompetitionCommon extends Component{
 											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(`/competitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status === "nearly_published" ? "--" : data && data.member_count}</div>
+
+										{data.competition_status === "ended" ?
+												<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516 cursorpointer"
+													// 已结束onClick={data.competition_status === "nearly_published" ? "" : () => this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}
+													onClick={	data.mode === 2 ?() => this.newgotocourse(`/courses/${data.course_id}`):() => this.newgotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}
+												>{data && data.member_count}</div>
+										 :data.competition_status === "nearly_published" ?
+												<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516"
+													// onClick={data.competition_status === "nearly_published" ? "" : () => this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}
+												>{"--"}</div> :
+												data.competition_status === "progressing" ?
+												data.mode === 2 ?
+													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516 cursorpointer" onClick={() => this.gotocourse()}>{data && data.member_count}</div> : signupdata && signupdata.personal === true ?
+														<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516 cursorpointer" onClick={() => this.gotocourse("personal")}>{data && data.member_count}</div> : <div
+															className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516 cursorpointer"
+															onClick={() => this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>{data && data.member_count}</div>
+											:""}
+
 									</Col>
 								</Row>
 							</Col>