From 34ba43841bb5b1aae7aa47a9dafd0268233afbec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 22 Aug 2019 12:51:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/paths/PathDetail/DetailTop.js | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js index 02df977d3..e0147917b 100644 --- a/public/react/src/modules/paths/PathDetail/DetailTop.js +++ b/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; + } ` } @@ -507,16 +522,16 @@ class DetailTop extends Component{ return(
- {item.course_status.status===0?
即将开课
:""} - {item.course_status.status===1?
{item.course_status.time}
:""} + {item.course_status.status===0?
即将开课
:""} + {item.course_status.status===1?
{item.course_status.time}
:""} {item.course_status.status===2? - detailInfoList.is_creator===true||detailInfoList.allow_add_member===true?
已结束
:item.course_identity<6? -
已结束
:"":""} + detailInfoList.is_creator===true||detailInfoList.allow_add_member===true?
已结束
:item.course_identity<6? +
已结束
:"":""} {item.course_status.status===0? detailInfoList.is_creator===true||detailInfoList.allow_add_member===true? 进入课堂 - :item.course_identity<6?
报名成功
+ :item.course_identity<6?
报名成功
:this.JoinnowCourse(item.course_id)}>立即报名:""} {item.course_status.status===1? @@ -531,7 +546,7 @@ class DetailTop extends Component{ 进入课堂 :item.course_identity<6? 进入课堂 - :
已结束
:""} + :
已结束
:""}
)})} From 4f145419f9b6386abd086504d6679d45cd792a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 22 Aug 2019 12:51:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/paths/PathDetail/DetailTop.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js index e0147917b..cd987b074 100644 --- a/public/react/src/modules/paths/PathDetail/DetailTop.js +++ b/public/react/src/modules/paths/PathDetail/DetailTop.js @@ -205,7 +205,7 @@ class DetailTop extends Component{ } JoinnowCourse=(id)=>{ - + if(this.props.checkIfLogin()===false){ this.props.showLoginDialog() return From 88ab9e269aad540b2f1948e057488e8dae9d01fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 22 Aug 2019 12:56:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tpm/shixuns/shixunCss/shixunCard.css | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css index 1bd948427..f3c4a30da 100644 --- a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css +++ b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css @@ -1,45 +1,45 @@ -.ml350 { - margin-left: 40%; -} - -.ml32 { - margin-left: 32%; -} - -.square-Item{ - min-height: 324px; -} -.square-img{ - min-height: 210px; -} -.task-hide{ - margin-bottom: 0em; -} -.backFAFAFA{ - background:#FAFAFA; -} - -.demo { - width: 500px; - background-color: #0dcecb; - text-align: center; - padding:50px; -} -.next-loading { - margin-bottom: 5px; - width:100%; -} - -.next-rating-overlay .next-icon{ - color: #FFA800!important; -} - -.custom-pagination { - display: inline-block; - margin-left: 10px; -} - -.ml425{ - margin-left:42.5%; - margin-top:20px; +.ml350 { + margin-left: 40%; +} + +.ml32 { + margin-left: 32%; +} + +.square-Item{ + /*min-height: 324px;*/ +} +.square-img{ + min-height: 210px; +} +.task-hide{ + margin-bottom: 0em; +} +.backFAFAFA{ + background:#FAFAFA; +} + +.demo { + width: 500px; + background-color: #0dcecb; + text-align: center; + padding:50px; +} +.next-loading { + margin-bottom: 5px; + width:100%; +} + +.next-rating-overlay .next-icon{ + color: #FFA800!important; +} + +.custom-pagination { + display: inline-block; + margin-left: 10px; +} + +.ml425{ + margin-left:42.5%; + margin-top:20px; } \ No newline at end of file