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

lib/tasks/public_message.rake

@@ -52,7 +52,7 @@ namespace :sync do
       end_time = '2022-07-28'
     end
 
-    discusses = Discuss.where(dis_id: shixun_ids).where("parent_id is null and created_at >? and created_at <?", start_time, end_time)
+    discusses = Discuss.where(dis_id: shixun_id).where("parent_id is null and created_at >? and created_at <?", start_time, end_time)
     discusses.each do |discusse|
       puts discusse.id
       # 找到所有的子回复

public/react/src/modules/paths/PathDetail/DetailTop.js

@@ -410,14 +410,15 @@ class DetailTop extends Component{
 								</style>
 
 
-								{this.props.courses===undefined?"":detailInfoList.is_creator===true?this.state.courseslist.map((item,key)=>{
+								{this.props.courses===undefined?"":this.state.courseslist.map((item,key)=>{
-									return(
+									if(item.course_identity<4){
-										<Tooltip placement="bottom" title={"编辑课堂"} key={key}>
+										return(
+											<Tooltip placement="bottom" title={"编辑课堂"} key={key}>
 												<a href={`/courses/${item.course_id}/newgolds/settings`} target={"_blank"}>
-														<i className="iconfont icon-bianji1 newbianji1"></i>
+													<i className="iconfont icon-bianji1 newbianji1"></i>
 												</a>
-										</Tooltip>
+											</Tooltip>
-									)}):""
+										)}})
 								}
 
 
@@ -530,22 +531,20 @@ class DetailTop extends Component{
 																<div className="mr51 shixun_detail pointer fl user-colorgrey-9b pathdefault">已结束</div>:"":""}
 
 														{item.course_status.status===0?
-															detailInfoList.is_creator===true||detailInfoList.allow_add_member===true?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
+															item.course_identity<5?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
 																进入课堂
 															</a>:item.course_identity<6?<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">报名成功</div>
 																:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens"  onClick={()=>this.JoinnowCourse(item.course_id)}>立即报名</a>:""}
 
 														{item.course_status.status===1?
-															detailInfoList.is_creator===true||detailInfoList.allow_add_member===true?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
+															item.course_identity<5?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
 																进入课堂
 															</a>:item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
 																	立即学习
 																</a>:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens"  onClick={()=>this.JoinnowCourse(item.course_id)}>立即加入</a>:""}
 
 														{item.course_status.status===2?
-															detailInfoList.is_creator===true||detailInfoList.allow_add_member===true?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
+													     item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
-																进入课堂
-															</a>:item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
 																进入课堂
 															</a>:<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">已结束</div>:""}