实训课程选择框

public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js

@@ -297,8 +297,13 @@ class DetailCardsEditAndAdd extends Component{
 
 
   contentViewScrolladd=(e)=>{
+  	const {ChooseShixunList}=this.state;
     //滑动到底判断
     if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
+
+       if(ChooseShixunList.shixun_list.length===0){
+       	return
+			 }else{
 				 // console.log("到达底部");
 				 this.setState({
 					 hometypepvisible:true
@@ -334,6 +339,7 @@ class DetailCardsEditAndAdd extends Component{
 					 console.log(error);
 				 })
 
+			 }
 
     }
 

public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js

@@ -338,8 +338,12 @@ class DetailCardsEditAndEdit extends Component{
 
   contentViewScrolledit=(e)=>{
     //滑动到底判断
-
+		const {ChooseShixunList}=this.state;
     if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
+
+			if(ChooseShixunList.shixun_list.length===0){
+				return
+			}else{
 				this.setState({
 					hometypepvisible:true
 				})
@@ -383,6 +387,11 @@ class DetailCardsEditAndEdit extends Component{
 					console.log(error);
 				})
 
+
+			}
+
+
+
     }
 
   }

public/react/src/modules/tpm/challengesnew/TPMevaluation.js

@@ -475,7 +475,10 @@ export default class TPMevaluation extends Component {
 	}
 	handpathoptionvalue=(value)=>{
 		this.setState({
-			pathoptionvalue:value
+			pathoptionvalue:value,
+			shixunfileexpectpicturepath:undefined,
+			shixunfilestandardpicturepath:undefined,
+			shixunfilepicturepath:undefined
 		})
 	}
 	showrepositoryurltip=(type)=>{
@@ -640,19 +643,20 @@ export default class TPMevaluation extends Component {
 		let id = this.props.match.params.shixunId;
 		let{checkpointId}=this.state;
 		let url = "/shixuns/"+id+"/challenges/"+checkpointId+".json";
-		axios.put(url,{
+		let newchallenge={
-				tab:1,
-				challenge:{
 			path:shixunfilepath,
 			exec_path:shixunfilepathplay,
-					show_type:pathoptionvalue,
+			show_type:pathoptionvalue===-1?undefined:pathoptionvalue,
-					original_picture_path:shixunfileexpectpicturepath,
+			original_picture_path:pathoptionvalue===-1?undefined:shixunfileexpectpicturepath,
-					expect_picture_path:shixunfilestandardpicturepath,
+			expect_picture_path:pathoptionvalue===-1?undefined:shixunfilestandardpicturepath,
-					picture_path:shixunfilepicturepath,
+			picture_path:pathoptionvalue===-1?undefined:shixunfilepicturepath,
 			test_set_score:newscorevalue,
 			test_set_average:markvalue,
 			web_route:web_route===null?undefined:web_route
-				},
+		}
+		axios.put(url,{
+				tab:1,
+				challenge:newchallenge,
 				test_set:evaluationlist
 			}
 		).then((response) => {