m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'dev_Ysl' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

Browse Source
dev_oauth
杨树林 6 years ago
parent dc931ec403 91d4803a84
commit a24f0613a4
8 changed files with 94 additions and 56 deletions
Show Stats Download Patch File Download Diff File

6
public/react/src/modules/courses/Index.js
Unescape View File

@ -72,7 +72,7 @@ const WrappedCoursesNewApp= Loadable({
loader: () => import('./new/CoursesNew'), loader: () => import('./new/CoursesNew'),
loading: Loading, loading: Loading,
}) })
//新建金品课堂 //新建精品课堂
const WrappedCoursesNewAppGoldclass= Loadable({ const WrappedCoursesNewAppGoldclass= Loadable({
loader: () => import('./new/Goldsubject'), loader: () => import('./new/Goldsubject'),
loading: Loading, loading: Loading,
@ -825,7 +825,7 @@ class CoursesIndex extends Component{
(props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} />) (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} />)
} }
></Route> ></Route>
{/*新建金品课堂*/} {/*新建精品课堂*/}
{/*coursesId 课堂id */} {/*coursesId 课堂id */}
{/*id 是否是私有或者公有*/} {/*id 是否是私有或者公有*/}
<Route path="/courses/:subjectid/newgold/:id" <Route path="/courses/:subjectid/newgold/:id"
@ -833,7 +833,7 @@ class CoursesIndex extends Component{
(props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} />) (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} />)
} }
></Route> ></Route>
{/*修改金品课堂*/} {/*修改精品课堂*/}
<Route path="/courses/:coursesId/newgolds/settings/:id" <Route path="/courses/:coursesId/newgolds/settings/:id"
render={ render={
(props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} />) (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} />)

4
public/react/src/modules/courses/coursesDetail/CoursesBanner.js
Unescape View File

