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

dev_oauth
hjm 6 years ago
commit a8a426706e

@ -69,6 +69,7 @@ namespace :public_course do
when 1 when 1
# 讨论区 # 讨论区
created_on = random_time start_time, end_time created_on = random_time start_time, end_time
puts created_on
messages = Message.where(board_id: course.boards) messages = Message.where(board_id: course.boards)
messages.each do |message| messages.each do |message|
message.update_columns(created_on: created_on, updated_on: created_on) message.update_columns(created_on: created_on, updated_on: created_on)

@ -497,7 +497,7 @@ class PathDetailIndex extends Component{
</div> </div>
} }
{ {
this.props.checkIfLogin()===false?"123213":progress === undefined ? "" : progress === null ? "" : this.props.checkIfLogin()===false?"":progress === undefined ? "" : progress === null ? "" :
<div className="edu-back-white myProgress padding40-20 mb10"> <div className="edu-back-white myProgress padding40-20 mb10">
<p className="mb20"> <p className="mb20">
<span className="font-16 mr10">我的进展</span> <span className="font-16 mr10">我的进展</span>

Loading…
Cancel
Save