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

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

@@ -205,6 +205,18 @@ class DetailTop extends Component{
 	}
 
 	JoinnowCourse=(id)=>{
+
+		if(this.props.checkIfLogin()===false){
+			this.props.showLoginDialog()
+			return
+		}
+
+		if(this.props.current_user&&this.props.current_user.profile_completed===false){
+			this.props.showProfileCompleteDialog()
+			return
+		}
+
+
 		this.setState({
 			yslJointhe:true,
 			Pathcourseid:id
@@ -500,6 +512,9 @@ class DetailTop extends Component{
 												height: 44px !important;
 												line-height: 44px !important;
 											}
+											.pathdefault{
+											    cursor: default !important;
+											}
 											`
 										}
 									</style>
@@ -507,16 +522,16 @@ class DetailTop extends Component{
 
 												return(
 													<div key={key}>
-														{item.course_status.status===0?<div className="mr51 shixun_detail pointer fl user-colorgrey-green">即将开课</div>:""}
+														{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">{item.course_status.time}</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?
-															detailInfoList.is_creator===true||detailInfoList.allow_add_member===true?<div className="mr51 shixun_detail pointer fl user-colorgrey-9b">已结束</div>:item.course_identity<6?
+															detailInfoList.is_creator===true||detailInfoList.allow_add_member===true?<div className="mr51 shixun_detail pointer fl user-colorgrey-9b pathdefault">已结束</div>:item.course_identity<6?
-																<div className="mr51 shixun_detail pointer fl user-colorgrey-9b">已结束</div>:"":""}
+																<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">
 																进入课堂
-															</a>:item.course_identity<6?<div className="fr user_default_btn background191 font-18 mt28 pathbtens">报名成功</div>
+															</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?
@@ -531,7 +546,7 @@ class DetailTop extends Component{
 																进入课堂
 															</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">已结束</div>:""}
+															</a>:<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">已结束</div>:""}
 
 													</div>
 												)})}

public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css

@@ -1,45 +1,45 @@
-.ml350 {
+.ml350 {
-  margin-left: 40%;
+  margin-left: 40%;
-}
+}
-
+
-.ml32 {
+.ml32 {
-  margin-left: 32%;
+  margin-left: 32%;
-}
+}
-
+
-.square-Item{
+.square-Item{
-    min-height: 324px;
+    /*min-height: 324px;*/
-}
+}
-.square-img{
+.square-img{
-    min-height: 210px;
+    min-height: 210px;
-}
+}
-.task-hide{
+.task-hide{
-  margin-bottom: 0em;
+  margin-bottom: 0em;
-}
+}
-.backFAFAFA{
+.backFAFAFA{
-  background:#FAFAFA;
+  background:#FAFAFA;
-}
+}
-
+
-.demo {
+.demo {
-  width: 500px;
+  width: 500px;
-  background-color: #0dcecb;
+  background-color: #0dcecb;
-  text-align: center;
+  text-align: center;
-  padding:50px;
+  padding:50px;
-}
+}
-.next-loading {
+.next-loading {
-  margin-bottom: 5px;
+  margin-bottom: 5px;
-  width:100%;
+  width:100%;
-}
+}
-
+
-.next-rating-overlay .next-icon{
+.next-rating-overlay .next-icon{
-  color: #FFA800!important;
+  color: #FFA800!important;
-}
+}
-
+
-.custom-pagination {
+.custom-pagination {
-  display: inline-block;
+  display: inline-block;
-  margin-left: 10px;
+  margin-left: 10px;
-}
+}
-
+
-.ml425{
+.ml425{
-  margin-left:42.5%;
+  margin-left:42.5%;
-  margin-top:20px;
+  margin-top:20px;
 }