Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/elearning/YslDetailCards.js

@@ -499,12 +499,13 @@ class YslDetailCards extends Component{
 																				this.props.current_user&&this.props.current_user.admin===false&&line.shixun_status==="暂未公开"?
 																					<li className="fr status_li"><span className="fr color204">暂未公开</span></li>
 																					:
-																					<li className={showparagraph===false?"none":"fr status_li"}>
+																					<li className={showparagraph===false?"fr status_li":"fr status_li"}>
 																						{
 																							showparagraphkey===key&&showparagraphindex===index?<div>
 																								<Link to={'/shixuns/'+line.identifier+'/challenges'} className="mr30 color-blue_4C shixun_detail pointer fl" target="_blank">查看详情</Link>
 																								{line.shixun_status==="暂未公开"?"":<a  onClick={()=>this.startgameid(line.identifier)} className="btn_auto user_bluebg_btn fl" id="shixun_operation" >开始学习</a>}
-																							</div>:""
+																							</div>:
+																								<span className="fr color204">实验任务 <span className={"color000"}>{line.challenges_count}</span></span>
 																						}
 
 																					</li>

public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js

@@ -132,11 +132,7 @@ class ExerciseReviewAndAnswer extends Component{
     //   }
     // },1000)
   }
-  autosetimes=(time)=>{
-    this.setState({
-      time:parseInt(time)
-    })
-  }
+
   //自动交卷
   autoCommitExercise=()=>{
 		let eId=this.props.match.params.Id;
@@ -152,14 +148,18 @@ class ExerciseReviewAndAnswer extends Component{
 						modalsBottomval:"不能再修改答题",
 						ModalCancel:undefined,
 						ModalSave:this.sureCommit,
-						Loadtype:true
+						Loadtype:true,
+            time:null,
 					})
 					this.props.showNotification(`${result.data.message}`);
 				}
 
 				if(result.data.status===-2){
 					 // this.remainTime(parseInt(result.data.message))
-            this.autosetimes(result.data.message)
+          this.setState({
+            time:parseInt(result.data.mess)
+          })
+          this.deadline(parseInt(result.data.message))
 				}
 			}
 		}).catch((error)=>{
@@ -258,6 +258,7 @@ class ExerciseReviewAndAnswer extends Component{
           })
           if(result.data.exercise.left_time != null){
             // this.remainTime(result.data.exercise.left_time);
+            this.deadline(result.data.exercise.left_time)
           }
         }
       }).catch((error)=>{
@@ -586,9 +587,14 @@ class ExerciseReviewAndAnswer extends Component{
 
   deadline=(time)=>{
     if(time===null){
-
+      this.setState({
+        Datetime:0
+      })
     }else{
-      return Date.now() + time * 1000 ;
+      this.setState({
+        Datetime:Date.now() + time * 1000
+      })
+      // return Date.now() + time * 1000 ;
     }
 
   }
@@ -695,7 +701,7 @@ class ExerciseReviewAndAnswer extends Component{
               :
               time && time != 0 ?
                 <div className="fr">
-                  <Countdown value={this.deadline(this.state.time)} onFinish={this.autoCommitExercise} />
+                  <Countdown value={this.state.Datetime} onFinish={this.autoCommitExercise} />
                 </div>
                 :""
             }

public/react/src/modules/paths/ShixunPaths.css

@@ -267,4 +267,8 @@
 
 .color181818{
     color: #181818;
+}
+
+.colorD5D8D6{
+  color:#D5D8D6;
 }