diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js
index 718b6de42..303d683ce 100644
--- a/public/react/src/modules/courses/boards/BoardsNew.js
+++ b/public/react/src/modules/courses/boards/BoardsNew.js
@@ -78,6 +78,7 @@ class BoardsNew extends Component{
             if (data) {
               this.editTopic = data;
               this.props.form.setFieldsValue({
+                sticky: !!data.sticky,
                 content: data.content,
                 subject: data.subject,
                 select_board_id: data.board_id // TODO 没返回给前端
@@ -309,6 +310,14 @@ class BoardsNew extends Component{
                   label="标题"
                   className="topicTitle "
                 >
+                  {getFieldDecorator('sticky', {
+                    valuePropName: 'checked',
+                  })(
+                    <Checkbox style={{ right: '0px',
+                      top: '-50px',
+                      position: 'absolute'
+                    }}>置顶</Checkbox>
+                  )}
                   {getFieldDecorator('subject', {
                     rules: [{
                       required: true, message: '请输入标题',
@@ -347,7 +356,7 @@ class BoardsNew extends Component{
                   )}
                 </Form.Item>
 
-                { isAdmin && <Form.Item
+                {/* { isAdmin && <Form.Item
                   label=""
                   style={{ display: 'inline-block', marginLeft: "14px" }}
                 >
@@ -355,7 +364,7 @@ class BoardsNew extends Component{
                   })(
                     <Checkbox>置顶</Checkbox>
                   )}
-                </Form.Item> }
+                </Form.Item> } */}
               </div>
 
               <style>{`
@@ -380,6 +389,7 @@ class BoardsNew extends Component{
 
               <Form.Item
                 label="内容"
+                className="mdInForm"
               >
               {getFieldDecorator('content', {
                 rules: [{
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
index ca5668961..177d3929d 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
@@ -1028,9 +1028,11 @@ class CommonWorkSetting extends Component{
             <React.Fragment>
             <div className={"h20 mb30 ml30"}>
               <span>发布时间：</span>
-              <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":publish_time_type===true?"发布时间已过，则不能修改":""}>
+              {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":publish_time_type===true?"发布时间已过，则不能修改":""}>
+              </Tooltip> */}
+
+              <ConditionToolTip condition={moment(this.state.init_publish_time) < moment()} title={"时间已过，不能再修改"}>
               <span>
-                  <ConditionToolTip condition={moment(this.state.init_publish_time) < moment()} title={"时间已过，不能再修改"}>
 
                     <DatePicker
                       dropdownClassName="hideDisable"
@@ -1051,17 +1053,18 @@ class CommonWorkSetting extends Component{
                       //     return publish_time && publish_time < moment().add(-1, 'days'); } 
                       //   }
                     />
-                  </ConditionToolTip>
               </span>
-              </Tooltip>
+              </ConditionToolTip>
+
               <span className={"font-14 color-grey-9 ml10"}>（学生收到作业的时间）</span>
             </div>
 
             <div className={"h20 mb30 ml30"}>
               <span>截止时间：</span>
-              <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":end_time_type===true?"截止时间已过，则不能修改":""}>
-              <span>
+              {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":end_time_type===true?"截止时间已过，则不能修改":""}>
+              </Tooltip> */}
               <ConditionToolTip condition={moment(this.state.init_end_time) < moment()} title={"时间已过，不能再修改"}>
+              <span>
                 <DatePicker
                   dropdownClassName="hideDisable"
                   showTime={{ format: 'HH:mm' }}
@@ -1087,9 +1090,9 @@ class CommonWorkSetting extends Component{
                   //     return end_time.valueOf() < moment(publish_time, dateFormat).valueOf(); } 
                   //   }
                 />
-              </ConditionToolTip>
               </span>
-              </Tooltip>
+              </ConditionToolTip>
+
               <span className={"font-14 color-grey-9 ml10"}>（学生“按时”提交作品的时间截点）</span>
             </div>
 
@@ -1133,6 +1136,7 @@ class CommonWorkSetting extends Component{
                 <div className={" mb10 ml30"}>
                   <span>结束时间：</span>
                   <ConditionToolTip condition={moment(init_late_time) < moment()} title={"时间已过，不能再修改"}>
+                  <span>
                   <DatePicker
                       showToday={false}
                     dropdownClassName="hideDisable"
@@ -1153,6 +1157,7 @@ class CommonWorkSetting extends Component{
                     //     return late_time < moment(end_time, dateFormat).add(-1, 'days'); } 
                     //   }
                   />
+                  </span>
                   </ConditionToolTip>
                   <span className={"font-14 color-grey-9 ml10"}>（学生“延时”提交作品的时间截点）</span>
                   {<div className={"latetimetype color-red "}>{latetimetype}</div>}
@@ -1178,8 +1183,8 @@ class CommonWorkSetting extends Component{
             <div className={"h20 mb30 ml60"}>
               <span>开启时间：</span>
               <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
+              <ConditionToolTip condition={moment(init_evaluation_start) < moment()} title={"时间已过，不能再修改"}>
               <span>
-                  <ConditionToolTip condition={moment(init_evaluation_start) < moment()} title={"时间已过，不能再修改"}>
                   <DatePicker
                     dropdownClassName="hideDisable"
                     showTime={{ format: 'HH:mm' }}
@@ -1200,16 +1205,17 @@ class CommonWorkSetting extends Component{
                     //     return evaluation_start.valueOf() < moment(end_time, dateFormat).valueOf(); } 
                     //   }
                   />
-                  </ConditionToolTip>
               </span>
+              </ConditionToolTip>
+
               </Tooltip>
               <span className={"font-14 color-grey-9 ml10"}>（匿评开始时间之前提交作品的学生，参与匿评）</span>
             </div>
             <div className={"h20 mb30 ml60"}>
               <span>结束时间：</span>
               <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
+              <ConditionToolTip condition={moment(init_evaluation_end) < moment()} title={"时间已过，不能再修改"}>
               <span>
-                  <ConditionToolTip condition={moment(init_evaluation_end) < moment()} title={"时间已过，不能再修改"}>
                   <DatePicker
                     dropdownClassName="hideDisable"
                     showTime={{ format: 'HH:mm' }}
@@ -1230,15 +1236,18 @@ class CommonWorkSetting extends Component{
                     //     return evaluation_end.valueOf() < moment(evaluation_start, dateFormat).valueOf(); } 
                     //   }
                   />
-                  </ConditionToolTip>
-                  <span className={"font-14 color-grey-9 ml10"}>（学生匿评TA人作品的时间截点）</span>
 
               </span>
+              </ConditionToolTip>
+              <span className={"font-14 color-grey-9 ml10"}>（学生匿评TA人作品的时间截点）</span>
+
+
               </Tooltip>
               <span className={"font-14 color-grey-9 ml10"}></span>
 
             </div>
-            {<div className={" anonymous_comment_time_tip color-red ml60"} style={{marginTop: '-6px'}}>{anonymous_comment_time_tip}</div>}
+            {/* marginTop: '-6px' */}
+            {<div className={" anonymous_comment_time_tip color-red ml60"} style={{}}>{anonymous_comment_time_tip}</div>}
 
             {/* 匿评数量 */}
             <div className={"h20 mb30 ml60"}>
@@ -1301,9 +1310,10 @@ class CommonWorkSetting extends Component{
             {/* 启用匿评申述 结束时间： */}                  
             <div className={"h20 mb30 ml60"}>
               <span>结束时间：</span>
-              <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
+              {/* <Tooltip placement="bottom" title={this.props.isSuperAdmin()?"":starttimetype===true?"发布时间已过，则不能修改":""}>
+              </Tooltip> */}
+              <ConditionToolTip condition={moment(init_appeal_time) < moment()} title={"时间已过，不能再修改"}>
               <span>
-                  <ConditionToolTip condition={moment(init_appeal_time) < moment()} title={"时间已过，不能再修改"}>
                   <DatePicker
                     dropdownClassName="hideDisable"
                     showTime={{ format: 'HH:mm' }}
@@ -1318,9 +1328,9 @@ class CommonWorkSetting extends Component{
                     onChange={this.appeal_time_change}
                     disabled={ (anonymous_appeal && !noAuth ? false : true) || moment(init_appeal_time) < moment()}
                   />
-                  </ConditionToolTip>
               </span>
-              </Tooltip>
+              </ConditionToolTip>
+              
 
               <span className={"font-14 color-grey-9 ml10"}>（学生提交匿评申诉的时间截点）</span>
             </div>
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 3579f983b..173ff6b60 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -945,11 +945,19 @@ a.white-btn.use_scope-btn:hover{
     font-size: 12px !important;
 }
 /* md编辑器在form中时，使用这个样式，可以把错误信息绝对定位 */
+/* 去掉form下边距 */
+.mdInForm {
+    margin-bottom: 0px;
+}
 .mdInForm .has-error .ant-form-explain {
     position: absolute;
     margin-top: -2px;
     margin-left: -7px;
 }
+.courseForm .ant-select-selection--single, .courseForm .ant-select-selection__rendered{
+    height: 40px;
+    line-height: 40px;
+}
 
 
 /*新建课堂*/
diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
index e86923cbc..e70454056 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
@@ -302,8 +302,8 @@ export default class TPMMDEditor extends Component {
                     </div>
                 </div>
                 <div className={"fr rememberTip"}>
-                    {noStorage == true ? '' : <p id={`e_tip_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"></p>}
-                    {noStorage == true ? '' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"></p>}
+                    {noStorage == true ? '　' : <p id={`e_tip_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"></p>}
+                    {noStorage == true ? '　' : <p id={`e_tips_mdEditor_${mdID}`} className="edu-txt-right color-grey-cd font-12"></p>}
                 </div>
             </React.Fragment>
         )