@ -46,7 +46,7 @@ class CoursesBanner extends Component {
antIcon:false, antIcon:false,
coursedata:undefined, coursedata:undefined,
is_guide:false, is_guide:false,
excellent:false,//是否是金品课堂 excellent:false,//是否是精品课堂
yslJointhe:false, yslJointhe:false,
} }
} }
@ -111,7 +111,7 @@ class CoursesBanner extends Component {
}; };
//金品课堂的弹框 //精品课堂的弹框
myyslgradin=()=>{ myyslgradin=()=>{
this.setState({ this.setState({
yslJointhe:true yslJointhe:true

2
public/react/src/modules/courses/new/Goldsubject.js
Unescape View File

@ -99,7 +99,7 @@ class Goldsubject extends Component {
}; };
componentDidMount() { componentDidMount() {
console.log("新建金品课堂的数据"); console.log("新建精品课堂的数据");
console.log(this.props); console.log(this.props);
let coursesId = this.props.match.params.coursesId; let coursesId = this.props.match.params.coursesId;

17
public/react/src/modules/modals/Jointheclass.js
Unescape View File

@ -1,7 +1,7 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Modal} from 'antd'; import { Modal} from 'antd';
import axios from 'axios'; import axios from 'axios';
//加入金品课堂 //加入精品课堂
class Jointheclass extends Component { class Jointheclass extends Component {
constructor(props) { constructor(props) {
@ -9,7 +9,7 @@ class Jointheclass extends Component {
} }
componentDidMount() { componentDidMount() {
// console.log("加入金品课堂"); // console.log("加入精品课堂");
// console.log(this.props); // console.log(this.props);
} }
@ -19,9 +19,8 @@ class Jointheclass extends Component {
}; };
setDownload=()=>{ setDownload=()=>{
var id=this.props.match.params.coursesId let id=this.props.Pathcourseid===undefined?this.props.match.params.coursesId:this.props.Pathcourseid
let url = `/courses/${id}/join_excellent_course.json`;
var url = `/courses/${id}/join_excellent_course.json`;
axios.post(url).then((result) => { axios.post(url).then((result) => {
if(result){ if(result){
if(result.data){ if(result.data){
@ -42,8 +41,8 @@ class Jointheclass extends Component {
render() { render() {
// console.log("加入金品课堂2"); // console.log("加入精品课堂2");
// console.log(this.props); //console.log(this.props.Pathcourseid);
return( return(
<Modal <Modal
keyboard={false} keyboard={false}
@ -56,8 +55,8 @@ class Jointheclass extends Component {
width="600px" width="600px"
> >
<div className="educouddiv"> <div className="educouddiv">
<div className={"tabeltext-alignleft"}><p style={{fontSize: "16px",marginTop:"46px"}}>是否确认该加入课堂?</p></div> <div className={"tabeltext-alignleft"}><p style={{fontSize: "16px",marginTop:"20px"}}>是否确认该加入课堂?</p></div>
<div className="clearfix edu-txt-center" style={{marginTop:"98px"}}> <div className="clearfix edu-txt-center" style={{marginTop:"20px"}}>
<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a> <a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>确认</a> <a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>确认</a>
</div> </div>

10
public/react/src/modules/paths/PathDetail/DetailTop.css
Unescape View File

@ -43,4 +43,14 @@
.solidright{ .solidright{
border-right: 1px solid #000; border-right: 1px solid #000;
height: 42px; 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;
} }

50
public/react/src/modules/paths/PathDetail/DetailTop.js
Unescape View File

@ -5,6 +5,7 @@ import SendPanel from "./sendPanel.js";
import { getImageUrl } from 'educoder'; import { getImageUrl } from 'educoder';
import axios from 'axios'; import axios from 'axios';
import Modals from '../../modals/Modals'; import Modals from '../../modals/Modals';
import Jointheclass from '../../modals/Jointheclass'
import './DetailTop.css'; import './DetailTop.css';
const Search = Input.Search; const Search = Input.Search;
@ -22,7 +23,8 @@ class DetailTop extends Component{
deletepathtype:false, deletepathtype:false,
cardsModalsavetype:false, cardsModalsavetype:false,
MenuItemskey:1, MenuItemskey:1,
courseslist:[] courseslist:[],
Pathcourseid:undefined
} }
} }
componentDidMount(){ componentDidMount(){
@ -37,7 +39,6 @@ class DetailTop extends Component{
this.setState({ this.setState({
courseslist:courseslist courseslist:courseslist
}) })
console.log(courseslist)
} }
allow_deletepath=()=>{ allow_deletepath=()=>{
this.setState({ this.setState({
@ -171,15 +172,31 @@ class DetailTop extends Component{
) )
} }
}) })
console.log(courseslist)
this.setState({ this.setState({
MenuItemskey:keys, MenuItemskey:keys,
courseslist:courseslist 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{detailInfoList}=this.props;
let{Modalstype,Modalstopval,cardsModalcancel,cardsModalsave,Modalsbottomval,cardsModalsavetype,loadtype}=this.state; let{Modalstype,Modalstopval,cardsModalcancel,cardsModalsave,Modalsbottomval,cardsModalsavetype,loadtype}=this.state;
const radioStyle = { const radioStyle = {
@ -219,6 +236,7 @@ class DetailTop extends Component{
loadtype={loadtype} loadtype={loadtype}
> >
</Modals> </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"}>*/} {/*<div className={this.props.courses===undefined||this.props.courses.length===0?"subhead_content":"subhead_content pt100"}>*/}
{ {
detailInfoList && detailInfoList &&
@ -442,27 +460,25 @@ class DetailTop extends Component{
detailInfoList.is_creator===true?<a className="mr30 shixun_detail pointer fl user-colorgrey-9b">已结束</a>:item.course_identity<6? detailInfoList.is_creator===true?<a className="mr30 shixun_detail pointer fl user-colorgrey-9b">已结束</a>:item.course_identity<6?
<a className="mr30 shixun_detail pointer fl user-colorgrey-9b">已结束</a>:"":""} <a className="mr30 shixun_detail pointer fl user-colorgrey-9b">已结束</a>:"":""}
{item.course_status.status===0? {item.course_status.status===0?
detailInfoList.is_creator===true?<a className="fr user_default_btn task-btn-orange font-18 mt25" href={item.first_category_url} target="_blank"> detailInfoList.is_creator===true?<a className="fr user_default_btn task-btn-orange font-18 mt28" href={item.first_category_url} target="_blank">
进入课堂 进入课堂
</a>:item.course_identity<6?<div className="fr user_default_btn background191 font-18 mt25">报名成功</div> </a>:item.course_identity<6?<div className="fr user_default_btn background191 font-18 mt28">报名成功</div>
:<a className="fr user_default_btn task-btn-orange font-18 mt25" >立即报名</a>:""} :<a className="fr user_default_btn task-btn-orange font-18 mt28" onClick={()=>this.JoinnowCourse(item.course_id)}>立即报名</a>:""}
{item.course_status.status===1? {item.course_status.status===1?
detailInfoList.is_creator===true?<a className="fr user_default_btn task-btn-orange font-18 mt25" href={item.first_category_url} target="_blank"> detailInfoList.is_creator===true?<a className="fr user_default_btn task-btn-orange font-18 mt28" href={item.first_category_url} target="_blank">
进入课堂 进入课堂
</a>:item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt25" href={item.first_category_url} target="_blank"> </a>:item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28" href={item.first_category_url} target="_blank">
立即学习 立即学习
</a>:<a className="fr user_default_btn task-btn-orange font-18 mt25" >立即加入</a>:""} </a>:<a className="fr user_default_btn task-btn-orange font-18 mt28" onClick={()=>this.JoinnowCourse(item.course_id)}>立即加入</a>:""}
{item.course_status.status===2? {item.course_status.status===2?
detailInfoList.is_creator===true?<a className="fr user_default_btn task-btn-orange font-18 mt25" href={item.first_category_url} target="_blank"> detailInfoList.is_creator===true?<a className="fr user_default_btn task-btn-orange font-18 mt28" href={item.first_category_url} target="_blank">
进入课堂 进入课堂
</a>:item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt25" href={item.first_category_url} target="_blank"> </a>:item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28" href={item.first_category_url} target="_blank">
进入课堂 进入课堂
</a>:<div className="fr user_default_btn background191 font-18 mt25">已结束</div>:""} </a>:<div className="fr user_default_btn background191 font-18 mt28">已结束</div>:""}
</div> </div>
)})} )})}

52
public/react/src/modules/paths/PathDetail/PathDetailIndex.js
Unescape View File

@ -170,31 +170,35 @@ class PathDetailIndex extends Component{
} }
componentDidMount(){ componentDidMount(){
let pathid=this.props.match.params.pathId; this.getdatasindex()
let url="/paths/"+pathid+".json"; }
axios.get(url).then((result)=>{
if (result.data.status === 407 || result.data.status === 401) {
debugger
return;
}
if (result.data.status === 403) { getdatasindex=()=>{
debugger let pathid=this.props.match.params.pathId;
// window.location.href = "/403"; let url="/paths/"+pathid+".json";
return; axios.get(url).then((result)=>{
} if (result.data.status === 407 || result.data.status === 401) {
debugger
return;
}
if(result.data.allow_visit===true){ if (result.data.status === 403) {
this.setState({ debugger
detailInfoList:result.data, // window.location.href = "/403";
// courses:result.data.courses return;
// items: getItems(result.data.members.length), }
})
}
}).catch((error)=>{ if(result.data.allow_visit===true){
console.log(error); 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"; let righturl="/paths/"+pathid+"/right_banner.json";
@ -221,7 +225,7 @@ class PathDetailIndex extends Component{
}).catch((error)=>{ }).catch((error)=>{
console.log(error); console.log(error);
}) })
} }
updatadetailInfoList=()=>{ updatadetailInfoList=()=>{
let pathid=this.props.match.params.pathId; let pathid=this.props.match.params.pathId;
@ -416,7 +420,7 @@ class PathDetailIndex extends Component{
> >
</Modals> </Modals>
<div className="newMain clearfix"> <div className="newMain clearfix">
<DetailTop {...this.state} {...this.props}></DetailTop> <DetailTop {...this.state} {...this.props} getdatasindex={()=>this.getdatasindex()}></DetailTop>
<div className="educontent clearfix mb80"> <div className="educontent clearfix mb80">
<div className="with65 fl"> <div className="with65 fl">
<div className="produce-content mb10"> <div className="produce-content mb10">

9
public/react/src/modules/tpm/SiderBar.js
Unescape View File

@ -106,6 +106,15 @@ class SiderBar extends Component {
<span className="inline"><i className="iconfont icon-erweima color-white font-22 fl"></i></span> <span className="inline"><i className="iconfont icon-erweima color-white font-22 fl"></i></span>
<p className="scan_ewm" style={{display: 'none', right:' 75px',opacity: '0'}}> <p className="scan_ewm" style={{display: 'none', right:' 75px',opacity: '0'}}>
<p className="pr padding10"> <p className="pr padding10">
<style>
{
`
p{
margin-bottom: 0 !important;
}
`
}
</style>
<img src={getImageUrl("images/edu_user/EWM.jpg")} width="158px" height="158px" /> <img src={getImageUrl("images/edu_user/EWM.jpg")} width="158px" height="158px" />
<p>微信扫一扫</p> <p>微信扫一扫</p>
<p>关注公众号</p> <p>关注公众号</p>

Write Preview
Loading…
Cancel
Save