m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
schedule_job
杨树明 5 years ago
parent 2d46b23daa f569128431
commit ea44efda7a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
public/react/public/js/applications.js
Unescape View File

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

4
public/react/src/AppConfig.js
Unescape View File

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

4
public/react/src/modules/courses/coursesHome/CoursesHomeCard.js
Unescape View File

@ -93,7 +93,7 @@ class CoursesHomeCard extends Component{
<span className="color-grey-98">{item.school}</span> <span className="color-grey-98">{item.school}</span>
</Tooltip> </Tooltip>
</p> </p>
{/*
<div style={{height:30,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}> <div style={{height:30,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>
{item.teacher_users.length===0?'': {item.teacher_users.length===0?'':
<span className="color-grey-98" style={{height:30,display:'flex'}}>协作老师： <span className="color-grey-98" style={{height:30,display:'flex'}}>协作老师：
@ -105,7 +105,7 @@ class CoursesHomeCard extends Component{
} }
</span> </span>
} }
</div> */} </div>
</div> </div>

4
public/react/src/modules/user/usersInfo/InfosCourse.js
Unescape View File

@ -346,7 +346,7 @@ class InfosCourse extends Component{
<span><img alt="用户" className="radius mt15" height="50" src={getImageUrl('images/'+`${item.teacher && item.teacher.avatar_url}`)} width="50"/></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-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> <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 style={{height:20,overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap',marginBottom:5}}>
{item.teacher_users.length===0?'': {item.teacher_users.length===0?'':
<span className="color-grey-98" style={{height:30,display:'flex'}}>协作老师： <span className="color-grey-98" style={{height:30,display:'flex'}}>协作老师：
{item.teacher_users.map((iem,idx)=>{ {item.teacher_users.map((iem,idx)=>{
@ -357,7 +357,7 @@ class InfosCourse extends Component{
} }
</span> </span>
} }
</div> */} </div>
</div> </div>
<div className="edu-txt-center course-bottom"> <div className="edu-txt-center course-bottom">

Write Preview
Loading…
Cancel
Save