diff --git a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
index c037da990..da44920cf 100644
--- a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
+++ b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
@@ -131,15 +131,15 @@ class CompetitionsIndex extends Component{
 												{item.competition_status==="nearly_published"?
 													this.props.current_user&&this.props.current_user.admin===true?"":this.props.current_user&&this.props.current_user.business===true?"":<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>:""}
 												{/*<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>*/}
-											{item.description===null||item.description===undefined||item.description===""?<style>
-												{
-													`
-												 //  .CompetitionsIndex .ant-list-vertical .ant-list-item-action{
-													// 		margin-top:50px;
-												 // }
-												`
-												}
-											</style>:""}
+											{/*{item.description===null||item.description===undefined||item.description===""?<style>*/}
+												{/*{*/}
+													{/*`*/}
+												 {/*//  .CompetitionsIndex .ant-list-vertical .ant-list-item-action{*/}
+													{/*// 		margin-top:50px;*/}
+												 {/*// }*/}
+												{/*`*/}
+												{/*}*/}
+											{/*</style>:""}*/}
 											<img className={"competitonimg"}
 													 src={item.competition_status==="ended"?getImageUrl(`images/educoder/competitions/groups1.png`):item.competition_status==="nearly_published"?getImageUrl(`images/educoder/competitions/groups2.png`):item.competition_status==="progressing"?getImageUrl(`images/educoder/competitions/groups3.png`):""} />
 											<List.Item
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
index 8c7b44ad2..bc1af025a 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js
@@ -293,7 +293,7 @@ class CompetitionCommon extends Component{
 										{data.competition_status==="ended"?
 										 <Button type="primary" block className={"Competitionfontsize22"} disabled={true}>
 										   已结束
-									  </Button>:
+									  </Button>:data.enroll_end_time
 											data.competition_status==="progressing"?<Button type="primary" block className={"Competitionfontsize22"}>
 												{data.mode===2?<a onClick={()=>this.gotocourse()}>立即报名</a>:<a onClick={()=>this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>立即报名</a>}
 										</Button>:""}
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
index c3991e425..a49384f71 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js
@@ -30,7 +30,7 @@ class CompetitionContents extends Component{
 						编辑
 					</Button>:"":""}
 					<div className={this.props.current_user&&this.props.current_user.admin===true||this.props.current_user&&this.props.current_user.business===true?"mt50 mb100 ":"mb100 "}>
-						<Content className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML(mdContentdata===undefined?"":mdContentdata.md_content===undefined?"":mdContentdata.md_content).replace(/▁/g, "▁▁▁")}}>
+						<Content className={"markdown-body"} dangerouslySetInnerHTML={{__html: markdownToHTML(mdContentdata===undefined?"":mdContentdata.md_content===undefined||mdContentdata.md_content===null?"":mdContentdata.md_content).replace(/▁/g, "▁▁▁")}}>
 						</Content>
 
 						<div className={"mt30"}>
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
index 61b050fa2..daa6a815e 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js
@@ -98,11 +98,11 @@ class CompetitionContents extends Component{
 								{chart_rules.rule_contents.map((items,keys)=>{
 									if(item.id===items.competition_stage_id){
 										return(
-											<Content key={keys} className={"markdown-body "} dangerouslySetInnerHTML={{__html: markdownToHTML(items.content).replace(/▁/g, "▁▁▁")}}></Content>
+											<Content key={keys} className={"markdown-body "} dangerouslySetInnerHTML={{__html: markdownToHTML(items.content===undefined||items.content===null?"":items.content).replace(/▁/g, "▁▁▁")}}></Content>
 										)
 									}else if(item.id===null&&items.competition_stage_id===0){
 										return(
-											<Content key={keys} className={"markdown-body "} dangerouslySetInnerHTML={{__html: markdownToHTML(items.content).replace(/▁/g, "▁▁▁")}}></Content>
+											<Content key={keys} className={"markdown-body "} dangerouslySetInnerHTML={{__html: markdownToHTML(items.content===undefined||items.content===null?"":items.content).replace(/▁/g, "▁▁▁")}}></Content>
 										)
 									}
 								})}
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsMd.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsMd.js
index 6cd1ccafb..c4bb5bfcd 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsMd.js
+++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionContentsMd.js
@@ -78,8 +78,11 @@ class CompetitionContentsMd extends Component{
 	}
 
 	handleContentUploadChange = (info) => {
-		let contentFileList = info.fileList;
-		this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList) });
+		if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+			let contentFileList = info.fileList;
+			this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList) });
+		}
+
 	}
 
 	onAttachmentRemove = (file, stateName) => {
@@ -127,6 +130,10 @@ class CompetitionContentsMd extends Component{
 	handleSubmit = () => {
 		let {contentFileList}=this.state;
 		const mdContnet = this.contentMdRef.current.getValue().trim();
+		if(mdContnet.length>10000){
+			this.props.showNotification("内容超过10000个字");
+			return
+		}
 		let attachment_ids=undefined
 		if(contentFileList!=undefined){
 			attachment_ids= contentFileList.map(item => {
@@ -184,7 +191,7 @@ class CompetitionContentsMd extends Component{
 				console.log('beforeUpload', file.name);
 				const isLt150M = file.size / 1024 / 1024 < 150;
 				if (!isLt150M) {
-					message.error('文件大小必须小于150MB!');
+					this.props.showNotification("文件大小必须小于150MB");
 				}
 				return isLt150M;
 			},
@@ -203,7 +210,7 @@ class CompetitionContentsMd extends Component{
 					})}
 
 				</Tabs>:""}
-				<TPMMDEditor ref={this.contentMdRef} placeholder="请输入任务内容说明，最大限制5000个字符" mdID={'courseContentMD'} refreshTimeout={1500}
+				<TPMMDEditor ref={this.contentMdRef} placeholder="请输入任务内容说明，最大限制10000个字符" mdID={'courseContentMD'} refreshTimeout={1500}
 										 className="courseMessageMD" initValue={this.state.description}></TPMMDEditor>
 				{this.props.module_type==="chart"?"":<Upload {...uploadProps} className="upload_1 newWorkUpload">
 					<Button className="uploadBtn">