合并

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

@@ -1828,17 +1828,21 @@ class PollNew extends Component {
 			question_other_answer: null,
 			insert_id: insert_id
 		}
-		if(number&&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
+		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) => {
@@ -1900,19 +1904,24 @@ class PollNew extends Component {
 			question_answers: option,
 			question_other_answer: null,
 		};
-		if(number&&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,
-			};
+		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) => {
+
+		axios.put(url,datay).then((result) => {
 			try {
 				if (result.data.status === 0) {
 					this.props.showNotification(`编辑题目成功`);