Merge remote-tracking branch 'origin/master'

dev_forum
杨树明 5 years ago
commit b9e6fd8e48

@ -139,9 +139,10 @@ class CommonWorkItem extends Component{
}
<div className="flex1" onClick={() => this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>
<p className="clearfix mb20">
{/* 放开点击进入进入后弹框canNotLink ? () => {} : */}
<a title={item.name}
className="fl font-16 font-bd mt2 comnonwidth580" style={{cursor: canNotLink ? 'normal' : 'poninter'}}
onClick={canNotLink ? () => {} : () => this.onItemClick(item)}
onClick={() => this.onItemClick(item)}
>{item.name}</a>
{/* 只有非课堂成员且作业是私有的情况下才会为true */}

@ -35,15 +35,13 @@ class PollListItem extends Component{
}
<div className="flex1 pr">
<p className="clearfix mb30">
{
//非课堂成员(未登录的用户)且课堂未公开
courseType && courseType.user_permission == 0 && item.lock_status == 0 ?
<a className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}} title={item.polls_name}>{item.polls_name}</a>
:
<Link to={`/courses/${coursesId}/polls/${item.id}/detail`} className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}} title={item.polls_name}>{item.polls_name}</Link>
}
{
item.lock_status === 0 ? <Tooltip title={`${courseType.user_permission == 0 ? "私有属性,非课堂成员不能访问" : "私有属性"}`}><i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i></Tooltip>:""
item.lock_status === 0 ?
<Tooltip title={`${courseType.user_permission == 0 ? "私有属性,非课堂成员不能访问" : "私有属性"}`}>
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
</Tooltip>
:""
}
<CoursesListType typelist={[polls_status[`${item.polls_status}`]]} typesylename={""}></CoursesListType>
{

@ -316,7 +316,7 @@ class LoginDialog extends Component {
// // return Promise.reject(error);
});
}
handleDialogClose() {
handleDialogClose = () => {
if(this.props.match.path==="/"){
this.setState({
isRender: false

@ -211,7 +211,7 @@ class Infos extends Component{
return(
<div className="newMain">
{
isRenders && <Trialapplication {...this.state} Cancel={() => this.cancelModulationModels()}/>
isRenders && <Trialapplication {...this.props} {...this.state} Cancel={() => this.cancelModulationModels()}/>
}
<div className="user-main-half">
<div className="user-headImg"></div>

Loading…
Cancel
Save