From 00e70575cc6f3f74416f55e375cbcc05dbe009c4 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, 23 Oct 2019 18:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Competition_teams/Competitionteams.js     |  3 +-
 .../Competitioncommon/CompetitionCommon.css   |  4 ++
 .../Competitioncommon/CompetitionCommon.js    | 65 +++++++++----------
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/public/react/src/modules/competitions/Competition_teams/Competitionteams.js b/public/react/src/modules/competitions/Competition_teams/Competitionteams.js
index 18b53d86e..34b1d97fc 100644
--- a/public/react/src/modules/competitions/Competition_teams/Competitionteams.js
+++ b/public/react/src/modules/competitions/Competition_teams/Competitionteams.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import { Breadcrumb,Layout,Table, Divider, Tag,Badge} from 'antd';
+
 import axios from 'axios';
 
 import NoneData from "../../courses/shixunHomework/shixunHomework";
@@ -211,8 +212,6 @@ class Competitionteams extends Component{
 		];
 
 
-
-
 		console.log(this.state.shixundata)
 		return (
 
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
index 4fb11b594..4f05d179e 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css
@@ -169,4 +169,8 @@
     border: 1px solid rgba(239,239,239,1);
     padding-top: 20px;
     padding-bottom: 40px !important;
+}
+
+.teamsLayoutleft{
+    background: transparent !important;
 }
\ 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 9096e0596..b209011d3 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -1,17 +1,18 @@
 import React, { Component } from 'react';
 import { Breadcrumb,Layout,Table, Divider, Tag,Badge,Row, Col,Button, Menu, Icon} from 'antd';
 import axios from 'axios';
-
+import {markdownToHTML} from 'educoder';
 import NoneData from "../../courses/shixunHomework/shixunHomework";
 
 import './CompetitionCommon.css';
+
 const { Header, Footer, Sider, Content } = Layout;
 
 class CompetitionCommon extends Component{
 	constructor(props) {
 		super(props)
 		this.state={
-
+				data:undefined
 		}
 	}
 
@@ -23,16 +24,23 @@ class CompetitionCommon extends Component{
 	getbannerdata=()=>{
 		let url=`/competitions/${this.props.match.params.identifier}/common_header.json`;
 		axios.get(url).then((response) => {
-      console.log(response)
+			if(response.status===200){
+				this.setState({
+					data:response.data
+				})
+			}
 		}).catch((error) => {
 			console.log(error)
-		});
+		})
 
 	}
 
 	render() {
+		let {data}=this.state;
+		console.log(data)
 		return (
-			<div className={"educontent clearfix mt20 "}>
+			data===undefined?"":<div className={"educontent clearfix mt20 "}>
+
 					<Breadcrumb separator=">">
 						<Breadcrumb.Item href="">在线竞赛</Breadcrumb.Item>
 						<Breadcrumb.Item href="">全国高校计算机大赛</Breadcrumb.Item>
@@ -43,11 +51,11 @@ class CompetitionCommon extends Component{
 							<Col span={15}>banner</Col>
 							<Col className={"CompetitionCommonbannerfont"} span={9}>
 
-									<Col className={"competitionbannerdiv"}>全国计算机系列大赛系列大赛系列大赛</Col>
+									<Col className={"competitionbannerdiv"}>{data&&data.name}</Col>
 
 									<Col className={"competitionbannerdiv mt10"}>
 											<Col className={"Competitioncolor9b"}>竞赛时间：</Col>
-											<Col>2019-08-07 24: 00～2019-09-10 24: 00</Col>
+											<Col>{data&&data.start_time}～{data&&data.end_time}</Col>
 									</Col>
 
 									<Col className={"competitionbannerdiv mt20"}>
@@ -65,13 +73,13 @@ class CompetitionCommon extends Component{
 
 											<Row gutter={16}>
 												<Col className="gutter-row" span={6}>
-													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">¥123</div>
+													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">¥{data&&data.bonus}</div>
 												</Col>
 												<Col className="gutter-row" span={6}>
-													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">4124</div>
+													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data&&data.visits_count}</div>
 												</Col>
 												<Col className="gutter-row" span={6}>
-													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">51234</div>
+													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data&&data.member_count}</div>
 												</Col>
 											</Row>
 									</Col>
@@ -81,42 +89,33 @@ class CompetitionCommon extends Component{
 											立即报名
 									  </Button>
 									</Col>
-									<Col className={"mt10 Competitionfontsize16"}>报名截止时间：2019-08-07 08:10</Col>
+									<Col className={"mt10 Competitionfontsize16"}>{data&&data.enroll_end_time===null?"":"报名截止时间："+data&&data.enroll_end_time}</Col>
 							</Col>
 						</Row>
 					</div>
 
-
-
 						<Layout className={'teamsLayout mt40'}>
-
 							<Sider>
-
 								<Menu mode="inline" className="CompetitionMenu" defaultSelectedKeys={['1']}>
 
-									<Menu.Item key="1">
-										<span>赛制介绍</span>
-									</Menu.Item>
-
-									<Menu.Item key="2">
-										<span>参赛手册</span>
-									</Menu.Item>
-
-									<Menu.Item key="3">
-										<span>排行榜</span>
-									</Menu.Item>
-
-									<Menu.Item key="4">
-										<span>通知公告</span>
-									</Menu.Item>
+									{data&&data.competition_modules.map((item,key)=>{
+										return(
+											<Menu.Item key={item.position}>
+												<span>{item.name}</span>
+											</Menu.Item>
+										)
+									})}
 
 							  </Menu>
-
 							</Sider>
 
-							<Layout>
-								<Content>Content</Content>
+							<Layout className={"teamsLayoutleft"}>
+
+								<Content className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML("").replace(/▁/g, "▁▁▁")}}>
+								</Content>
+								
 							</Layout>
+
 						</Layout>
 
 			</div>