Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

# Conflicts:
#	public/react/src/modules/home/shixunsHome.js

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

@@ -123,7 +123,7 @@ class ModulationModal_exercise extends Component {
 					Inputsvaltests: "请输入0-100的分数",
 				})
 				return;
-			} else if (parseFloat(Inputsval) > 100) {
+			} else if (parseFloat(Inputsval) > this.props.objective_score) {
 				this.setState({
 					Inputsvals: Inputsvals,
 					Inputsvaltypes: true,
@@ -134,6 +134,7 @@ class ModulationModal_exercise extends Component {
 
 
 		} else {
+			debugger
 			//总分模式
 			if (subjective_score > 0) {
 				//主观题
@@ -200,7 +201,7 @@ class ModulationModal_exercise extends Component {
 						Inputsvaltests: "请输入0-100的分数",
 					})
 					return;
-				} else if (parseFloat(Inputsvals) > 100) {
+				} else if (parseFloat(Inputsvals) > this.props.objective_score) {
 					this.setState({
 						Inputsvals: Inputsvals,
 						Inputsvaltypes: true,