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

public/react/public/js/applications.js

@@ -11267,7 +11267,7 @@ Copyright © 2018 Basecamp, LLC
       type: "GET",
       dataType: "script",
       cache: true,
-      async: false,
+      async: true,
       global: false,
 
       // Only evaluate the response if it is successful (gh-4126)

public/react/src/AppConfig.js

@@ -90,7 +90,7 @@ function railsgettimes(proxy) {
 
   if (timestamp && checkSubmitFlg === false) {
     $.ajax({
-      url: proxy, async: false, success: function (data) {
+      url: proxy, async: true, success: function (data) {
         if (data.status === 0) {
           timestamp = data.message;
           setpostcookie();
@@ -103,7 +103,7 @@ function railsgettimes(proxy) {
     }, 2000);
   } else if (checkSubmitFlg === false) {
     $.ajax({
-      url: proxy, async: false, success: function (data) {
+      url: proxy, async: true, success: function (data) {
         if (data.status === 0) {
           timestamp = data.message;
           setpostcookie();

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

@@ -92,8 +92,22 @@ class CoursesHomeCard extends Component{
                               <Tooltip placement="bottom" title={item.school}>
                                  <span className="color-grey-98">{item.school}</span>
                               </Tooltip>
-
                               </p>
+
+                              <div style={{height:30,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>
+                              {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">

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">