From b48bd3aabb9b5b259b1ea01c427ab0343432a650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 24 Oct 2019 18:17:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Competitioncommon/CompetitionCommon.js          |  7 ++++---
 .../Competitioncommon/CompetitionContents.js        | 13 ++++++++-----
 .../Competitioncommon/CompetitionContentsChart.js   |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
index a60e91adb..845182958 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -17,7 +17,8 @@ class CompetitionCommon extends Component{
 		this.state={
 				data:undefined,
 			  bannerdata:undefined,
-			  module_type:undefined
+			  module_type:undefined,
+			  mdContentdata:undefined
 		}
 	}
 
@@ -69,7 +70,7 @@ class CompetitionCommon extends Component{
 			axios.get(url).then((response) => {
 				if(response.status===200){
 					this.setState({
-						mdContent:response.data
+						mdContentdata:response.data
 					})
 				}
 			}).catch((error) => {
@@ -80,7 +81,7 @@ class CompetitionCommon extends Component{
 	}
 
 	render() {
-		let {data,bannerdata,module_type,module_id,mdContent}=this.state;
+		let {data,bannerdata,module_type,module_id,mdContentdata}=this.state;
    console.log(module_type)
 		return (
 			data===undefined?"":<div className={"educontent clearfix mt20 "}>
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
index 767e6b956..f9d966be0 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
@@ -21,15 +21,18 @@ class CompetitionContents extends Component{
 
 
 	render() {
- let{mdContent}=this.props;
+     let{mdContentdata}=this.props;
+    //
 		return (
 
 				<div className={"fr"}>
-					<Button className={"fr"} type="primary" ghost>
+					{this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?<Button className={"fr"} type="primary" ghost>
 						编辑
-					</Button>
-					<Content className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML("").replace(/▁/g, "▁▁▁")}}>
-					</Content>
+					</Button>:""}
+					<div className={this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?"mt50":""}>
+						<Content className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML(mdContentdata&&mdContentdata.md_contents[0]).replace(/▁/g, "▁▁▁")}}>
+						</Content>
+					</div>
 				</div>
 
 		)
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
index 730fae89b..765559e52 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
@@ -86,7 +86,7 @@ class CompetitionContents extends Component{
 
 		return (
 			<div>
-				<Tabs tabBarExtraContent={operations}>
+				<Tabs tabBarExtraContent={this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?operations:""}>
 					<TabPane tab="总排行榜" key="1">
 						<Content className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML("Content of tab 1").replace(/▁/g, "▁▁▁")}}>
 						</Content>