sso^2
杨树明 5 years ago
parent d7c1f82c1f
commit 9cf8efebc8

@ -367,10 +367,10 @@ const JupyterTPI = Loadable({
loading: Loading loading: Loading
}); });
// 微信代码编辑器 // 微信代码编辑器
// const WXCode = Loadable({ const WXCode = Loadable({
// loader: () => import('./modules/wxcode'), loader: () => import('./modules/wxcode'),
// loading: Loading loading: Loading
// }); });
// //个人竞赛报名 // //个人竞赛报名
// const PersonalCompetit = Loadable({ // const PersonalCompetit = Loadable({
// loader: () => import('./modules/competition/personal/PersonalCompetit.js'), // loader: () => import('./modules/competition/personal/PersonalCompetit.js'),
@ -828,11 +828,11 @@ class App extends Component {
render={ render={
(props) => (<Headplugselection {...this.props} {...props} {...this.state} />) (props) => (<Headplugselection {...this.props} {...props} {...this.state} />)
}/> }/>
{/*<Route path="/wxcode/:identifier?" component={WXCode} */} <Route path="/wxcode/:identifier?" component={WXCode}
{/* render={*/} render={
{/* (props)=>(<WXCode {...this.props} {...props} {...this.state}></WXCode>)*/} (props)=>(<WXCode {...this.props} {...props} {...this.state}></WXCode>)
{/* }*/} }
{/*/>*/} />
<Route exact path="/" <Route exact path="/"
// component={ShixunsHome} // component={ShixunsHome}
render={ render={

@ -46,7 +46,7 @@ if (isDev) {
// 老师 // 老师
//debugType="teacher"; //debugType="teacher";
// 学生 // 学生
//debugType="student"; debugType="student";

@ -387,16 +387,7 @@ class ShixunhomeWorkItem extends Component{
{this.props.isStudent===true?this.props.course_identity===5?discussMessage&&discussMessage.shixun_status>1? {this.props.isStudent===true?this.props.course_identity===5?discussMessage&&discussMessage.shixun_status>1?
discussMessage.time_status<5? discussMessage.time_status<5?
<WordsBtn style="blue" className="colorblue font-16 mr20 fr mt2 "> <WordsBtn style="blue" className="colorblue font-16 mr20 fr mt2 ">
{startbtn===false? <Link className="btn colorblue font-16 fontweight400" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>进入学习</Link>
(discussMessage.task_operation[0] == '进入学习' || discussMessage.task_operation[0] == '进入学习' ?
<a className="btn colorblue" href={getTaskUrlById(discussMessage.task_operation[1])}>
{/*{discussMessage.task_operation[0]}*/}
进入学习
</a>
:
<a className="btn colorblue" onClick={()=>this.taskoperationId(discussMessage.task_operation[1])}>
进入学习
</a>):<a className="btn colorblue" ></a>}
</WordsBtn>:"":"":"":"" </WordsBtn>:"":"":"":""
} }

Loading…
Cancel
Save