Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/coursesPublic/NewShixunModel.js

@@ -142,7 +142,7 @@ class NewShixunModel extends Component{
 			keyword:undefined
 		})
 		let{page,status,keyword,order,diff,limit}=this.state;
-		this.getdatalist(page,value,status,undefined,order,diff,limit)
+		this.getdatalist(1,value,status,undefined,order,diff,limit)
 	}
 
 	updatedlist=(order)=>{

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

@@ -199,7 +199,7 @@ class ExerciseReviewAndAnswer extends Component{
           result.data && result.data.exercise_questions.length>0 && result.data.exercise_questions.map((item,key)=>{
             if( item.question_type == 4 && item.answer_status == 0 ){
               ajustSore.push({
-                 inputSore:undefined,
+                 inputSore:0,
                  desc:undefined,
                  id:item.question_id,
                  position:item.q_position,
@@ -276,7 +276,7 @@ class ExerciseReviewAndAnswer extends Component{
             if(!obj){
               ajustSore.push({
                 id,
-                inputSore:undefined,
+                inputSore:0,
                 desc:undefined,
                 position:position,
                 setTip:""