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

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

@@ -93,18 +93,19 @@ class CoursesHomeCard extends Component{
                                  <span className="color-grey-98">{item.school}</span>
                               </Tooltip>
                               </p>
-
+{/* 
-                              <div style={{height:30}}>
+                              <div style={{height:30,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>
-                              {item.teacher_users.length===0?<span className="color-grey-98" style={{marginTop:20}}>
+                              {item.teacher_users.length===0?'':
-                             </span>:
+                               <span className="color-grey-98" style={{height:30,display:'flex'}}>协作老师：
-                               <span className="color-grey-98" style={{height:40}}>协作老师：
+                                {item.teacher_users.map((iem,idx)=>{
-                                {item.teacher_users&&item.teacher_users.map((iem,idx)=>{
+                                  return(
-                                     <div  style="margin-left: 5px;" v-if={idx<3}>{iem[0]} </div> 
+                                    <span  v-if={idx<3} style={{marginLeft:5}}>{iem} </span> 
+                                  )
                                 })
                                 }
                              </span>
                              }
-                              </div>
+                              </div> */}
                            
                              
                           </div>

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

@@ -343,9 +343,22 @@ class InfosCourse extends Component{
                     <p className="subName font-16">
                       <span>{item.name}</span>
                     </p>
-                    <span><img alt="用户" className="radius mt15" height="60" src={getImageUrl('images/'+`${item.teacher && item.teacher.avatar_url}`)} width="60"/></span>
+                    <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}}>
+                              {item.teacher_users.length===0?'':
+                               <span className="color-grey-98" style={{height:30,display:'flex'}}>协作老师：
+                                {item.teacher_users.map((iem,idx)=>{
+                                  return(
+                                    <span  v-if={idx<3} style={{marginLeft:5}}>{iem} </span> 
+                                  )
+                                })
+                                }
+                             </span>
+                             }
+                              </div> */}
+
                   </div>
                   <div className="edu-txt-center course-bottom">
                     <div className="inline color-grey-6">