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 { +
{coursedata.teacher_school}
+{coursedata.teacher_school}
-