Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

public/react/src/modules/courses/gradinforms/Bullsubdirectory.js

@@ -145,23 +145,26 @@ class Bullsubdirectory extends Component{
 										<div  className="edu-back-white ">
 											{
 												whethertoeditysl === false?
-													<div  className="bor-bottom-greyE" >
-														<div className="fudonyingxiangysl"><div className="ysltitbt fl"><span >{myname}</span></div>
-															{
-																this.props.isAdmin() === true ?
-																	(this.props.yslbool===false?
-																			<i className="iconfont icon-bianji1 newbianji1 fr pr25  yslbianji" onClick={()=>this.bianji(true)}></i>
-																	:
-									              	""
-																)
+													<div>
+														<div  className="" >
+															<div className="fudonyingxiangysl"><div className="ysltitbt fl"><span >{myname}</span></div>
+																{
+																	this.props.isAdmin() === true ?
+																		(this.props.yslbool===false?
+																				<i className="iconfont icon-bianji1 newbianji1 fr pr25  yslbianji" onClick={()=>this.bianji(true)}></i>
+																				:
+																				""
+																		)
 
-																	:""
-															}
+																		:""
+																}
+															</div>
+															<div id="MakedownHTML"className={"markdown-body fonttext yslmtopcg yslminHeigth markdownysltext"}   dangerouslySetInnerHTML={{__html: markdownToHTML(mydescription).replace(/▁/g, "▁▁▁")}}/>
 														</div>
-														<div id="MakedownHTML"className={"markdown-body fonttext yslmtopcg yslminHeigth markdownysltext"}   dangerouslySetInnerHTML={{__html: markdownToHTML(mydescription).replace(/▁/g, "▁▁▁")}}/>
+														<div className="bor-bottom-greyE mr25 ml25"></div>
 													</div>
 													:
-													<div  className="edu-back-white  bor-bottom-greyE">
+													<div  className="edu-back-white ">
 														<Form layout='vertical' onSubmit={this.handleSubmit} >
 															<style>
 																{
@@ -186,7 +189,7 @@ class Bullsubdirectory extends Component{
 																style={{"borderBottom":'none'}}
 																className="chooseDestwo "
 															>
-																{getFieldDecorator('eduintits', {
+																{getFieldDecorator('eduintits',{ initialValue: this.state.eduintits }, {
 																	rules: [{
 																		required: true, message: '请在此输入标题,最多60个字符',
 																	}, {
@@ -268,7 +271,7 @@ class Bullsubdirectory extends Component{
 																		style={{"borderBottom":'none'}}
 																		className="chooseDes "
 																	>
-																		{getFieldDecorator('description', {
+																		{getFieldDecorator('description', { initialValue: this.state.description },{
 																			rules: [{
 																				required: true, message: '请在此输入内容,最多5000个字符',
 																			}, {
@@ -295,6 +298,7 @@ class Bullsubdirectory extends Component{
 																</div>
 															</Form.Item>
 														</Form>
+														<div className="bor-bottom-greyE mr25 ml25"></div>
 													</div>
 											}
 										</div>

public/react/src/modules/courses/gradinforms/Eduinforms.js

@@ -179,13 +179,13 @@ class Eduinforms extends Component{
 			<React.Fragment  >
 				<div id={"zhudiv"}>
 					<div className="edu-back-white">
-						<p className="clearfix padding30 bor-bottom-greyE">
+						<p className="clearfix padding30 bor-bottom-greyE yslmaxheigth80" >
 							<p style={{height: '20px'}}>
 								<span className="font-18 fl color-dark-21">公告栏</span>
 								{
 									this.props.isAdmin()===true?
 										(this.state.yslbool===false?
-											<li className="btn colorblue font-16 fr bluebkbk" style={{cursor: "default"}}
+											<li className="btn colorblue font-16 fr bluebkbk pointer"
 													onClick={() => this.bianji(true)}>
 												发布公告
 											</li>
@@ -204,7 +204,7 @@ class Eduinforms extends Component{
 									{
 										whethertoedit === false?""
 											:
-											<div  className="edu-back-white  bor-bottom-greyE">
+											<div  className="edu-back-white ">
 
 
 												<Form layout='vertical' onSubmit={this.handleSubmit} >
@@ -340,6 +340,7 @@ class Eduinforms extends Component{
 														</div>
 													</Form.Item>
 												</Form>
+												<div className="bor-bottom-greyE mr25 ml25"></div>
 											</div>
 									}
 											<div>

public/react/src/modules/courses/gradinforms/myysleduinforms.css

@@ -18,6 +18,7 @@
     height: 30px;
     text-align: center;
     line-height: 30px;
+    border-radius: 2px;
 }
 .ysleduinwh{
 
@@ -72,3 +73,9 @@
 .yslbianji{
     padding-top: 31px;
 }
+.yslmaxheigth80{
+    max-height: 80px;
+}
+.ysldashed{
+    border:1px dashed #EEE;
+}