From b9d48c420a7ac491cc8512565e7b98455fac28c2 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 25 Jul 2019 15:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91-=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index 5960406e3..ff8e3e3a2 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -145,6 +145,7 @@ class CommonWorkDetailIndex extends Component{
 
         , end_immediately, publish_immediately, work_statuses, accessoryVisible
     } =this.state;
+    const { current_user } = this.props
 
     let courseId=this.props.match.params.coursesId;
     let category_id= category && category.category_id;
@@ -197,15 +198,15 @@ class CommonWorkDetailIndex extends Component{
                   background: #fff;
                 }
               `}</style>
-              <CBreadcrumb items={[
-                { to: `/courses/${courseId}`, name: course_name},
+              {current_user && <CBreadcrumb items={[
+                { to: current_user.first_category_url , name: course_name},
                 { to: `/courses/${courseId}/${moduleEngName}/${category_id}`, name: category_name },
                 window.location.pathname.indexOf('appraise') == -1 ? { } : { to: `/courses/${courseId}/${moduleEngName}/${workId}/list`, name: '作业详情' },
                 // 1.	与上一条联动，当匿评他人作品时，TA人作品的作者真实姓名切换为“匿名”
                 window.location.pathname.indexOf('appraise') == -1 ? { name: '作业详情' } : { name: author_name },
                 // window.location.pathname.indexOf('appraise') == -1 ? { } : { to: `/courses/${courseId}/${moduleEngName}/${workId}/list`, name: '作品列表' },
                 // { name: childModuleName }
-              ]}></CBreadcrumb>
+              ]}></CBreadcrumb>}
 
               <div style={{ width:'100%',height:'52px'}} >
                 <span className=" fl color-black summaryname" title={`${homework_name && homework_name.length > 36 ? homework_name : ''}`}
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
index 4c5578d2c..f2b92b47d 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
@@ -481,6 +481,7 @@ render(){
     course_name, homework_name,
     memberNumMax, memberNumMin
   } =this.state;
+  const { current_user  } = this.props
 
   let courseId=this.props.match.params.coursesId;
   let workId=this.props.match.params.workId;
@@ -522,7 +523,6 @@ render(){
   const moduleName = this.props.getModuleName()
   const moduleCHName = this.props.getModuleName(true)
   const isGroup = this.props.isGroup()
-  const { current_user } = this.props;
   
   return(
 <React.Fragment>
@@ -540,7 +540,7 @@ render(){
       <div className={"educontent mb20"}>
 
       <p className="clearfix mt10">
-        <WordsBtn style="grey" className="fl">  <Link to={`/courses/${courseId}/${moduleName}/${category ? category.category_id : ''}`} className="color-grey-6">{course_name}</Link></WordsBtn>
+        <WordsBtn style="grey" className="fl">  <Link to={ current_user && current_user.first_category_url} className="color-grey-6">{course_name}</Link></WordsBtn>
         <span className="color-grey-9 fl ml3 mr3">&gt;</span>
         <WordsBtn style="grey" className="fl"> <Link to={`/courses/${courseId}/${moduleName}/${workId}`} className="color-grey-6">{moduleCHName}</Link></WordsBtn>
         <span className="color-grey-9 fl ml3 mr3">&gt;</span>
diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js
index 3bb77dfb5..2519f95e2 100644
--- a/public/react/src/modules/courses/busyWork/NewWork.js
+++ b/public/react/src/modules/courses/busyWork/NewWork.js
@@ -313,6 +313,7 @@ class NewWork extends Component{
       init_max_num, init_min_num,
       title_num, course_name, category, has_commit, has_project
     }=this.state
+    const { current_user } = this.props
 
     const courseId = this.state.course_id || this.props.match.params.coursesId ;    
     const isEdit = this.isEdit;
@@ -369,7 +370,7 @@ class NewWork extends Component{
             <span>{pageType==="new"?"新建":"编辑"}</span>
           </p> */}
           <CBreadcrumb items={[
-            { to: `/courses/${courseId}`, name: this.state.course_name},
+            { to: current_user.first_category_url, name: this.state.course_name},
             { to: `/courses/${courseId}/${moduleEngName}/${category && category.category_id ? category.category_id : ''}`
               , name: category && category.category_name },
             { name: `${ this.isEdit ? '编辑' : '新建'}` }
diff --git a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
index 2e79356f9..2595b15b0 100644
--- a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
+++ b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
@@ -59,7 +59,7 @@ class WorkDetailPageHeader extends Component{
     const dateFormat = 'YYYY-MM-DD HH:mm';
 
     let {course_name, homework_name, search, page, loadingstate, homework_status, description, noTab
-        , view_answer, author_name, category, work_id
+        , view_answer, author_name, category, work_id, current_user
     } =this.props;
 
     let courseId=this.props.match.params.coursesId;
@@ -89,7 +89,7 @@ class WorkDetailPageHeader extends Component{
                 }
               `}</style>
               <CBreadcrumb items={[
-                { to: `/courses/${courseId}`, name: course_name},
+                { to: current_user.first_category_url, name: course_name},
                 { to: `/courses/${courseId}/${moduleEngName}/${category_id}`, name: category_name },
                 window.location.pathname.indexOf('appraise') == -1 ? { } : { to: `/courses/${courseId}/${moduleEngName}/${workId}/list`, name: '作业详情' },
                 // 1.	与上一条联动，当匿评他人作品时，TA人作品的作者真实姓名切换为“匿名”