Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/modules/courses/boards/TopicDetail.js

@@ -413,6 +413,7 @@ class TopicDetail extends Component {
           // md
           editor.setValue && editor.setValue('')
           
+          
           const user = this._getUser();
           this.setState({
             comments: addNewComment(comments, _id, content, user)
@@ -423,6 +424,7 @@ class TopicDetail extends Component {
             memo: newMemo2
           })
           this.refs.editor.showEditor();
+          this.refs.editor.close();
           
           
         }
@@ -661,11 +663,11 @@ class TopicDetail extends Component {
                   {/*  onClick={ this.createNewComment } 
                         enableReplyTo={true}
                   */}
-                    <div className="padding40 bor-bottom-greyE memoReplies commentsDelegateParent comments_hideSecondReplyUserHeader"
+                    <div className="padding20  memoReplies commentsDelegateParent comments_hideSecondReplyUserHeader"
-                        style={{ display: (comments && !!comments.length) ? 'block' : 'none' }}>
+                        style={{ display: (comments && !!comments.length) ? 'block' : 'none', paddingBottom: '0px' }}>
                       <div className="replies_count">
-                        <span className="labal">全部回复</span>
+                        <span className="labal font-16">全部回复</span>
-                        <span className="count">{memo.total_replies_count}</span>
+                        <span className="count font-16">({memo.total_replies_count})</span>
                       </div>
 
                       <Comments comments={comments} user={current_user}

public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js

@@ -276,8 +276,8 @@ class CommonWorkAppraiseReply extends Component{
               onReply={this.onReply} placeholder={"请在此输入对本作品的评语，最大限制2000个字符"}
             ></GraduationTasksappraiseMainEditor> }
           </div>
-
+          {/* ${!!comment_scores.length ? 'bor-bottom-greyE' : ''} */}
-          <div className={`padding20 ${!!comment_scores.length ? 'bor-bottom-greyE' : ''} memoReplies commentsDelegateParent course-message`}
+          <div className={`padding20  memoReplies commentsDelegateParent course-message`}
             style={{ paddingTop: '0px', paddingBottom: '0px' }}
           >
             {/* 

public/react/src/modules/courses/common/courseMessage.css

@@ -13,7 +13,8 @@
 /* 评论 */
 /* 改宽度 */
 .course-message .panel-comment_item .comment_orig_content {
-  width: 1024px;
+  /* width: 1024px; */
+  width: 1046px;
 }
 /* 子回复按钮 */
 .course-message .reply_to_message a.commentsbtn.task-btn-blue {
@@ -34,7 +35,7 @@
 }
 .course-message .comment_item_cont:last-child {
   /* 作品评阅需要 */
-  /* border-bottom: none; */
+  border-bottom: none;
 }
 
 .course-message .memoMore {
@@ -45,3 +46,7 @@
     right: 35px;
     top: 2px;
   }
+
+.panel-comment_item .comment_content {
+  margin-top: 4px;
+}

public/react/src/modules/forums/MemoDetailMDEditor.js

@@ -128,7 +128,8 @@ class MemoDetailMDEditor extends Component {
 					<style>{`
 						.mockInputWrapper {
 							display: flex;
-							padding: 30px 20px 30px 20px;
+							padding: 20px 30px 20px 30px;
+							border-bottom: 1px solid #EEEEEE;
 						}
 						.mockInputWrapper input {
 							flex:1;
@@ -146,6 +147,9 @@ class MemoDetailMDEditor extends Component {
 							width: 60px;
 							margin-right: 0px !important;
 						}
+						.commentInput {
+							border-bottom: 1px solid #EEEEEE;
+						}
 						.commentInput .editormd{
 							width:100%!important;
 						}
@@ -178,10 +182,12 @@ class MemoDetailMDEditor extends Component {
 						<div className="editor__resize" href="javascript:void(0);">调整高度</div>
 						{ errorMsg && <span className="fl" style={{color: 'red', marginTop: '6px',
     							marginLeft: '4px'}}>{errorMsg}</span> }
-						<a id={`new_message_submit_btn_${memo.id}`} href="javascript:void(0)" 
+						<div style={{height: "16px"}}>
-								onClick={this.onCommit} className="commentsbtn task-btn task-btn-blue fr">
+							<a id={`new_message_submit_btn_${memo.id}`} href="javascript:void(0)" 
-								{this.props.buttonText || '发送'}
+									onClick={this.onCommit} className="commentsbtn task-btn task-btn-blue fr">
-						</a>
+									{this.props.buttonText || '发送'}
+							</a>
+						</div>
 					</div>
 				</React.Fragment>
 			);

public/react/src/modules/forums/Post.css

@@ -18,7 +18,7 @@
 }
 	#forum_list .return_btn {
 		line-height: 38px;
-	    margin-right: 15px;
+	    /* margin-right: 15px; */
 	    font-size: 14px;
 	    cursor: pointer;
 	}