Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

dev_aliyun_beta
cxt 6 years ago
commit f689e24e00

@ -740,7 +740,7 @@ render(){
<div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '147px' }} <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '147px' }}
title={item.group_name && item.group_name.length > 9 ? item.group_name : ''} title={item.group_name && item.group_name.length > 9 ? item.group_name : ''}
>{item.group_name}</div> >{item.group_name}</div>
<div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '84px' }} <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '99px' }}
title={item.student_id && item.student_id.length > 12 ? item.student_id : ''} title={item.student_id && item.student_id.length > 12 ? item.student_id : ''}
>{item.student_id}</div> >{item.student_id}</div>
<div className={"fl ml20"}>{item.commit_status===true?<span className={"color-orange"}>已提交</span> :""}</div> <div className={"fl ml20"}>{item.commit_status===true?<span className={"color-orange"}>已提交</span> :""}</div>
@ -784,7 +784,7 @@ render(){
<div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '147px' }} <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '147px' }}
title={item.group_name && item.group_name.length > 9 ? item.group_name : ''} title={item.group_name && item.group_name.length > 9 ? item.group_name : ''}
>{item.group_name}</div> >{item.group_name}</div>
<div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '84px' }} <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{ maxWidth: '99px' }}
title={item.student_id && item.student_id.length > 12 ? item.student_id : ''} title={item.student_id && item.student_id.length > 12 ? item.student_id : ''}
>{item.student_id}</div> >{item.student_id}</div>
{item.user_id != this.props.current_user.user_id ? {item.user_id != this.props.current_user.user_id ?

@ -633,6 +633,9 @@ class MemoNew extends Component {
}; };
return ( return (
<div > <div >
<p className="clearfix mb10 undefined cBreadcrumb"><a className="btn colorgrey fl hovercolorblue"
href="/forums">交流问答</a><span
className="color-grey-9 fl ml3 mr3"> / </span><span></span></p>
<div className="pt20 pl20 pr20 pb20 bor-bottom-greyE clearfix" style={{background: '#fff'}}> <div className="pt20 pl20 pr20 pb20 bor-bottom-greyE clearfix" style={{background: '#fff'}}>
<span className="fl font-16">{ memoId ? '编辑话题' : '发布话题'}</span> <span className="fl font-16">{ memoId ? '编辑话题' : '发布话题'}</span>
{/*<a href="/shixuns/mf98sgi3/settings" className="ring-green mt7 fr" id="edit_setting" {/*<a href="/shixuns/mf98sgi3/settings" className="ring-green mt7 fr" id="edit_setting"

Loading…
Cancel
Save