From 72e0efaf5a37235568be511566f309bdeaf338a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 23 Sep 2019 10:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=AF=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/paths/PathDetail/DetailTop.js | 53 +++++++++++++------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js
index d42de474b..c6c2f1a75 100644
--- a/public/react/src/modules/paths/PathDetail/DetailTop.js
+++ b/public/react/src/modules/paths/PathDetail/DetailTop.js
@@ -626,30 +626,36 @@ class DetailTop extends Component{
 											border-radius: 4px;
 											line-height: 46px !important;
 											}
-											.lineHeight0{
-											line-height: 0px;
+											.lineHeight1{
+											line-height: 1px;
 											}
 											.font153{
 											    font-size: 14px;
 													font-weight: 400;
 													color: rgba(153,153,153,1);
-													line-height: 14px;
 													margin-left: 30px;
 											}
 
 											.absolutewidth{
 											    position: absolute;
-													top: -21px;
+													top: 19px;
 													right: 71px;
 											}
 											.relativewidth{
 											    position: relative;
     											width: 100%;
 											}
+											.padding040{
+    											padding: 0 43px;
+											}
+											.mt26{
+											  margin-top:26px;
+											}
+
 											`
 									}
 								</style>
-								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"fr mr25"}>
+								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"fr padding040"}>
 
 
 										{/*
@@ -659,27 +665,32 @@ class DetailTop extends Component{
 
 											return(
 												<div key={key}>
+													{applypath===false?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true?
+														this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?
+															getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox  mt5":"fr user_default_btn background191 font-18 pathbtensbox mt26"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox  mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox mt26"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:
+															<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox  mt5":"fr user_default_btn background191 font-18 pathbtensbox mt26"}>预约报名成功</span>:""}
+
 													{/*{item.course_status.status===0?<div className="mr51 shixun_detail pointer fl user-colorgrey-green pathdefault">即将开课</div>:""}*/}
 													{item.course_status.status===1?<div className="mr51 shixun_detail pointer fl color-orange pathdefault">{item.course_status.time}</div>:""}
 													{item.course_status.status===2&&item.course_identity<6?<div className="mr20 shixun_detail pointer fl user-colorgrey-9b pathdefault">已结束</div>:""}
 													{/*<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">已结束</div>*/}
 													{item.course_status.status===0?
-														item.course_identity<5?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa" href={item.first_category_url} target="_blank">
+														item.course_identity<5?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa mr20" 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>:""}
+														</a>:item.course_identity<6?<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault mr20">报名成功</div>
+															:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20"  onClick={()=>this.JoinnowCourse(item.course_id)}>立即报名</a>:""}
 
 													{item.course_status.status===1?
-														item.course_identity<5?<a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
+														item.course_identity<5?<a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20" href={item.first_category_url} target="_blank">
 															进入课堂
-														</a>:item.course_identity<6?<a className="courseslistsa 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="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20" 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,item.course_status.status)}>立即加入</a>:""}
+														</a>:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20"  onClick={()=>this.JoinnowCourse(item.course_id,item.course_status.status)}>立即加入</a>:""}
 
 													{item.course_status.status===2?
-														item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa" href={item.first_category_url} target="_blank">
+														item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa mr20" href={item.first_category_url} target="_blank">
 															进入课堂
-														</a>:<div className="mr80 shixun_detail pointer fl user-colorgrey-9b pathdefault">已结束</div>:""}
+														</a>:<div className="mr20 shixun_detail pointer fl user-colorgrey-9b pathdefault">已结束</div>:""}
 
 												</div>
 											)})}
@@ -687,15 +698,27 @@ class DetailTop extends Component{
 
 									</li>}
 
+
+
 								{applypath===false?"":this.state.MenuItemskey===this.props.courses.length?<div className={"clear"}></div>:""}
 
-								{applypath===false?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true?<span className={coursestypes===true?"fl ml20 lineHeight0 relativewidth mt43":"fl ml20 lineHeight0 relativewidth"}>
+								{applypath===false?"":this.props.courses.length===0?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true?<span className={coursestypes===true?"fr lineHeight1 relativewidth mt43":"fl lineHeight1 relativewidth"}>
+									<span className={"fr mr30"}>当前预约报名人数：<span className={"color-red mr5"}>{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}</span>人</span>
+										<span className={"font153 fr mr12"}>当预约报名人数达到   {this.props.detailInfoList&&this.props.detailInfoList.student_count}    人时即将开课</span>
+										{/*{this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?*/}
+										{/*getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:*/}
+										{/*<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>}*/}
+								</span>
+									:""}
+
+								{applypath===true&&this.props.courses.length===0?this.state.MenuItemskey===this.props.courses.length||coursestypes===true?<span className={coursestypes===true?"fl ml20 lineHeight0 relativewidth":"fl ml20 lineHeight0 relativewidth"}>
 									<span>当前预约报名人数：<span className={"color-red mr5"}>{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}</span>人</span>
 									<span className={"font153"}>当预约报名人数达到   {this.props.detailInfoList&&this.props.detailInfoList.student_count}    人时即将开课</span>
 									{this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?
 										getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:
 										<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>}
-								</span>:""}
+									</span>:"":""}
+
 
 						</div>}