From 20e85d513f777ad1e3baa9112d88e44187c77762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 25 Jul 2019 11:18:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exercise/Testpapersettinghomepage.js      | 20 +++++++++++++++----
 .../tasks/GraduationTasksappraise.js          |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index e382625b0..a54f5a6e2 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -218,6 +218,20 @@ class Testpapersettinghomepage extends Component{
 	// 		DownloadMessageval:undefined
 	// 	})
 	// }
+	goback=()=>{
+		// let {datalist}=this.state;
+		// let courseId=this.props.match.params.coursesId;
+		// let category_id=this.props.match.params.category_id;
+		//
+		// window.location.href="/courses/"+courseId+"/graduation_tasks/"+datalist.graduation_id;
+		let courseId=this.props.match.params.coursesId;
+		if(courseId===undefined){
+			this.props.history.push("/courses");
+		}else{
+			this.props.history.push(this.props.current_user.first_category_url);
+		}
+
+	}
     render(){
         let {tab,visible,Commonheadofthetestpaper}=this.state;
         const isAdmin =this.props.isAdmin();
@@ -251,7 +265,7 @@ class Testpapersettinghomepage extends Component{
 
                     <div className="educontent mb20" style={{width:"1200px"}}>
                         <p className="clearfix mb20 mt10">
-                            <ActionBtn className=" btn colorgrey fl hovercolorblue "  to={`/courses/${this.props.match.params.coursesId}/students}`}>{this.props.coursedata.name}</ActionBtn>
+                            <ActionBtn className=" btn colorgrey fl hovercolorblue "  onClick={this.goback} >{this.props.coursedata.name}</ActionBtn>
                             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                             <ActionBtn className=" btn colorgrey fl hovercolorblue "   to={`/courses/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`} >试卷</ActionBtn>
                             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@@ -274,9 +288,7 @@ class Testpapersettinghomepage extends Component{
                         <CoursesListType
                             typelist={[`${polls_status[Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status]}`]}
                         />
-                        <a className="color-grey-6 fr font-16  summaryname  mr30"
-
-                           href={`/courses/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`}>返回</a>
+                        <a className="color-grey-6 fr font-16  summaryname  mr30" onClick={this.goback}>返回</a>
                         <p className="color-grey-6 fr font-16"> </p>
 
                     </div>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index 7aa1530af..5eccb2332 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -170,7 +170,7 @@ class GraduationTasksappraise extends Component{
             <div className={"educontent mb20"}>
 
               <p className="clearfix mt10">
-                <Link to={"/courses/"+courseId+"/students"} className="color-grey-9 fl">{datalist&&datalist.course_name}</Link>
+                <a onClick={this.goback} className="color-grey-9 fl">{datalist&&datalist.course_name}</a>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                 <Link to={"/courses/"+courseId+"/graduation_tasks/"+graduation_id} className="color-grey-9 fl">{datalist&&datalist.graduation_name}</Link>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>

From e57317351d8877329dcbdf1fac3b72f8b1e65263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 25 Jul 2019 11:21:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/poll/PollDetailIndex.js    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollDetailIndex.js b/public/react/src/modules/courses/poll/PollDetailIndex.js
index 0099c8615..cbcdd1533 100644
--- a/public/react/src/modules/courses/poll/PollDetailIndex.js
+++ b/public/react/src/modules/courses/poll/PollDetailIndex.js
@@ -108,6 +108,16 @@ class PollDetailIndex extends Component{
       DownloadMessageval:undefined
     })
   }
+	goback=()=>{
+
+		let courseId=this.props.match.params.coursesId;
+		if(courseId===undefined){
+			this.props.history.push("/courses");
+		}else{
+			this.props.history.push(this.props.current_user.first_category_url);
+		}
+
+	}
   render(){
     let {tab,pollDetail,user_permission}=this.state;
     
@@ -123,7 +133,7 @@ class PollDetailIndex extends Component{
         />
         <div className="educontent mt10 mb50">
           <p className="clearfix mb20">
-            <WordsBtn style="grey" className="fl" to={`/courses/${this.props.match.params.coursesId}/students`}>{this.props.coursedata.name}</WordsBtn>
+            <a style="grey" className="fl" onClick={()=>this.goback()}>{this.props.coursedata.name}</a>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
             <WordsBtn style="grey" className="fl" to={`/courses/${this.props.match.params.coursesId}/polls/${user_permission && user_permission.left_banner_id}`}>问卷</WordsBtn>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@@ -134,7 +144,7 @@ class PollDetailIndex extends Component{
             <span className="mt3 fl" style={{height:"25px"}}>
               <CoursesListType typelist={[`${map[pollDetail && pollDetail.polls_status]}`]} typesylename={""} />
             </span>
-            <WordsBtn className="fr font-16 mt2" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn>
+            <WordsBtn className="fr font-16 mt2" style="grey" onClick={()=>this.goback()}>返回</WordsBtn>
           </p>
           <div>
             <div className="clearfix edu-back-white pl30 pr30 bor-bottom-greyE">