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

public/react/src/modules/courses/new/CoursesNew.js

@@ -870,14 +870,14 @@ class CoursesNew extends Component {
 																	})(
 																		<AutoComplete style={{ width: 280 }}
 																		onSearch={this.handleSearchschool}
-																		// onChange={this.handleChangeschools}
+																		onInput={this.handleSearchschool}
 																		className={"fl construction mr10 yslzxueshis2"}
 																		placeholder="请输入并选择课本堂的所属单位"
+																	  dataSource={optionschool}
 																		>
-																	  {optionschool}
 																		</AutoComplete>
 																	)}
-																	<span  className={"newcoursestitle fl"}>
+																	<span className={"newcoursestitle fl"}>
 																					{/*（输入内容出现匹配的下拉菜单←同账号管理的单位信息填写）*/}
                                         </span>
 																	<div id='isschool'></div>

public/react/src/modules/courses/new/Goldsubject.js

@@ -1026,10 +1026,11 @@ class Goldsubject extends Component {
 											<AutoComplete style={{ width: 280 }}
 																		onSearch={this.handleSearchschool}
 												// onChange={this.handleChangeschools}
+																		onInput={this.handleSearchschool}
 																		className={"fl construction mr10 yslzxueshis2 "}
 																		placeholder="请输入并选择课本堂的所属单位"
+																		dataSource={optionschool}
 											>
-												{optionschool}
 											</AutoComplete>
 										)}
 										<span  className={"newcoursestitle fl"}>

public/react/src/modules/courses/poll/PollNew.js

@@ -1803,27 +1803,49 @@ class PollNew extends Component {
 		var urlly = `/polls/${poll_id}/poll_questions.json`
 		var max_choicess = null;
 		var min_choicess = null;
-		if (max_choices === 0 && min_choices === 0) {
+		try {
+			if (max_choices === 0 && min_choices === 0) {
+				max_choicess = null;
+				min_choicess = null;
+			} else {
+				max_choicess = max_choices;
+				min_choicess = min_choices;
+			}
+		}catch (e) {
 			max_choicess = null;
 			min_choicess = null;
-		} else {
-			max_choicess = max_choices;
-			min_choicess = min_choices;
 		}
-		console.log("createquestionsandanswers");
-		console.log(max_choicess);
-		console.log(min_choicess);
-		console.log(length);
-		axios.post(urlly, {
+		// console.log("createquestionsandanswers");
+		// console.log(max_choicess);
+		// console.log(min_choicess);
+		// console.log(length);
+		var datay={};
+		 datay={
 			question_title: object.question.question_title,
 			question_type: number,
 			is_necessary: object.question.is_necessary,
-			max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess,
-			min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess,
 			question_answers: option,
 			question_other_answer: null,
 			insert_id: insert_id
-		}).then((result) => {
+		}
+		try {
+			if(number===2){
+				datay={
+					question_title: object.question.question_title,
+					question_type: number,
+					is_necessary: object.question.is_necessary,
+					max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess,
+					min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess,
+					question_answers: option,
+					question_other_answer: null,
+					insert_id: insert_id
+				}
+			}
+		}catch (e) {
+
+		}
+
+		axios.post(urlly, datay).then((result) => {
 			// try {
 			if (result !== undefined) {
 				if (result.data.status === 0) {
@@ -1856,27 +1878,50 @@ class PollNew extends Component {
 		var thiss = this;
 		var max_choicess = null;
 		var min_choicess = null;
-		if (max_choices === 0 && min_choices === 0) {
+		try {
+			if (max_choices === 0 && min_choices === 0) {
+				max_choicess = null;
+				min_choicess = null;
+			} else {
+				max_choicess = max_choices;
+				min_choicess = min_choices;
+			}
+		}catch (e) {
 			max_choicess = null;
 			min_choicess = null;
-		} else {
-			max_choicess = max_choices;
-			min_choicess = min_choices;
 		}
-		console.log("createquestionsandanswers");
-		console.log(max_choicess);
-		console.log(min_choicess);
-		console.log(length);
-		axios.put(url, {
+
+		// console.log("createquestionsandanswers");
+		// console.log(max_choicess);
+		// console.log(min_choicess);
+		// console.log(length);
+		var datay={};
+		datay={
 			// debug: true,
 			question_title: object.question.question_title,
 			question_type: number,
 			is_necessary: object.question.is_necessary,
-			max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess,
-			min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess,
 			question_answers: option,
 			question_other_answer: null,
-		}).then((result) => {
+		};
+		try {
+			if(number===2){
+				datay={
+					// debug: true,
+					question_title: object.question.question_title,
+					question_type: number,
+					is_necessary: object.question.is_necessary,
+					max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess,
+					min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess,
+					question_answers: option,
+					question_other_answer: null,
+				};
+			}
+		}catch (e) {
+
+		}
+
+		axios.put(url,datay).then((result) => {
 			try {
 				if (result.data.status === 0) {
 					this.props.showNotification(`编辑题目成功`);

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

@@ -35,6 +35,7 @@ class DetailTop extends Component{
   getdatalist=()=>{
 		let courseslist=[];
     let keys=1;
+    let listtype=false;
 		if(this.props.courses!=undefined&&this.props.courses.length!=0){
 			if(this.props.detailInfoList.has_start===true){
 				this.props.courses.map((item,key)=>{
@@ -47,14 +48,31 @@ class DetailTop extends Component{
 				})
 
 			}else{
-				this.props.courses.map((item,key)=>{
-					if(this.props.pathtopskey===key+1){
-						keys=key+1
-						return(
-							courseslist.push(item)
-						)
-					}
-				})
+						this.props.courses.map((item,key)=>{
+							if(listtype===false){
+								keys=key+1
+								if(item.course_status.status===0) {
+									listtype=true
+									return (
+										courseslist.push(item)
+									)
+								}
+						  }
+						})
+
+
+					this.props.courses.map((item,key)=>{
+						if(listtype===false){
+							keys=key+1
+							if(item.course_status.status===2) {
+								listtype=true
+								return (
+									courseslist.push(item)
+								)
+							}
+						}
+					})
+
 			}
 		}
 		this.setState({