dev_admin
hjm 6 years ago
parent 2de37f71d2
commit c0458052c7

@ -691,39 +691,42 @@ class MemoDetail extends Component {
<div className="clearfix"> <div className="clearfix">
<div id="forum_list" className="forum_table mh650"> <div id="forum_list" className="forum_table mh650">
<div className="padding40-30 bor-bottom-greyE"> <div className="padding40-30 bor-bottom-greyE">
<div className="font-16 mb5 cdefault clearfix pr pr35"> <div className="font-16 mb5 cdefault clearfix pr pr35" style={{display: 'flex', alignItems: 'center'}}>
<span className="noteDetailTitle">{memo.subject}</span> <span className="noteDetailTitle">{memo.subject}</span>
{ memo.sticky && <span className="btn-cir btn-cir-red ml10 mt10">置顶</span>} { memo.sticky && <span className="btn-cir btn-cir-red ml10 " style={{ height: '20px' }}>置顶</span>}
{ !!memo.reward && <span className="color-orange font-14 ml15" { !!memo.reward && <span className="color-orange font-14 ml15"
data-tip-down={`获得平台奖励金币:${memo.reward}`} > data-tip-down={`获得平台奖励金币:${memo.reward}`} >
<i className="iconfont icon-gift mr5"></i>{memo.reward} <i className="iconfont icon-gift mr5"></i>{memo.reward}
</span> } </span> }
{ _current_user && (_current_user.admin === true || _current_user.user_id === author_info.user_id) &&
<div className="edu-position-hidebox" style={{position: 'absolute', right: '12px',top:'4px'}}> <div style={{ flex: 1 }}>
<a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a> { _current_user && (_current_user.admin === true || _current_user.user_id === author_info.user_id) &&
<ul className="edu-position-hide undis"> <div className="edu-position-hidebox" style={{position: 'absolute', right: '12px',top:'4px'}}>
{ _current_user.admin === true && <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
( memo.sticky === true ? <ul className="edu-position-hide undis">
<li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>取消置顶</a></li> { _current_user.admin === true &&
: ( memo.sticky === true ?
<li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>&nbsp;&nbsp;</a></li> ) <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>取消置顶</a></li>
} :
<li><Link to={`/forums/${memo.id}/edit`}>&nbsp;&nbsp;</Link></li> <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>&nbsp;&nbsp;</a></li> )
<li> }
<a href="javascript:void(0)" onClick={() => <li><Link to={`/forums/${memo.id}/edit`}>&nbsp;&nbsp;</Link></li>
window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗?' , memo)}> <li>
<a href="javascript:void(0)" onClick={() =>
&nbsp;&nbsp;</a> window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗?' , memo)}>
</li>
</ul> &nbsp;&nbsp;</a>
</div> </li>
} </ul>
<Link className={`task-hide fr return_btn color-grey-6 mt2 ${ _current_user && (_current_user.admin === true </div>
|| _current_user.user_id === author_info.user_id) ? '': 'no_mr'} `} to="/forums" }
style={{ marginRight: '10px'}} <Link className={`task-hide fr return_btn color-grey-6 mt2 ${ _current_user && (_current_user.admin === true
> || _current_user.user_id === author_info.user_id) ? '': 'no_mr'} `} to="/forums"
返回 style={{ marginRight: '10px'}}
</Link> >
返回
</Link>
</div>
</div> </div>
<div className="color-grey-9 clearfix"> <div className="color-grey-9 clearfix">
<span className="fl">{moment(memo.time).fromNow()} 发布</span> <span className="fl">{moment(memo.time).fromNow()} 发布</span>
@ -804,7 +807,7 @@ class MemoDetail extends Component {
></Comments> ></Comments>
{ hasMoreComments ? { hasMoreComments ?
<div className="memoMore"> <div className="memoMore" style={{ cursor: 'default' }}>
<a onClick={this.moreMemos}>查看更多评论</a> <a onClick={this.moreMemos}>查看更多评论</a>
<div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div> <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
</div> </div>

@ -27,7 +27,7 @@
cursor: pointer; cursor: pointer;
} }
#forum_list .return_btn.no_mr { #forum_list .return_btn.no_mr {
margin-right: -16px; margin-right: -24px !important;
} }
div#forum_list>div { div#forum_list>div {
background: #fff; background: #fff;

Loading…
Cancel
Save