Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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

@@ -301,8 +301,8 @@ module.exports = {
         },
         warnings: false,
         compress: {
-          drop_debugger: false,
-          drop_console: false
+          drop_debugger: true,
+          drop_console: true
         }
       }
     }),

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

@@ -59,10 +59,10 @@ class ShixunHomeworkPage extends Component {
 		// console.log(teacherdata);
 
 		this.setState({
-			jobsettingsdatapage: jobsettingsdata,
-			teacherdatapage: teacherdata,
-			code_review: teacherdata.code_review,
-			view_report: teacherdata.view_report,
+			jobsettingsdatapage: jobsettingsdata.data.message!==undefined?undefined:jobsettingsdata,
+			teacherdatapage:  teacherdata.message!==undefined?undefined:teacherdata,
+			code_review: teacherdata.code_review!==undefined?teacherdata.code_review :false,
+			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"}}>

public/react/src/modules/tpm/TPMBanner.js

@@ -597,7 +597,7 @@ class TPMBanner extends Component {
                 </ul>
 
                 <div className="pr fl" id="commentsStar">
-
+									  <div className={"color-grey-c"} style={{color: "#Fff",textAlign: "center"}}>学员评分</div>
                     <div className="rateYo">
                         <Rating value={star_info[0]} disabled allowHalf/>
                     </div>

public/react/src/modules/tpm/shixuns/css/TPMBanner.css

@@ -85,7 +85,7 @@ a:active{text-decoration:none;}
     height: 39px !important;
 }
 #commentsStar{
-    margin-top:33px;
+    margin-top: -7px;
 }
 .startbtnModal .ant-modal-content{
     background: transparent;