From 531a46d8daab3125e165e038d829f6475ab235b3 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, 1 Aug 2019 14:56:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/busyWork/CommonWorkPost.js   | 2 +-
 .../courses/graduation/tasks/GraduationTasksSubmitedit.js     | 2 +-
 .../courses/graduation/tasks/GraduationTasksSubmitnew.js      | 2 +-
 public/react/src/modules/paths/PathDetail/PathDetailIndex.js  | 4 ++--
 .../PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js  | 3 ++-
 .../PackageIndexNewandEdit/PackageIndexNewandEditIndex.js     | 3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
index 78ad2f180..60383988b 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
@@ -470,7 +470,7 @@ class CommonWorkPost extends Component{
   }
 
   gocannel=()=>{
-    window.history.go(-1)
+		this.props.history.goBack()
   }
 
 render(){
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index 201507d1e..f93d13eac 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -362,7 +362,7 @@ class GraduationTasksSubmitedit extends Component{
   }
 
   gocannel=()=>{
-    window.history.go(-1)
+		this.props.history.goBack()
   }
 
   handleSubmit=(e) => {
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index 5ff29949a..f5060ad4c 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -362,7 +362,7 @@ class GraduationTasksSubmitnew extends Component{
     }
   }
   gocannel=()=>{
-    window.history.go(-1)
+		this.props.history.goBack()
   }
 
   //公用数据
diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
index 1ba1a3c13..d490ac112 100644
--- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
+++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
@@ -112,14 +112,14 @@ class PathDetailIndex extends Component{
     this.setState({
       Modalstype:false,
     })
-    window.history.go(-1)
+		this.props.history.goBack()
   }
 
   cardsModalsave=()=>{
     this.setState({
       Modalstype:false,
     })
-     window.history.go(-1)
+		this.props.history.goBack()
   }
   // 加载markdown
   updatamakedown=(id)=>{
diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
index 35ca952a7..a1e016853 100644
--- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
+++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js
@@ -230,7 +230,8 @@ class PackageIndexNEITaskDetails extends Component {
 	}
 	goback = () => {
 		// window.history.go(-1)
-		window.location.href="/crowdsourcing";
+		// window.location.href="/crowdsourcing";
+	  this.props.history.goBack()
 	}
 
 	render() {
diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNewandEditIndex.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNewandEditIndex.js
index 0481577bf..f7495595b 100644
--- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNewandEditIndex.js
+++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNewandEditIndex.js
@@ -30,7 +30,8 @@ class PackageIndexNewandEditIndex extends Component{
 
 	goback = () => {
 		// window.history.go(-1)
-		window.location.href="/crowdsourcing";
+		// window.location.href="/crowdsourcing";
+		this.props.history.goBack()
 	}
 
 	render() {