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

public/react/config/webpack.config.prod.js

@@ -300,6 +300,7 @@ module.exports = {
           comments: false
         },
         warnings: false,
+        drop_console: true,
         compress: {
           drop_debugger: false,
           drop_console: false

public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js

@@ -59,10 +59,10 @@ class ShixunHomeworkPage extends Component {
 		// console.log(teacherdata);
 
 		this.setState({
-			jobsettingsdatapage: jobsettingsdata,
+			jobsettingsdatapage: jobsettingsdata.data.message!==undefined?undefined:jobsettingsdata,
-			teacherdatapage: teacherdata,
+			teacherdatapage:  teacherdata.message!==undefined?undefined:teacherdata,
-			code_review: teacherdata.code_review,
+			code_review: teacherdata.code_review!==undefined?teacherdata.code_review :false,
-			view_report: teacherdata.view_report,
+			view_report: teacherdata.view_report!==undefined? teacherdata.view_report:false,
 		})
 	}
 
@@ -116,7 +116,9 @@ class ShixunHomeworkPage extends Component {
 		let {tab, teacherdatapage,  jobsettingsdatapage} = this.state;
 
 		const isAdmin = this.props.isAdmin();
-
+		// console.log(119)
+		// console.log(jobsettingsdatapage);
+		// console.log(teacherdatapage);
 		return (
 			<div className="newMain clearfix ">
 				<div className={"educontent mb20"} style={{width: "1200px"}}>