From b26bbdb27712284b859be228424b601279eeca36 Mon Sep 17 00:00:00 2001
From: dinglink <837816638@qq.com>
Date: Tue, 24 Mar 2020 11:00:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E8=AF=A6=E6=83=85=20?=
 =?UTF-8?q?=E5=8F=8A=E5=AE=9E=E8=AE=AD=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                 |  4 --
 .../react/src/context/TPIContextProvider.js   | 10 ++--
 .../courses/coursesDetail/CoursesBanner.js    | 48 ++++++++++++-------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index ce5475ffc..afed0fa9d 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -46,11 +46,7 @@ debugType = "admin";
 // 老师
 // debugType="teacher";
 // 学生
-<<<<<<< HEAD
- //debugType="student";
-=======
 //  debugType="student";
->>>>>>> 65f1f7ca73d06c88eeec624eaa865b259c525706
 
 
 
diff --git a/public/react/src/context/TPIContextProvider.js b/public/react/src/context/TPIContextProvider.js
index 64b93f016..291626038 100644
--- a/public/react/src/context/TPIContextProvider.js
+++ b/public/react/src/context/TPIContextProvider.js
@@ -164,15 +164,14 @@ class TPIContextProvider extends Component {
 		}, 1000)
 
 		// 	// 页面离开时存下用户的任务耗时
-		window.$(window).bind('beforeunload',()=>{	
-			console.log(111)
+		window.$(window).bind('beforeunload',()=>{
 			this._updateCostTime();
 		}) 	
-		window.$(window).unload( ()=>{
+		// window.$(window).unload( ()=>{
 
-			this._updateCostTime();
+		// 	this._updateCostTime();
 
-		});
+		// });
 		// // 页面离开时存下用户的任务耗时
 		// window.$(window).unload( ()=>{
 		// 	this._updateCostTime();
@@ -196,7 +195,6 @@ class TPIContextProvider extends Component {
 		if (window.location.port == 3007) {
 			testPath = 'http://test-newweb.educoder.net'
 		}
-		console.log(222)
 		// var url = `${testPath}/api/v1/games/${ game.identifier }/cost_time`
 		var url = `${testPath}/api/tasks/${ game.identifier }/cost_time${getRandomNumber()}`
 	    window.$.ajax({
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index 180599fa8..a6e22f080 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -601,26 +601,38 @@ class CoursesBanner extends Component {
 
 
                   </div>
+                  <div>
+                  <a href={"/users/" + coursedata.teacher_login} className="fl">
+                    <img alt="头像" className="radius fl mt3 bannerimgname"
+                        src={getImageUrl(`images/` + coursedata.teacher_img)}/>
+                  </a>
+
+                  <div className="fl mt13">
+                    <p className="color-white">
+                      <a href={"/users/" + coursedata.teacher_login}
+                        className="color-white bannnerusername">{coursedata.teacher_name}</a>
+                    </p>
+                  </div>
+                  <div className="fl mt13">
+                    <p className="color-white bannnerusernames">{coursedata.teacher_school}</p>
+                  </div>
 
-                  <div className="clearfix ">
-                    <div className="fl fl mr40 mb20">
-
-                      <a href={"/users/" + coursedata.teacher_login} className="fl">
-                        <img alt="头像" className="radius fl mt3 bannerimgname"
-                             src={getImageUrl(`images/` + coursedata.teacher_img)}/>
-                      </a>
-
-                      <div className="fl mt13">
-                        <p className="color-white">
-                          <a href={"/users/" + coursedata.teacher_login}
-                             className="color-white bannnerusername">{coursedata.teacher_name}</a>
-                        </p>
-                      </div>
-
+                  </div>
 
-                      <div className="fl mt13">
-                        <p className="color-white bannnerusernames">{coursedata.teacher_school}</p>
-                      </div>
+                  <div className="clearfix ">
+                    <div className="fl fl mr40 mb20" >
+                      <div className="task-hide" style={{height:25,marginBottom:10,marginLeft:60}}>
+                              {coursedata.teacher_users.length===0?'':
+                               <span className="color-white" >协作老师：
+                                {coursedata.teacher_users.map((iem,idx)=>{
+                                  return(
+                                    <span className="task-hide" style={{width:50,marginLeft:5}}>{idx<3?iem:''}  {coursedata.teacher_users.length>3&&idx===2?'...':''} </span> 
+                                  )
+                                })
+                                }
+                             </span>
+                             }
+                        </div>
 
                     </div>