diff --git a/public/react/src/modules/modals/Jointheclass.js b/public/react/src/modules/modals/Jointheclass.js
index 3d1eeb384..1150e178b 100644
--- a/public/react/src/modules/modals/Jointheclass.js
+++ b/public/react/src/modules/modals/Jointheclass.js
@@ -55,8 +55,17 @@ class Jointheclass extends Component {
width="600px"
>
<div className="educouddiv">
- <div className={"tabeltext-alignleft"}><p style={{fontSize: "16px",marginTop:"20px"}}>是否确认该加入课堂?</p></div>
- <div className="clearfix edu-txt-center" style={{marginTop:"20px"}}>
+ <div className={"tabeltext-alignleft"}><p className={"mt20 font-16"}>是否确认该加入课堂?</p></div>
+ <div className="clearfix edu-txt-center mt20">
+ <style>
+ {
+ `
+ a:hover {
+ color: #fff !important;
+ }
+ `
+ }
+ </style>
<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>确认</a>
</div>
diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.css b/public/react/src/modules/paths/PathDetail/DetailTop.css
index 17fdf3996..488e5569d 100644
--- a/public/react/src/modules/paths/PathDetail/DetailTop.css
+++ b/public/react/src/modules/paths/PathDetail/DetailTop.css
@@ -50,7 +50,7 @@
}
.ant-modal-title {
font-size: 16px;
- font-weight: 700!important;
+ font-weight: 500!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 6270ffb06..f405a814d 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 OpenCourse from './OpenCourse';
import Jointheclass from '../../modals/Jointheclass'
import './DetailTop.css';
@@ -24,18 +25,21 @@ class DetailTop extends Component{
cardsModalsavetype:false,
MenuItemskey:1,
courseslist:[],
- Pathcourseid:undefined
+ Pathcourseid:undefined,
+ OpenCourseTypes:false
}
}
componentDidMount(){
let courseslist=[]
- this.props.courses.map((item,key)=>{
- if(1===key+1){
- return(
- courseslist.push(item)
- )
- }
- })
+ if(this.props.courses!=undefined&&this.props.courses.length!=0){
+ this.props.courses.map((item,key)=>{
+ if(1===key+1){
+ return(
+ courseslist.push(item)
+ )
+ }
+ })
+ }
this.setState({
courseslist:courseslist
})
@@ -196,21 +200,28 @@ class DetailTop extends Component{
this.props.getdatasindex()
};
+ OpenCoursefun=()=>{
+ this.setState({
+ OpenCourseTypes:true
+ })
+ }
+ OpenCourseCancel=()=>{
+ this.setState({
+ OpenCourseTypes:false
+ })
+ }
render(){
let{detailInfoList}=this.props;
- let{Modalstype,Modalstopval,cardsModalcancel,cardsModalsave,Modalsbottomval,cardsModalsavetype,loadtype}=this.state;
+ let{Modalstype,Modalstopval,cardsModalcancel,OpenCourseTypes,Modalsbottomval,cardsModalsavetype,loadtype}=this.state;
const radioStyle = {
display: 'block',
height: '30px',
lineHeight: '30px',
};
-
- // <div className={this.props.courses===undefined||this.props.courses.length===0?"subhead":"subhead mb70"}>
-
let menu = (
<Menu>
- {this.props.courses&&this.props.courses.map((item,key)=>{
+ {this.props.courses===undefined||this.props.courses.length===0?"":this.props.courses.map((item,key)=>{
return(
<Menu.Item>
<a rel="noopener noreferrer" onClick={()=>this.MenuItems(key+1)}>
@@ -226,7 +237,7 @@ class DetailTop extends Component{
return(
- <div className={this.props.courses===undefined?"subhead":"subhead mb70"}>
+ <div className={this.props.courses===undefined||this.props.courses.length===0?"subhead":"subhead mb70"}>
<Modals
modalsType={Modalstype}
modalsTopval={Modalstopval}
@@ -236,11 +247,12 @@ class DetailTop extends Component{
loadtype={loadtype}
>
</Modals>
- <Jointheclass {...this.props} {...this.state} ysljoinmodalCancel={()=>this.ysljoinmodalCancel()} ysljoinmodalCanceltwo={()=>this.ysljoinmodalCanceltwo()}></Jointheclass>
- {/*<div className={this.props.courses===undefined||this.props.courses.length===0?"subhead_content":"subhead_content pt100"}>*/}
+ {this.state.yslJointhe===true?<Jointheclass {...this.props} {...this.state} ysljoinmodalCancel={()=>this.ysljoinmodalCancel()} ysljoinmodalCanceltwo={()=>this.ysljoinmodalCanceltwo()}></Jointheclass>:""}
+ {this.state.OpenCourseTypes===true?<OpenCourse {...this.props} {...this.state} OpenCourseCancel={()=>this.OpenCourseCancel()}/>:""}
+
{
detailInfoList &&
- <div className={this.props.courses===undefined?"subhead_content":"subhead_content pt100"}>
+ <div className={this.props.courses===undefined||this.props.courses.length===0?"subhead_content":"subhead_content pt100"}>
<div className="font-28 color-white clearfix">
<span className="fl lineh-40">
{detailInfoList.name}
@@ -326,7 +338,7 @@ class DetailTop extends Component{
{this.props.courses===undefined?"":detailInfoList.is_creator===true?<div className="fr pr">
- <a className={"fl font-18 color-white mt5 kaike mr20"}>开课</a>
+ <a className={"fl font-18 color-white mt5 kaike mr20"} onClick={()=>this.OpenCoursefun()}>开课</a>
<Link to={"/paths/"+this.props.match.params.pathId+"/statistics"} className="fl font-18 color-white mt5 kaike">
学习统计
</Link>
@@ -334,8 +346,7 @@ class DetailTop extends Component{
</div>
- {/*{this.props.courses===undefined||this.props.courses.length===0?"":<div className="userNavs mt20">*/}
- {this.props.courses===undefined?"":<div className="userNavs mt20">
+ {this.props.courses===undefined||this.props.courses.length===0?"":<div className="userNavs mt20">
<li className={"fl"}>
<style>
@@ -391,10 +402,6 @@ class DetailTop extends Component{
</style>
<li className={"ml20"}>
{this.state.courseslist.map((item,key)=>{
- // course_id: 1309
- // course_identity: 5
- // course_status: {status: 1, time: "进行至第5周，共1642周"}
- // first_category_url: "/courses/1309/informs"
return(
<div className={"ant-breadcrumb pdt28"} key={key}>
<span>
@@ -467,7 +474,7 @@ class DetailTop extends Component{
:<a className="fr user_default_btn task-btn-orange font-18 mt28" onClick={()=>this.JoinnowCourse(item.course_id)}>立即报名</a>:""}
{item.course_status.status===1?
- detailInfoList.is_creator===true?<a className="fr user_default_btn task-btn-orange font-18 mt28" href={item.first_category_url} target="_blank">
+ detailInfoList.is_creator===true?<a className="fr user_default_btn task-btn-orange font-18 mt28" onClick={()=>this.JoinnowCourse(item.course_id)}>
进入课堂
</a>:item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28" href={item.first_category_url} target="_blank">
立即学习
diff --git a/public/react/src/modules/paths/PathDetail/OpenCourse.js b/public/react/src/modules/paths/PathDetail/OpenCourse.js
new file mode 100644
index 000000000..b64b9e9e7
--- /dev/null
+++ b/public/react/src/modules/paths/PathDetail/OpenCourse.js
@@ -0,0 +1,99 @@
+import React, { Component } from 'react';
+import { Modal, Radio, Input} from 'antd';
+import axios from 'axios';
+//加入精品课堂
+class OpenCourse extends Component {
+
+ constructor(props) {
+ super(props);
+ this.state={
+ value:0
+ }
+ }
+
+ componentDidMount() {
+ // console.log("加入精品课堂");
+ // console.log(this.props);
+
+ }
+
+ modalCancel=()=>{
+ this.props.OpenCourseCancel();
+ };
+
+ setDownload=()=>{
+ let {value}=this.state;
+ console.log(this.props.match.params.pathId)
+
+ if(value===0){
+ window.open(`/courses/${this.props.match.params.pathId}/newgold/0 `);
+ }else{
+ window.open(`/courses/${this.props.match.params.pathId}/newgold/1`);
+ }
+ this.props.OpenCourseCancel();
+ }
+ setpathradioChange = e => {
+
+ this.setState({
+ value: e.target.value,
+ });
+ };
+
+ render() {
+ // console.log("加入精品课堂2");
+ //console.log(this.props.Pathcourseid);
+ const pathradioStyle = {
+ display: 'block',
+ height: '30px',
+ lineHeight: '30px',
+ color:'#05101A',
+ textAlign: 'left',
+ fontSize: '16px'
+ };
+ const pathradioStyles={
+ color:'#999999'
+ }
+ return(
+ <Modal
+ keyboard={false}
+ closable={false}
+ footer={null}
+ destroyOnClose={true}
+ title="选择课堂性质"
+ centered={true}
+ visible={this.props.OpenCourseTypes===undefined?false:this.props.OpenCourseTypes}
+ width="600px"
+ >
+ <div className="educouddiv">
+ <div className={"tabeltext-alignleft"}>
+ <p className={"mt20 mb20 font-16"}>
+ <Radio.Group onChange={this.setpathradioChange} value={this.state.value}>
+ <Radio style={pathradioStyle} value={0}>
+ 开放课堂：<span style={pathradioStyles}>所有用户可以随时访问</span>
+ </Radio>
+ <Radio style={pathradioStyle} value={1}>
+ 私有课堂：<span style={pathradioStyles}>仅报名参与的课堂成员可以访问</span>
+ </Radio>
+ </Radio.Group>
+ </p>
+ </div>
+ <style>
+ {
+ `
+ a:hover {
+ color: #fff !important;
+ }
+ `
+ }
+ </style>
+ <div className="clearfix edu-txt-center mt20">
+ <a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
+ <a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>确认</a>
+ </div>
+ </div>
+ </Modal>
+ )
+ }
+}
+
+export default OpenCourse;
\ No newline at end of file
diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
index 0ee4a3904..4f92e5841 100644
--- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
+++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js
@@ -81,32 +81,7 @@ class PathDetailIndex extends Component{
cardsModalsave:this.cardsModalsave,
user_id:undefined,
loadtype:false,
- courses:[
- {
- course_id: 1309,
- first_category_url: "/courses/1309/informs",
- start_date: "2019-07-16", // 开始时间
- end_date: "2050-12-31", // 结束时间
- student_count: 112, // 学习人数
- course_identity: 5, // 当前用户在该课堂的身份
- course_status: {
- status: 1, // status：0：即将开课 1：进行中 2：已结束
- time: "进行至第5周，共1642周" // time：当前进度
- }
- },
- {
- course_id: 1319,
- first_category_url: "/courses/1319/shixun_homeworks/11549",
- start_date:"2019-08-16",
- end_date:"2050-12-31",
- student_count: 112,
- course_identity: 1,
- course_status: {
- status: 0,
- time: ""
- }
- }
- ],
+ courses:undefined,
items: getItems(10)
}
this.onDragEnd = this.onDragEnd.bind(this);
diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index 11369024d..beab18fdc 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/public/react/src/modules/tpm/SiderBar.js
@@ -109,15 +109,15 @@ class SiderBar extends Component {
<style>
{
`
- p{
+ .WeChatstyle{
margin-bottom: 0 !important;
}
`
}
</style>
<img src={getImageUrl("images/edu_user/EWM.jpg")} width="158px" height="158px" />
- <p>微信扫一扫</p>
- <p>关注公众号</p>
+ <p className={"WeChatstyle"}>微信扫一扫</p>
+ <p className={"WeChatstyle"}>关注公众号</p>
<span className="trangle_right"></span>
</p>
</p>