From 067754a4244cd7fe4135073a18bbc48966594433 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:28:27 +0800
Subject: [PATCH 1/2] =?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

---
 .../competitions/Competitioncommon/CompetitionCommon.css  | 4 +++-
 .../competitions/Competitioncommon/CompetitionCommon.js   | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
index 371816fe4..0bef787ea 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
@@ -69,6 +69,8 @@
 
 .CompetitionCommonbannerfont{
     height:100%;
+    width: 365px;
+    line-height: 34px;
 }
 
 .CompetitionCommonbannerfont .competitionbannerdiv:nth-child(1){
@@ -340,7 +342,7 @@
 
 .image_urlbox{
     width: 705px;
-    height: 400px;
+    /*height: 400px;*/
 }
 
 .CompetitionContents{
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
index 119a84a1a..37904c074 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -234,16 +234,16 @@ class CompetitionCommon extends Component{
 							<Col span={15}>
 								<img className={"image_urlbox"} src={getImageUrl(`images/educoder/competitions/mainbanner.jpg`)}/>
 							</Col>
-							<Col className={"CompetitionCommonbannerfont mt50"} span={9}>
+							<Col className={"CompetitionCommonbannerfont"} span={9}>
 
 									<Col className={"competitionbannerdiv"}>{data&&data.name}</Col>
 
-									<Col className={"competitionbannerdiv mt10"}>
+									<Col className={"competitionbannerdiv"}>
 											<Col className={"Competitioncolor9b"}>竞赛时间：</Col>
 											<Col>{data&&data.start_time}～{data&&data.end_time}</Col>
 									</Col>
 
-									<Col className={"competitionbannerdiv mt20"}>
+									<Col className={"competitionbannerdiv"}>
 											<Row gutter={16}>
 												<Col className="gutter-row" span={6}>
 													<div className="gutter-box CompetitionsIndexdadels Competitioncolor77">奖金</div>
@@ -289,7 +289,7 @@ class CompetitionCommon extends Component{
 										`
 									}
 								</style>}
-									<Col className={"competitionbannerdiv mt20"}>
+									<Col className={"competitionbannerdiv mt10"}>
 										{data.competition_status==="ended"?
 										 <Button type="primary" block className={"Competitionfontsize22"} disabled={true}>
 										   已结束

From c150f712caa7ca76132c857e5abcb585d13df2aa 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:35:27 +0800
Subject: [PATCH 2/2] =?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

---
 .../competitions/Competitioncommon/CompetitionCommon.js     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
index 37904c074..8c7b44ad2 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -236,7 +236,7 @@ class CompetitionCommon extends Component{
 							</Col>
 							<Col className={"CompetitionCommonbannerfont"} span={9}>
 
-									<Col className={"competitionbannerdiv"}>{data&&data.name}</Col>
+									<Col className={data&&data.name.length>15?"competitionbannerdiv":"competitionbannerdiv mt30"}>{data&&data.name}</Col>
 
 									<Col className={"competitionbannerdiv"}>
 											<Col className={"Competitioncolor9b"}>竞赛时间：</Col>
@@ -248,7 +248,7 @@ class CompetitionCommon extends Component{
 												<Col className="gutter-row" span={6}>
 													<div className="gutter-box CompetitionsIndexdadels Competitioncolor77">奖金</div>
 												</Col>
-												<Col className="gutter-row" span={6}>
+												<Col className="gutter-row ml20" span={6}>
 													<div className="gutter-box CompetitionsIndexdadels Competitioncolor77">浏览数</div>
 												</Col>
 												<Col className="gutter-row" span={6}>
@@ -260,7 +260,7 @@ class CompetitionCommon extends Component{
 												<Col className="gutter-row" span={6}>
 													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">¥{data&&data.bonus}</div>
 												</Col>
-												<Col className="gutter-row" span={6}>
+												<Col className="gutter-row ml20" span={6}>
 													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data.competition_status==="nearly_published"?"--":data&&data.visits_count}</div>
 												</Col>
 												<Col className="gutter-row" span={6}>