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

public/react/src/modules/courses/coursesDetail/CoursesBanner.js

@@ -617,12 +617,14 @@ class CoursesBanner extends Component {
                         </p>
                       </div>
 
+
                       <div className="fl mt13">
                         <p className="color-white bannnerusernames">{coursedata.teacher_school}</p>
                       </div>
 
                     </div>
                    
+
                     {/*{excellent===false?*/}
                     {/*  :*/}
                     {/*  <div>*/}

public/react/src/modules/courses/coursesHome/CoursesHomeCard.js

@@ -94,12 +94,12 @@ class CoursesHomeCard extends Component{
                               </Tooltip>
                               </p>
 
-                              <div style={{height:30,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>
+                              <div className="mb15 task-hide mt10" style={{height:20}}>
                               {item.teacher_users.length===0?'':
-                               <span className="color-grey-98" style={{height:30,display:'flex'}}>协作老师：
+                               <span className="color-grey-98" >协作老师：
                                 {item.teacher_users.map((iem,idx)=>{
                                   return(
-                                    <span  v-if={idx<3} style={{marginLeft:5}}>{iem} </span> 
+                                    <span className="mb15 task-hide mt10" style={{width:50,marginLeft:5}}>{idx<3?iem:''} </span> 
                                   )
                                 })
                                 }

public/react/src/modules/user/usersInfo/InfosCourse.js

@@ -346,9 +346,9 @@ class InfosCourse extends Component{
                     <span><img alt="用户" className="radius mt15" height="50" src={getImageUrl('images/'+`${item.teacher && item.teacher.avatar_url}`)} width="50"/></span>
                     <p className="font-14 mt10 task-hide"><span>{item.teacher && item.teacher.real_name}</span></p>
                     <p className="font-16 mb15 task-hide mt10"><span className="color-grey-98">{item&&item.school}</span></p>
-                    <div style={{height:20,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap',marginBottom:5}}>
+                    <div className="task-hide"  style={{height:20,marginBottom:10}}>
                               {item.teacher_users.length===0?'':
-                               <span className="color-grey-98" style={{height:30,display:'flex'}}>协作老师：
+                               <span className="color-grey-98">协作老师：
                                 {item.teacher_users.map((iem,idx)=>{
                                   return(
                                     <span  v-if={idx<3} style={{marginLeft:5}}>{iem} </span>