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

public/react/src/modules/forums/MemoDetail.js

@@ -691,39 +691,42 @@ class MemoDetail extends Component {
           <div className="clearfix">
         		<div id="forum_list" className="forum_table mh650">
     	        	<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>
-                            { 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"
                               data-tip-down={`获得平台奖励金币：${memo.reward}`} >
                               <i className="iconfont icon-gift mr5"></i>{memo.reward}
                             </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'}}>
-                                    <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
-                                    <ul className="edu-position-hide undis">
-                                  { _current_user.admin === true &&
-                                      ( memo.sticky === true ?
-                                          <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>取消置顶</a></li>
-                                          :
-                                          <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>置&nbsp;&nbsp;顶</a></li> )
-                                      }
-                                        <li><Link to={`/forums/${memo.id}/edit`}>编&nbsp;&nbsp;辑</Link></li>
-                                        <li>
-                                            <a href="javascript:void(0)" onClick={() =>
-                                                window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗？' , memo)}>
-
-                                            删&nbsp;&nbsp;除</a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            }
-                            <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>
+
+                            <div style={{ flex: 1 }}>
+                              { _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'}}>
+                                      <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>
+                                      <ul className="edu-position-hide undis">
+                                    { _current_user.admin === true &&
+                                        ( memo.sticky === true ?
+                                            <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>取消置顶</a></li>
+                                            :
+                                            <li><a href="javascript:void(0);" onClick={() => this.setTop(memo)}>置&nbsp;&nbsp;顶</a></li> )
+                                        }
+                                          <li><Link to={`/forums/${memo.id}/edit`}>编&nbsp;&nbsp;辑</Link></li>
+                                          <li>
+                                              <a href="javascript:void(0)" onClick={() =>
+                                                  window.delete_confirm_box_2_react(`onMemoDelete`, '您确定要删除吗？' , memo)}>
+
+                                              删&nbsp;&nbsp;除</a>
+                                          </li>
+                                      </ul>
+                                  </div>
+                              }
+                              <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>
+                            </div>
                         </div>
                         <div className="color-grey-9 clearfix">
                             <span className="fl">{moment(memo.time).fromNow()} 发布</span>
@@ -804,7 +807,7 @@ class MemoDetail extends Component {
 
                       ></Comments>
                       { hasMoreComments ? 
-                        <div className="memoMore">
+                        <div className="memoMore" style={{ cursor: 'default' }}>
                           <a onClick={this.moreMemos}>查看更多评论</a>
                           <div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
                         </div> 

public/react/src/modules/forums/Post.css

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

public/react/src/modules/forums/PostPaginationHOC.js

@@ -126,7 +126,7 @@ return function wrap(WrappedComponent) {
 	      	}
 	      	const orderTypeMap = {
 	      		'hottest': 'replies_count',
-	      		'newest': 'updated_at', // 'created_at',
+	      		'newest': 'created_at', // 'created_at',
 	      	}
 	      	const _search = this.props.history.location.search;
 		    const parsed = queryString.parse(_search);