Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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{

public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js

@@ -234,21 +234,21 @@ 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={data&&data.name.length>15?"competitionbannerdiv":"competitionbannerdiv mt30"}>{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>
 												</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}>
@@ -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}>
 										   已结束