From c4756cde6711df13cbfafec211673886426bbaad Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 4 Sep 2019 14:03:52 +0800
Subject: [PATCH] https://www.trustie.net/issues/23867

---
 public/react/src/modules/comment/Comments.js       |  4 ++--
 .../src/modules/courses/boards/TopicDetail.js      |  8 +++++---
 public/react/src/modules/courses/boards/index.js   |  5 +++--
 .../modules/courses/coursesDetail/CoursesBanner.js | 14 +++++++-------
 .../src/modules/courses/members/studentsList.js    |  3 ++-
 public/react/src/modules/tpm/TPMIndexHOC.js        |  6 ++++++
 6 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/comment/Comments.js b/public/react/src/modules/comment/Comments.js
index ae246197c..836b520cc 100644
--- a/public/react/src/modules/comment/Comments.js
+++ b/public/react/src/modules/comment/Comments.js
@@ -383,12 +383,12 @@ class Comments extends Component {
 
 	                                {/* <span className="ml5 mr5 color-grey-8">|</span>*/}
 	                                
-										<a href={`javascript:void(0)`} className="color-grey-8"
+										{(this.props.showReply == undefined || this.props.showReply == true) && <a href={`javascript:void(0)`} className="color-grey-8"
 												onClick={() => this.initReply(item) } >
 											<Tooltip title={ "回复" }>
 												<i className="iconfont icon-huifu1 mr5"></i>
 											</Tooltip>
-										</a>
+										</a>}
 	                              	
 
 										{/* <span className="ml5 mr5 color-grey-8">|</span>*/}
diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index 542157bfb..8ecc85565 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -527,6 +527,7 @@ class TopicDetail extends Component {
       // TODO 图片上传地址
       const courseId=this.props.match.params.coursesId;
       const boardId = this.props.match.params.boardId
+      const isCourseEnd = this.props.isCourseEnd()
 	    return (
         <div className="edu-back-white edu-class-container edu-position course-message topicDetail" id="yslforum_index_list"> {/* fl with100 */}
           <style>{`
@@ -678,8 +679,8 @@ class TopicDetail extends Component {
                         }
                     </div>
                     
-                      <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么" 
-                          height={160} showError={true} buttonText={'发表'} className={comments && comments.length && 'borderBottom'}></MemoDetailMDEditor>
+                      {!isCourseEnd && <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么" 
+                          height={160} showError={true} buttonText={'发表'} className={comments && comments.length && 'borderBottom'}></MemoDetailMDEditor>}
 
                   {/*  onClick={ this.createNewComment } 
                         enableReplyTo={true}
@@ -704,6 +705,7 @@ class TopicDetail extends Component {
                         loadMoreChildComments={this.loadMoreChildComments}
                         initReply={this.initReply}
                         showRewardButton={false}
+                        showReply={!isCourseEnd}
 
                         onlySuperAdminCouldHide={true}
                       ></Comments>
@@ -720,7 +722,7 @@ class TopicDetail extends Component {
                       { total_count > REPLY_PAGE_COUNT &&  
                         <Pagination showQuickJumper onChange={this.onPaginationChange} current={pageCount} total={total_count} pageSize={10}/>
                       }
-                      <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
+                      {!isCourseEnd && <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>}
                     </div> 
                     
     	        </div>
diff --git a/public/react/src/modules/courses/boards/index.js b/public/react/src/modules/courses/boards/index.js
index 572c8dd63..a4a3ed632 100644
--- a/public/react/src/modules/courses/boards/index.js
+++ b/public/react/src/modules/courses/boards/index.js
@@ -327,6 +327,7 @@ class Boards extends Component{
   }
   render(){
     const isAdmin = this.props.isAdmin()
+    const isCourseEnd = this.props.isCourseEnd()
     const isAdminOrStudent = this.props.isAdminOrStudent()
     let { boardName, searchValue, boards, messages, checkBoxValues,
        checkAllValue, pagination, sort_type, parent_id } = this.state;
@@ -350,9 +351,9 @@ class Boards extends Component{
           searchPlaceholder={ '请输入帖子名称进行搜索' }
           firstRowRight={
             <React.Fragment>
-              { isAdmin && !parent_id && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加目录</WordsBtn> }
+              { !isCourseEnd && isAdmin && !parent_id && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加目录</WordsBtn> }
               { isAdmin && !!parent_id && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>目录重命名</WordsBtn> }
-              { isAdminOrStudent && <WordsBtn style="blue" className="" onClick={()=>this.onToBoardsNew()}>我要发贴</WordsBtn> }
+              { !isCourseEnd && isAdminOrStudent && <WordsBtn style="blue" className="" onClick={()=>this.onToBoardsNew()}>我要发贴</WordsBtn> }
             </React.Fragment>
           }
           secondRowLeft={
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index 3cbd04fd1..d8927b8d7 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -426,7 +426,7 @@ class CoursesBanner extends Component {
 
     render() {
         let { Addcoursestypes, coursedata,excellent, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,is_guide,AccountProfiletype} = this.state;
-
+        const isCourseEnd = this.props.isCourseEnd()
         return (
           <div>
             {
@@ -714,24 +714,24 @@ class CoursesBanner extends Component {
                                                    position: "relative"
                                                  }}
                       >
-                        <li className={"mt7 mr10im"}>
+                        {!isCourseEnd && <li className={"mt7 mr10im"}>
                           <a onClick={()=>this.addTeacher(true)}>
                             <span className="color-white fl font-16 bannerurli width100f">添加老师</span>
                           </a>
-                        </li>
+                        </li>}
 
-                        <li className={"mt7 mr10im"}>
+                        {!isCourseEnd && <li className={"mt7 mr10im"}>
                           <a onClick={()=>this.addTeacher(false)}>
                             <span className="color-white fl font-16 bannerurli width100f">添加助教</span>
                           </a>
 
-                        </li>
+                        </li>}
 
-                        <li className={"mt7 mr10im"}>
+                        {!isCourseEnd && <li className={"mt7 mr10im"}>
                           <a onClick={()=>this.addStudent()}>
                             <span className={"color-white fl font-16 bannerurli width100f"}>添加学生</span>
                           </a>
-                        </li>
+                        </li>}
                         {excellent===false?
                         <li className={"mt7 mr10im ml10"} style={{overflow:"hidden"}}>
                           <a>
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 08f4971ce..46e6ad77d 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -497,6 +497,7 @@ class studentsList extends Component{
   render(){
     const isAdmin = this.props.isAdmin()
     const isSuperAdmin = this.props.isSuperAdmin()
+    const isCourseEnd = this.props.isCourseEnd()
     let {
       page,
       
@@ -591,7 +592,7 @@ class studentsList extends Component{
                   ></CreateGroupByImportModal>
                   <WordsBtn style="blue" className="mr30" onClick={()=> this.refs['createGroupByImportModal'].setVisible(true)}>导入创建分班</WordsBtn>
                 </React.Fragment> }
-              { isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
+              { !isCourseEnd && isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>分班重命名</WordsBtn> }
               <style>{`
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 52eda5901..657a1ef6b 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -244,6 +244,10 @@ export function TPMIndexHOC(WrappedComponent) {
         return this.state.coursedata&&this.state.coursedata.course_identity >= 6
       }
 
+      isCourseEnd = () => {
+        return this.state.current_user ? this.state.current_user.course_is_end : false
+      }
+
       // setTrialapplication = ()=>{
       //     this.setState({
       //       isRenders:true
@@ -411,6 +415,8 @@ export function TPMIndexHOC(WrappedComponent) {
             isStudent: this.isStudent,
             isAdminOrStudent: this.isAdminOrStudent,
             isNotMember: this.isNotMember,
+            isCourseEnd: this.isCourseEnd,
+            
             isUserid:this.state.coursedata&&this.state.coursedata.userid,
             fetchUser: this.fetchUser,