From 166d52a8fd0d6f0c04bf86588620c27e100833c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 25 Oct 2019 18:19:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Competitimain/CompetitionsIndex.js | 15 +++++++++------ .../Competitimain/Competitionsindex.css | 8 ++++++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js index 185934659..c037da990 100644 --- a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js +++ b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js @@ -122,7 +122,10 @@ class CompetitionsIndex extends Component{ size="large" dataSource={datas&&datas} renderItem={(item,key) => ( -
+
this.setcompetitonurl(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)}>
{item.competition_status==="nearly_published"? @@ -131,9 +134,9 @@ class CompetitionsIndex extends Component{ {item.description===null||item.description===undefined||item.description===""?:""} @@ -174,14 +177,14 @@ class CompetitionsIndex extends Component{ } > this.setcompetitonurl(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)} >{item.name}{item.sub_title===null?"":{ item.sub_title }} -
} + } /> {item.description} diff --git a/public/react/src/modules/competitions/Competitimain/Competitionsindex.css b/public/react/src/modules/competitions/Competitimain/Competitionsindex.css index 6ac46f1eb..92717a213 100644 --- a/public/react/src/modules/competitions/Competitimain/Competitionsindex.css +++ b/public/react/src/modules/competitions/Competitimain/Competitionsindex.css @@ -16,7 +16,7 @@ } .CompetitionsList{ position: relative; - max-height: 210px; + /*max-height: 210px;*/ } .competitonimg{ position: absolute; @@ -134,7 +134,11 @@ .CompetitionsList:hover .CompetitionsListzhezhao{ display: block; } -.competitionstitlesshou:hover{ +.competitionstitlesshou:hover a{ cursor: pointer; color: #1c91e8 !important; +} + +.competitionstitlesshou{ + cursor: pointer; } \ No newline at end of file