From bf3a8fb7af37a1f62e2526ed4ae38d64d1905245 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 6 Mar 2020 22:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=84=E8=A7=88=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/modals/Bottomsubmit.js  | 10 +++++++---
 public/react/src/modules/question/Paperreview.js |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/modals/Bottomsubmit.js b/public/react/src/modules/modals/Bottomsubmit.js
index 187910cb9..22fb7c8fd 100644
--- a/public/react/src/modules/modals/Bottomsubmit.js
+++ b/public/react/src/modules/modals/Bottomsubmit.js
@@ -12,9 +12,13 @@ class Bottomsubmit extends Component {
 
   cannelfun = () => {
     // window.location.href=
-		if(this.props.Cohetepaperbool===true){
-			this.props.setCohetepaperbool(false);
-		}else {
+		try {
+			if(this.props.Cohetepaperbool===true){
+				this.props.setCohetepaperbool(false);
+			}else {
+				this.props.history.replace(this.props.url);
+			}
+		}catch (e) {
 			this.props.history.replace(this.props.url);
 		}
 
diff --git a/public/react/src/modules/question/Paperreview.js b/public/react/src/modules/question/Paperreview.js
index f40ad9519..fadba71ca 100644
--- a/public/react/src/modules/question/Paperreview.js
+++ b/public/react/src/modules/question/Paperreview.js
@@ -463,6 +463,7 @@ class Paperreview extends Component {
 
 				<Bottomsubmit {...this.props} {...this.state} bottomvalue={Cohetepaperbool===false?"保存组卷":"完成"}
 											setCohetepaperbool={(bool)=>this.setCohetepaperbool(bool)}
+											Cohetepaperbool={this.state.Cohetepaperbool}
 											onSubmits={() => this.preservation()} url={	artificialtype==="artificial"?'/problemset':'/paperlibrary'}></Bottomsubmit>
 			</div>
 		)