From 5bbc5a0ef576ce83e7109a9a4b25cf4efeef11a7 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 20 Sep 2019 10:56:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?hasData=20=20=E8=A1=A5=E4=BA=A4=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/busyWork/CommonWorkDetailIndex.js | 4 ++--
 .../react/src/modules/courses/busyWork/CommonWorkList.js  | 8 +++++---
 .../courses/busyWork/common/WorkDetailPageHeader.js       | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index b5fb8b047..8985aa07e 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -286,8 +286,8 @@ class CommonWorkDetailIndex extends Component{
                     seeworks={undefined}
                     reviseAttachmentUrl={`/student_works/${work_id || studentWorkId}/revise_attachment.json`}
                   />:""}
-                  <a className={"fr color-blue font-16 mt7"} href={"javascript:void(0)"}
-                    onClick={this.addAccessory}
+                  <a className={"fr color-blue font-16 "} href={"javascript:void(0)"}
+                    onClick={this.addAccessory} style={{ 'marginTop': '-4px' }}
                   >补交附件</a>
                 </React.Fragment>
 
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index a489e7c3d..56ae40e2d 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -640,6 +640,8 @@ class CommonWorkList extends Component{
     } else if (time_status === 4) {
       timeMsg = '申诉剩余时间'
     }
+
+    const hasData = student_works && !!student_works.length && page == 1
     
     // console.log(StudentData)
 		// console.log(student_works)
@@ -691,7 +693,7 @@ class CommonWorkList extends Component{
             }
           `}</style>
           <div style={{ background: '#fff'}} className="workListContent">
-             { isAdmin && <ul className="clearfix" style={{padding: "20px 40px 10px", position: 'relative', paddingLeft: '24px'}}>
+             { isAdmin && hasData && <ul className="clearfix" style={{padding: "20px 40px 10px", position: 'relative', paddingLeft: '24px'}}>
 
               <CheckAllGroup options={options_teacher_comment} label={'你的评阅：'} onChange={this.teacherCommentOptionChange}></CheckAllGroup>
               <CheckAllGroup options={options_status} label={'作品状态：'} onChange={this.statusOptionChange}></CheckAllGroup>
@@ -713,7 +715,7 @@ class CommonWorkList extends Component{
 
             { <div id="graduation_work_list" style={{padding: isStudent ? '10px 24px 10px 24px' : '0px 24px 10px 24px'}}>
               <div className="clearfix">
-                <span className="fl color-grey-6 font-12">
+                {hasData && <span className="fl color-grey-6 font-12">
                   { isAdmin ?
                     (!!all_member_count) && <React.Fragment>
                       <span className="color-orange-tip">{work_count || '0'}</span>个检索结果（{all_member_count} 学生）
@@ -725,7 +727,7 @@ class CommonWorkList extends Component{
                       <span className="color-orange-tip">{left_time.time}</span>
                     </React.Fragment>
                   }
-                </span>
+                </span>}
                 
                 {/* { isAdminOrStudent && student_works && !!student_works.length && <div className="fr color-grey-6 edu-menu-panel">
                   <p style={{color: '#989898'}} className="color-grey-6"><a data-remote="true" className="font-12">
diff --git a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
index c9d99696a..cccaa3ca4 100644
--- a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
+++ b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
@@ -125,8 +125,8 @@ class WorkDetailPageHeader extends Component{
 										seeworks={undefined}
                     reviseAttachmentUrl={`/student_works/${work_id || studentWorkId}/revise_attachment.json`}
                   />:""}
-                  <a className={"fr color-blue font-16 mt7"} href={"javascript:void(0)"}
-                    onClick={this.addAccessory}
+                  <a className={"fr color-blue font-16 "} href={"javascript:void(0)"}
+                    onClick={this.addAccessory} style={{ 'marginTop': '-4px' }}
                   >补交附件</a>
                 </React.Fragment>
 

From 1040eae1ab74de432b8b7218ee4bc3fa7c9b710a Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 20 Sep 2019 11:08:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89orig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/common/comments/CCommentItem.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js
index 2415dd0b0..c6c949d75 100644
--- a/public/react/src/modules/courses/common/comments/CCommentItem.js
+++ b/public/react/src/modules/courses/common/comments/CCommentItem.js
@@ -373,8 +373,8 @@ class CCommentItem extends Component{
 										</Tooltip>
 									: ''} */}
 								</div>
-								{/* style={{ height: '130px'}} */}
-								<p className="orig_reply" >
+								{/* 去掉了orig_reply 影响到i标签 */}
+								<p className="" >
                     				{/* 第二排右侧按钮区域 */}
 									{/* ${this.state.show_reply ? '回复' : '申诉'} */}
 									{(show_reply || show_appeal) && 

From 22820900938f6235f6193f2d3f0a415c5f8de6fd Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 20 Sep 2019 11:17:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?md=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/common/comments/CCommentItem.js  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js
index c6c949d75..5d904a36b 100644
--- a/public/react/src/modules/courses/common/comments/CCommentItem.js
+++ b/public/react/src/modules/courses/common/comments/CCommentItem.js
@@ -238,7 +238,8 @@ class CCommentItem extends Component{
 
 								<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
 									<div className="color-grey-3" id={`reply_content_${item.id}`}>
-										<div  className={"break_word_comments markdown-body"} dangerouslySetInnerHTML={{__html: item.content}}></div>
+										<div  className={"break_word_comments markdown-body"} 
+												dangerouslySetInnerHTML={{__html: this.parseCommentContent(item.content)}}></div>
 										<div className="cl"></div>
 									</div>
 								</div>