diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index a9143176c..75da4f2fe 100644
--- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
@@ -96,8 +96,8 @@ class ExerciseReviewAndAnswer extends Component{
     //window.addEventListener('scroll', this.handleScroll);	
   }
 
-  remainTime=()=>{
-    let { time } = this.state;
+  remainTime=(time)=>{
+    // let { time } = this.state;
     let h=moment(parseInt(time)*1000).hour()-8;
     let m=moment(parseInt(time)*1000).minutes();
     let s=moment(parseInt(time)*1000).seconds();
@@ -133,15 +133,21 @@ class ExerciseReviewAndAnswer extends Component{
 			commit_method:2
 		}).then((result)=>{
 			if(result){
-				this.setState({
-					Modalstype:true,
-					Modalstopval:'答题结束了，系统已自动提交试卷',
-					modalsBottomval:"不能再修改答题",
-					ModalCancel:undefined,
-					ModalSave:this.sureCommit,
-					Loadtype:true
-				})
-				this.props.showNotification(`${result.data.message}`);
+				if(result.data.status===0){
+					this.setState({
+						Modalstype:true,
+						Modalstopval:'答题结束了，系统已自动提交试卷',
+						modalsBottomval:"不能再修改答题",
+						ModalCancel:undefined,
+						ModalSave:this.sureCommit,
+						Loadtype:true
+					})
+					this.props.showNotification(`${result.data.message}`);
+				}
+
+				if(result.data.status===-2){
+					this.remainTime(parseInt(result.data.message))
+				}
 			}
 		}).catch((error)=>{
 			console.log(error);
@@ -238,7 +244,7 @@ class ExerciseReviewAndAnswer extends Component{
             isSpin:false
           })
           if(result.data.exercise.left_time != null){
-            this.remainTime();
+            this.remainTime(result.data.exercise.left_time);
           }
         }
       }).catch((error)=>{