diff --git a/public/react/src/modules/modals/Jointheclass.js b/public/react/src/modules/modals/Jointheclass.js index 40f62a6ac..0ad13c158 100644 --- a/public/react/src/modules/modals/Jointheclass.js +++ b/public/react/src/modules/modals/Jointheclass.js @@ -1,6 +1,7 @@ import React, { Component } from 'react'; import { Modal} from 'antd'; import axios from 'axios'; +import Modals from './Modals'; //加入精品课堂 class Jointheclass extends Component { @@ -11,6 +12,12 @@ class Jointheclass extends Component { componentDidMount() { // console.log("加入精品课堂"); // console.log(this.props); + let type=this.props.yslJointhe===undefined?false:this.props.yslJointhe; + if(type===true){ + this.setState({ + Modalstype:true + }) + } } @@ -48,35 +55,15 @@ class Jointheclass extends Component { // console.log("加入精品课堂2"); //console.log(this.props.Pathcourseid); return( - -
-

是否确认加入该课堂?

-
- - this.modalCancel()}>取消 - this.setDownload()}>确认 -
-
-
+ this.modalCancel()} + modalSave={()=>this.setDownload()} + > ) } } -export default Jointheclass; \ No newline at end of file +export default Jointheclass; + diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js index 11f56169b..9110f4fcb 100644 --- a/public/react/src/modules/paths/PathDetail/DetailTop.js +++ b/public/react/src/modules/paths/PathDetail/DetailTop.js @@ -527,9 +527,7 @@ class DetailTop extends Component{
{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? -
已结束
:"":""} + {item.course_status.status===2&&item.course_identity<6?
已结束
:""} {item.course_status.status===0? item.course_identity<5?