-
-
是否确认该加入课堂?
+
+
diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.css b/public/react/src/modules/paths/PathDetail/DetailTop.css
index 17ff8507f..17fdf3996 100644
--- a/public/react/src/modules/paths/PathDetail/DetailTop.css
+++ b/public/react/src/modules/paths/PathDetail/DetailTop.css
@@ -43,4 +43,14 @@
.solidright{
border-right: 1px solid #000;
height: 42px;
+}
+.ant-modal-title {
+ height: 38px;
+ line-height:38px !important;
+}
+.ant-modal-title {
+ font-size: 16px;
+ font-weight: 700!important;
+ color: #333;
+ text-align: center;
}
\ No newline at end of file
diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js
index 902a6d8bf..6270ffb06 100644
--- a/public/react/src/modules/paths/PathDetail/DetailTop.js
+++ b/public/react/src/modules/paths/PathDetail/DetailTop.js
@@ -5,6 +5,7 @@ import SendPanel from "./sendPanel.js";
import { getImageUrl } from 'educoder';
import axios from 'axios';
import Modals from '../../modals/Modals';
+import Jointheclass from '../../modals/Jointheclass'
import './DetailTop.css';
const Search = Input.Search;
@@ -22,7 +23,8 @@ class DetailTop extends Component{
deletepathtype:false,
cardsModalsavetype:false,
MenuItemskey:1,
- courseslist:[]
+ courseslist:[],
+ Pathcourseid:undefined
}
}
componentDidMount(){
@@ -37,7 +39,6 @@ class DetailTop extends Component{
this.setState({
courseslist:courseslist
})
- console.log(courseslist)
}
allow_deletepath=()=>{
this.setState({
@@ -171,15 +172,31 @@ class DetailTop extends Component{
)
}
})
-
- console.log(courseslist)
-
this.setState({
MenuItemskey:keys,
courseslist:courseslist
})
}
- render(){
+
+ JoinnowCourse=(id)=>{
+ this.setState({
+ yslJointhe:true,
+ Pathcourseid:id
+ })
+ }
+ ysljoinmodalCancel=()=>{
+ this.setState({
+ yslJointhe:false
+ })
+ };
+ ysljoinmodalCanceltwo=()=>{
+ this.setState({
+ yslJointhe:false
+ })
+ this.props.getdatasindex()
+ };
+
+ render(){
let{detailInfoList}=this.props;
let{Modalstype,Modalstopval,cardsModalcancel,cardsModalsave,Modalsbottomval,cardsModalsavetype,loadtype}=this.state;
const radioStyle = {
@@ -219,6 +236,7 @@ class DetailTop extends Component{
loadtype={loadtype}
>
+ this.ysljoinmodalCancel()} ysljoinmodalCanceltwo={()=>this.ysljoinmodalCanceltwo()}>
{/*
是否确认该加入课堂?
*/}
{
detailInfoList &&
@@ -442,27 +460,25 @@ class DetailTop extends Component{
detailInfoList.is_creator===true?已结束:item.course_identity<6?
已结束:"":""}
-
{item.course_status.status===0?
- detailInfoList.is_creator===true?
+ detailInfoList.is_creator===true?
进入课堂
- :item.course_identity<6?
)})}
diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
index 43128e446..0ee4a3904 100644
--- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
+++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
@@ -170,31 +170,35 @@ class PathDetailIndex extends Component{
}
componentDidMount(){
- let pathid=this.props.match.params.pathId;
- let url="/paths/"+pathid+".json";
- axios.get(url).then((result)=>{
- if (result.data.status === 407 || result.data.status === 401) {
- debugger
- return;
- }
+ this.getdatasindex()
+ }
- if (result.data.status === 403) {
- debugger
- // window.location.href = "/403";
- return;
- }
+ getdatasindex=()=>{
+ let pathid=this.props.match.params.pathId;
+ let url="/paths/"+pathid+".json";
+ axios.get(url).then((result)=>{
+ if (result.data.status === 407 || result.data.status === 401) {
+ debugger
+ return;
+ }
- if(result.data.allow_visit===true){
- this.setState({
- detailInfoList:result.data,
- // courses:result.data.courses
- // items: getItems(result.data.members.length),
- })
- }
+ if (result.data.status === 403) {
+ debugger
+ // window.location.href = "/403";
+ return;
+ }
- }).catch((error)=>{
- console.log(error);
- })
+ if(result.data.allow_visit===true){
+ this.setState({
+ detailInfoList:result.data,
+ // courses:result.data.courses
+ // items: getItems(result.data.members.length),
+ })
+ }
+
+ }).catch((error)=>{
+ console.log(error);
+ })
let righturl="/paths/"+pathid+"/right_banner.json";
@@ -221,7 +225,7 @@ class PathDetailIndex extends Component{
}).catch((error)=>{
console.log(error);
})
- }
+ }
updatadetailInfoList=()=>{
let pathid=this.props.match.params.pathId;
@@ -416,7 +420,7 @@ class PathDetailIndex extends Component{
>
报名成功
- :立即报名:""}
-
+ :item.course_identity<6?报名成功
+ :this.JoinnowCourse(item.course_id)}>立即报名:""}
{item.course_status.status===1?
- detailInfoList.is_creator===true?
+ detailInfoList.is_creator===true?
进入课堂
- :item.course_identity<6?
+ :item.course_identity<6?
立即学习
- :立即加入:""}
+ :this.JoinnowCourse(item.course_id)}>立即加入:""}
{item.course_status.status===2?
- detailInfoList.is_creator===true?
+ detailInfoList.is_creator===true?
进入课堂
- :item.course_identity<6?
+ :item.course_identity<6?
进入课堂
- :已结束
:""}
+ :已结束
:""}
- this.getdatasindex()}>
diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index 39d9df55b..11369024d 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/public/react/src/modules/tpm/SiderBar.js
@@ -106,6 +106,15 @@ class SiderBar extends Component {
+
![]({getImageUrl("images/edu_user/EWM.jpg")})
微信扫一扫
关注公众号