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

public/react/src/modules/courses/gradinforms/Bullsubdirectory.js

@@ -233,7 +233,7 @@ class Bullsubdirectory extends Component{
 											{
 												whethertoeditysl === false?
 													<div>
-														<div>
+														<div className="fudonyingxiangysls">
 															<div className="fudonyingxiangysl">
 																<div style={{marginRight:"60px"}}>
 																	<span className="ysltitbt">{myname}</span>

public/react/src/modules/courses/gradinforms/myysleduinforms.css

@@ -70,6 +70,10 @@
 .fudonyingxiangysl{
     width: 100%;
 }
+.fudonyingxiangysls{
+    display: flex;
+    flex-direction:column;
+}
 .yslbianji{
     padding-top: 31px;
 

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

@@ -3059,20 +3059,20 @@ class Listofworksstudentone extends Component {
 		// console.log(this.props.isAdmin());
 
 	 let course_is_end = this.props.current_user&&this.props.current_user.course_is_end;
-	 try {
+	 // try {
-		 if(this.props.isAdmin() === false){
+		//  if(this.props.isAdmin() === false){
-			 if(teacherdata&&teacherdata.student_works){
+		// 	 if(teacherdata&&teacherdata.student_works){
-				 if(teacherdata&&teacherdata.student_works.length>0){
+		// 		 if(teacherdata&&teacherdata.student_works.length>0){
-					 console.log("这是双层页面。。。。");
+		// 			 console.log("这是双层页面。。。。");
-
+	 //
-				 }
+		// 		 }
-			 }
+		// 	 }
-
+	 //
-		 }
+		//  }
-	 }catch (e) {
+	 // }catch (e) {
-	 	console.log("Listofworksstudentone123");
+	 // 	console.log("Listofworksstudentone123");
-    console.log(e);
+   //  console.log(e);
-	 }
+	 // }
 
 		return (
 
@@ -3151,12 +3151,12 @@ class Listofworksstudentone extends Component {
 									 typs={this.state.typs}
 								 />
 								 {
-								 homework_status.length===0?
+									 homework_status&&homework_status.length===0?
 									 <div className="edu-back-white">
 								 <NoneData></NoneData>
 									 </div>
 								 :
-								 homework_status.length>0 && homework_status[0]==="未发布"?
+									homework_status&&homework_status.length>0 && homework_status[0]==="未发布"?
 									 <div className="edu-back-white">
 								 <NoneData></NoneData>
 									 </div>
@@ -3491,12 +3491,12 @@ class Listofworksstudentone extends Component {
 												}
 
 												{
-													homework_status.length===0?
+													homework_status&&homework_status.length&&homework_status.length===0?
 														<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
 															<NoneData></NoneData>
 														</div>
 														:
-														homework_status.length>0 && homework_status[0]==="未发布"?
+														homework_status&&homework_status.length>0 && homework_status&&homework_status[0]==="未发布"?
 															<div className=" clearfix edu-back-white "  style={{margin:  "auto" , minWidth:"1200px"}}>
 																<NoneData></NoneData>
 															</div>
@@ -3651,12 +3651,12 @@ class Listofworksstudentone extends Component {
 												}
 
 												{
-													homework_status.length===0?
+													homework_status&&homework_status.length===0?
 														<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
 															<NoneData></NoneData>
 														</div>
 														:
-														homework_status.length>0 && homework_status[0]==="未发布"?
+														homework_status&&homework_status.length>0 && homework_status&&homework_status[0]==="未发布"?
 															<div className=" clearfix edu-back-white"  style={{margin:  "auto" , minWidth:"1200px"}}>
 																<NoneData></NoneData>
 															</div>