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_debugger: true,
-          drop_console: false
+          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,
+			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"}}>

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

@@ -1,101 +1,101 @@
-.shixunsdiffcult{
+.shixunsdiffcult{
-  width: 40px;
+  width: 40px;
-  height: 21px;
+  height: 21px;
-  overflow: hidden;
+  overflow: hidden;
-  margin-left: 8px;
+  margin-left: 8px;
- }
+ }
-
+
- .rateYo{
+ .rateYo{
-  text-align: center;
+  text-align: center;
-  cursor: default;
+  cursor: default;
-  width: 90px;
+  width: 90px;
- }
+ }
-
+
- a:link, a:visited {
+ a:link, a:visited {
-  color: #05101a;
+  color: #05101a;
-}
+}
-
+
-a:link{text-decoration:none;}
+a:link{text-decoration:none;}
-
+
-a:visited{text-decoration:none;}
+a:visited{text-decoration:none;}
-
+
-a:hover{text-decoration:none;}
+a:hover{text-decoration:none;}
-
+
-a:active{text-decoration:none;}
+a:active{text-decoration:none;}
-
+
-
+
-.next-rating-overlay .next-icon{
+.next-rating-overlay .next-icon{
-  color: #FFA800!important;
+  color: #FFA800!important;
-}
+}
-
+
-.displayblock{
+.displayblock{
-  display:block;
+  display:block;
-  text-align: center;
+  text-align: center;
-  margin-bottom: 20px;
+  margin-bottom: 20px;
-}
+}
-
+
-.totalScore{
+.totalScore{
-    justify-content: center;
+    justify-content: center;
-    align-items: center;
+    align-items: center;
-    display: -webkit-flex;
+    display: -webkit-flex;
-    height: 100%;
+    height: 100%;
-}
+}
-
+
-.next-progress-line{
+.next-progress-line{
-  width: 210px !important;
+  width: 210px !important;
-  margin-left: 10px;
+  margin-left: 10px;
-  margin-top: 4px;
+  margin-top: 4px;
-}
+}
-
+
-.next-progress-line-overlay-normal{
+.next-progress-line-overlay-normal{
-  background-color: #FFA800  !important;
+  background-color: #FFA800  !important;
-}
+}
-.next-rating-base-disabled{
+.next-rating-base-disabled{
-    cursor: default!important;
+    cursor: default!important;
-}
+}
-/*#challenge_begin {*/
+/*#challenge_begin {*/
-/*!*height: 40px !important;*!*/
+/*!*height: 40px !important;*!*/
-/*line-height: 30px;*/
+/*line-height: 30px;*/
-/*}*/
+/*}*/
-.ant-modal-title{
+.ant-modal-title{
-    font-size: 16px;
+    font-size: 16px;
-    font-weight: bold !important;
+    font-weight: bold !important;
-    color: #333;
+    color: #333;
-}
+}
-
+
-.ml60{
+.ml60{
-    margin-left:20px;
+    margin-left:20px;
-}
+}
-
+
-.marginauto{
+.marginauto{
-    margin:0 auto;
+    margin:0 auto;
-}
+}
-.margin152{
+.margin152{
-    margin-left: 152px;
+    margin-left: 152px;
-}
+}
-
+
-.margin-tp26{
+.margin-tp26{
-    margin-top: -26px;
+    margin-top: -26px;
-}
+}
-.edu-h315{
+.edu-h315{
-    height:315px;
+    height:315px;
-}
+}
-
+
-.height39 {
+.height39 {
-    height: 39px !important;
+    height: 39px !important;
-}
+}
-#commentsStar{
+#commentsStar{
-    margin-top:33px;
+    margin-top: -7px;
-}
+}
-.startbtnModal .ant-modal-content{
+.startbtnModal .ant-modal-content{
-    background: transparent;
+    background: transparent;
-    box-shadow: 0 4px 12px transparent;
+    box-shadow: 0 4px 12px transparent;
-}
+}
-
+
-.startbtnModal .ant-modal-content .ant-modal-body .ant-spin-spinning{
+.startbtnModal .ant-modal-content .ant-modal-body .ant-spin-spinning{
-    margin-left: 45%;
+    margin-left: 45%;
-}
+}
-
+
-.mr51{
+.mr51{
-    margin-right:51px;
+    margin-right:51px;
 }