From 40aee552f7dc7c61ed67a3b2c567314c2faa2a57 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 25 Jun 2019 17:08:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/comment/Comments.js              | 2 +-
 .../src/modules/courses/common/comments/CommonReply.js    | 8 +++++---
 .../src/modules/courses/exercise/new/SingleEditor.js      | 2 +-
 public/react/src/modules/forums/MemoDetailMDEditor.js     | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/comment/Comments.js b/public/react/src/modules/comment/Comments.js
index 42fea091c..20f48cd92 100644
--- a/public/react/src/modules/comment/Comments.js
+++ b/public/react/src/modules/comment/Comments.js
@@ -484,7 +484,7 @@ class Comments extends Component {
 		const goldRewardInputErrorObj = goldRewardInputError ? {'error': 'error'} : {}
 
 		return (
-			<div className="fit -scroll">
+			<div className="fit -scroll" style={{ 'overflow-x': 'hidden'}}>
 				
 						
 						{ usingAntdModal ? <Modals
diff --git a/public/react/src/modules/courses/common/comments/CommonReply.js b/public/react/src/modules/courses/common/comments/CommonReply.js
index ff63c4b70..739e62c97 100644
--- a/public/react/src/modules/courses/common/comments/CommonReply.js
+++ b/public/react/src/modules/courses/common/comments/CommonReply.js
@@ -241,16 +241,18 @@ class CommonReply extends Component{
           .course-message .commentInput {
             padding-bottom: 56px !important;
           }
-          .course-message  .commentInput.mockInputWrapper {
-            padding-bottom: 30px !important;
+          .course-message .commentInput.mockInputWrapper {
+            padding-bottom: 20px !important;
           } 
           .course-message .memoReplies {
-             border-top: 1px solid #EDEDED;
+            /* border-top: 1px solid #EDEDED;  */
+            padding-bottom: 30px;
           }
         `}</style>
         <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么" 
             height={160} showError={true}
             replyComment={this.replyComment}
+            commentsLength={comments ? comments.length : 0}
         ></MemoDetailMDEditor>
         {/* bor-bottom-greyE */}
         <div className="padding40  memoReplies commentsDelegateParent"
diff --git a/public/react/src/modules/courses/exercise/new/SingleEditor.js b/public/react/src/modules/courses/exercise/new/SingleEditor.js
index a09cc866c..02efe2443 100644
--- a/public/react/src/modules/courses/exercise/new/SingleEditor.js
+++ b/public/react/src/modules/courses/exercise/new/SingleEditor.js
@@ -98,7 +98,7 @@ class SingleEditor extends Component{
       }
     }
     if(!answerArray || answerArray.length == 0) {
-      this.props.showNotification('请先点击本选择题的正确选项'); return;
+      this.props.showNotification('请先点击选择本选择题的正确选项'); return;
     }
     if(!question_title) {
       this.props.showNotification('请先输入题目题干'); return;
diff --git a/public/react/src/modules/forums/MemoDetailMDEditor.js b/public/react/src/modules/forums/MemoDetailMDEditor.js
index e1811ed8a..6fd650cea 100644
--- a/public/react/src/modules/forums/MemoDetailMDEditor.js
+++ b/public/react/src/modules/forums/MemoDetailMDEditor.js
@@ -148,13 +148,13 @@ class MemoDetailMDEditor extends Component {
 							margin-right: 0px !important;
 						}
 						.commentInput {
-							border-bottom: 1px solid #EEEEEE;
 						}
 						.commentInput .editormd{
 							width:100%!important;
 						}
 					`}</style>
-					<div style={{ display: isInited ? 'none' : ''}} className="mockInputWrapper commentInput" >
+					<div style={{ display: isInited ? 'none' : '', borderBottom: `${this.props.commentsLength == 0 ? 'none' : '1px solid #EEEEEE'}`}} 
+								className="mockInputWrapper commentInput" >
 						<input onClick={this.onMockInputClick} placeholder={placeholder || '我要回复'}></input>
 						<a href="javascript:void(0)" 
 								onClick={this.onMockInputClick}	className="commentsbtn task-btn task-btn-blue">