From 9c6e389630591ec84cf1950b8b93857a06d31aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 21 Sep 2019 20:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/paths/PathDetail/DetailTop.css    |  14 ++-
 .../src/modules/paths/PathDetail/DetailTop.js | 103 ++++++++++--------
 2 files changed, 68 insertions(+), 49 deletions(-)

diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.css b/public/react/src/modules/paths/PathDetail/DetailTop.css
index 70291c7da..40363f056 100644
--- a/public/react/src/modules/paths/PathDetail/DetailTop.css
+++ b/public/react/src/modules/paths/PathDetail/DetailTop.css
@@ -66,4 +66,16 @@
     text-overflow: ellipsis;
     white-space: nowrap;
     height: 40px;
-}
\ No newline at end of file
+}
+
+.mb100{
+    margin-bottom: 100px !important;
+}
+.task-btn-28BE6C{
+    background: #28BE6C !important;
+    color: #fff!important;
+}
+.mt43{
+    margin-top: 43px;
+}
+
diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js
index eddf7f62a..43bb5e1dd 100644
--- a/public/react/src/modules/paths/PathDetail/DetailTop.js
+++ b/public/react/src/modules/paths/PathDetail/DetailTop.js
@@ -50,33 +50,41 @@ class DetailTop extends Component{
 				})
 
 			}else{
-						this.props.courses.map((item,key)=>{
-							if(listtype===false){
-								keys=key+1
-								if(item.course_status.status===0) {
-									listtype=true
-									return (
-										courseslist.push(item)
-									)
-								}
-						  }
-						})
+				let type=undefined;
+
 
 
 					this.props.courses.map((item,key)=>{
-						if(listtype===false){
+						let arr=[]
 							keys=key+1
 							if(item.course_status.status===2) {
+								type=key+1
+									arr.push(item)
+							}
+						courseslist=arr;
+					})
+
+					this.props.courses.map((item,key)=>{
+						let arr=[]
+						if(listtype===false){
+							keys=key+1
+							if(item.course_status.status===0) {
 								listtype=true
-								return (
-									courseslist.push(item)
-								)
+									// courseslist.push(item)
+								arr.push(item)
+								courseslist=arr
 							}
 						}
 					})
 
+				console.log(courseslist)
+
+
 			}
-			this.props.getMenuItemsindex(keys,courseslist[0].course_status.status)
+			if(courseslist.length!=0){
+				this.props.getMenuItemsindex(keys,courseslist[0].course_status.status)
+			}
+
 		}
 
 		this.setState({
@@ -339,11 +347,11 @@ class DetailTop extends Component{
 
 
 		let applypath=this.props.detailInfoList&&this.props.detailInfoList.participant_count!=undefined&&this.props.detailInfoList&&this.props.detailInfoList.allow_statistics===false;
-
-		// console.log(this.props.courses)
+    let coursestypes=this.props.courses!=undefined&&this.props.courses.length===0;
+	  console.log(coursestypes)
 		return(
 
-			<div className={this.props.courses===undefined||this.props.courses.length===0?"subhead":"subhead mb70"}>
+			<div className={this.props.courses===undefined||this.props.courses.length===0?"subhead":applypath===false?"subhead mb70":this.state.MenuItemskey===this.props.courses.length?"subhead mb100":"subhead mb70"}>
         <Modals
           modalsType={Modalstype}
           modalsTopval={Modalstopval}
@@ -358,7 +366,7 @@ class DetailTop extends Component{
 
         {
           detailInfoList &&
-					<div  className={this.props.courses===undefined||this.props.courses.length===0?"subhead_content":"subhead_content pt100"}>
+					<div  className={this.props.courses===undefined?"subhead_content":this.props.courses.length===0?"subhead_content pt40":"subhead_content pt100"}>
             <div className="font-28 color-white clearfix">
 							{/*<Tooltip placement="bottom" title={detailInfoList.name.length>27?detailInfoList.name:""}>*/}
 
@@ -477,12 +485,10 @@ class DetailTop extends Component{
 
             </div>
 
-							{this.props.courses===undefined||this.props.courses.length===0?"":<div className="userNavs mt20" style={applypath===false?{}:this.state.MenuItemskey===this.props.courses.length?{height:'158px'}:{}}>
-
-									<li className={"fl pd4020"}>
-										<style>
-											{
-												`
+							{this.props.courses===undefined?"":<div className="userNavs mt20" style={applypath===false?{}:this.state.MenuItemskey===this.props.courses.length?{height:'158px'}:{}}>
+								<style>
+									{
+										`
 										.anticon-down{
 											font-size:14px !important;
 											transform:none !important;
@@ -500,11 +506,11 @@ class DetailTop extends Component{
 										  color:#CDCDCD;
 										}
 										`
-											}
-										</style>
-
+									}
+								</style>
+								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"fl pd4020"}>
 
-										{this.props.courses===undefined?"":this.state.courseslist.map((item,key)=>{
+										{this.state.courseslist.map((item,key)=>{
 											if(item.course_identity<4){
 												return(
 													<Tooltip placement="bottom" title={"编辑课堂"} key={key}>
@@ -524,7 +530,7 @@ class DetailTop extends Component{
 												第<span className={"color-orange"}>  {this.state.MenuItemskey}  </span>次开课 <Icon className="aIcons" type={!this.state.onVisibleChangestype?"down":"up"} />
 											</a>
 										</Dropdown>
-									</li>
+									</li>}
 									<style>
 										{
 											`
@@ -545,7 +551,7 @@ class DetailTop extends Component{
 										`
 										}
 									</style>
-									<li className={"ml20"}>
+								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"ml20"}>
 										{this.state.courseslist.map((item,key)=>{
 											return(
 												<div className={"ant-breadcrumb pdt28"} key={key}>
@@ -588,12 +594,10 @@ class DetailTop extends Component{
 										})
 										}
 
-									</li>
-
-									<li className={"fr mr25"}>
-										<style>
-											{
-												`
+									</li>}
+								<style>
+									{
+										`
 											.user-colorgrey-9b{color:#9B9B9B}
 											.user-colorgrey-green{color:#7ED321}
 											.background191{
@@ -615,7 +619,7 @@ class DetailTop extends Component{
 											  color:#fff !important;
 											}
 											.pathbtensbox{
-											width: 188px !important;
+											width: 215px !important;
 											height: 46px !important;
 											background: rgba(76,172,255,1);
 											border-radius: 4px;
@@ -642,8 +646,10 @@ class DetailTop extends Component{
     											width: 100%;
 											}
 											`
-											}
-										</style>
+									}
+								</style>
+								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"fr mr25"}>
+
 
 										{/*
 										height: 158px;
@@ -654,8 +660,8 @@ class DetailTop extends Component{
 												<div key={key}>
 													{/*{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="mr51 shixun_detail pointer fl user-colorgrey-9b pathdefault">已结束</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">
 															进入课堂
@@ -672,21 +678,22 @@ class DetailTop extends Component{
 													{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">
 															进入课堂
-														</a>:<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">已结束</div>:""}
+														</a>:<div className="mr80 shixun_detail pointer fl user-colorgrey-9b pathdefault">已结束</div>:""}
 
 												</div>
 											)})}
 
 
-									</li>
+									</li>}
 
 								{applypath===false?"":this.state.MenuItemskey===this.props.courses.length?<div className={"clear"}></div>:""}
-								{applypath===false?"":this.state.MenuItemskey===this.props.courses.length?<span className={"fl ml20 lineHeight0 relativewidth"}>
+
+								{applypath===false?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true?<span className={coursestypes===true?"fl ml20 lineHeight0 relativewidth mt43":"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?<a className="fr user_default_btn background191 font-18 pathbtensbox absolutewidth">预约报名成功</a>:<a className="fr user_default_btn task-btn-orange font-18 pathbtensbox absolutewidth"  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:
-										<a className="fr user_default_btn background191 font-18 pathbtensbox absolutewidth">预约报名成功</a>}
+										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>:""}
 
 						</div>}