From fef63f7786a4a81ead58ea8d1c06c8d838769e8f Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 14:15:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=20=E5=AE=9E=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/forums/ForumsIndex.css | 3 + public/react/src/modules/forums/MemoDetail.js | 23 ++++++-- public/react/src/modules/forums/PostItem.js | 4 +- .../src/modules/forums/RecommendShixun.js | 4 +- .../react/src/modules/forums/UserSection.js | 55 ++++++++++++++----- .../src/modules/forums/shixun/MemoShixun.css | 2 +- .../src/modules/forums/shixun/MemoShixun.js | 2 +- .../modules/forums/shixun/ShiXunPostItem.js | 2 +- 8 files changed, 68 insertions(+), 27 deletions(-) diff --git a/public/react/src/modules/forums/ForumsIndex.css b/public/react/src/modules/forums/ForumsIndex.css index c4af188eb..22925f882 100644 --- a/public/react/src/modules/forums/ForumsIndex.css +++ b/public/react/src/modules/forums/ForumsIndex.css @@ -5,6 +5,9 @@ .discuss-tab { height: 90px; } + .discuss-tab ._forum_tab a.navItem { + line-height: 2; + } .discuss-tab ._forum_tab a.navItem:hover { color: #4CACFF !important; border-bottom: none !important; diff --git a/public/react/src/modules/forums/MemoDetail.js b/public/react/src/modules/forums/MemoDetail.js index 15e412981..0b53d9507 100644 --- a/public/react/src/modules/forums/MemoDetail.js +++ b/public/react/src/modules/forums/MemoDetail.js @@ -444,7 +444,7 @@ class MemoDetail extends Component { showSnackbar(response.data.message) return; } - if (response.data.status === 1) { + if (response.data.status === 0) { if (!childCommentId) { comment.hidden = !comment.hidden; @@ -677,7 +677,13 @@ class MemoDetail extends Component { memo.isDetailPage = true; // TODO 图片上传地址 return ( -
{/* fl with100 */} +
{/* fl with100 */} + + {memo.reward} } { _current_user && (_current_user.admin === true || _current_user.user_id === author_info.user_id) && -
+
    { _current_user.admin === true && @@ -713,13 +719,20 @@ class MemoDetail extends Component {
} + || _current_user.user_id === author_info.user_id) ? '': 'no_mr'} `} to="/forums" + style={{ marginRight: '10px'}} + > 返回
{moment(memo.time).fromNow()} 发布 -
+
+ { _current_user.admin && diff --git a/public/react/src/modules/forums/PostItem.js b/public/react/src/modules/forums/PostItem.js index a56badb80..02d9fa273 100644 --- a/public/react/src/modules/forums/PostItem.js +++ b/public/react/src/modules/forums/PostItem.js @@ -29,7 +29,7 @@ class PostItem extends Component { 用户头像
-

+

{/* target="_blank" */} @@ -55,7 +55,7 @@ class PostItem extends Component { {/*C++*/} -

+

{/* data-tip-down="回复数" {memo.replies_count} {memo.praise_count}*/} {memo.replies_count ? diff --git a/public/react/src/modules/forums/RecommendShixun.js b/public/react/src/modules/forums/RecommendShixun.js index 9ebaf3cae..aa9dec952 100644 --- a/public/react/src/modules/forums/RecommendShixun.js +++ b/public/react/src/modules/forums/RecommendShixun.js @@ -33,7 +33,7 @@ class RecommendShixun extends Component {

+ className="color-grey-6 task-hide mb10 recomment-name" style={{maxWidth:'147px'}}> {_shixun.name}

{_shixun.myshixuns_count} 人学习

@@ -50,7 +50,7 @@ class RecommendShixun extends Component { // 参考 TPMShixunDiscuss.js 推荐实训， 页面路径：http://localhost:3007/shixuns/uznmbg54/shixun_discuss return (
-

推荐实训

+

推荐实训

{this.showRecommandShixun()}
diff --git a/public/react/src/modules/forums/UserSection.js b/public/react/src/modules/forums/UserSection.js index 4e8bdb45c..8376a2369 100644 --- a/public/react/src/modules/forums/UserSection.js +++ b/public/react/src/modules/forums/UserSection.js @@ -21,21 +21,46 @@ class UserSection extends Component { const { author_info } = this.props /*http://localhost:3000/api/v1/users/155/watch?object_id=156&object_type=user*/ - const focusUrl = `/api/v1/users/${author_info.user_id}/${this.props.author_info.watched ? 'unwatch' : 'watch'}?object_id=${author_info.user_id}&object_type=user` - - axios.get(focusUrl,{ - }) - .then((response) => { - const status = response.data.status; - console.log(status); - if(status == 1){ - const new_author_info = Object.assign({}, this.props.author_info) - new_author_info.watched = !new_author_info.watched - this.props.initForumState({author_info: new_author_info}) - } - }).catch((error) => { - console.log(error) - }) + // const focusUrl = `/api/v1/users/${author_info.user_id}/${this.props.author_info.watched ? 'unwatch' : 'watch'}?object_id=${author_info.user_id}&object_type=user` + + // axios.get(focusUrl,{ + // }) + // .then((response) => { + // const status = response.data.status; + // console.log(status); + // if(status == 1){ + // const new_author_info = Object.assign({}, this.props.author_info) + // new_author_info.watched = !new_author_info.watched + // this.props.initForumState({author_info: new_author_info}) + // } + // }).catch((error) => { + // console.log(error) + // }) + + let url=`/users/${author_info.user_id}/watch.json`; + // 取消关注 + if(author_info.watched){ + axios.delete(url).then((result)=>{ + if(result){ + const new_author_info = Object.assign({}, this.props.author_info) + new_author_info.watched = !new_author_info.watched + this.props.initForumState({author_info: new_author_info}) + } + }).catch((error)=>{ + console.log(error) + }) + }else{ + // 关注 + axios.post(url).then((result)=>{ + if(result){ + const new_author_info = Object.assign({}, this.props.author_info) + new_author_info.watched = !new_author_info.watched + this.props.initForumState({author_info: new_author_info}) + } + }).catch((error)=>{ + console.log(error); + }) + } } diff --git a/public/react/src/modules/forums/shixun/MemoShixun.css b/public/react/src/modules/forums/shixun/MemoShixun.css index c76000ccf..c1421e02f 100644 --- a/public/react/src/modules/forums/shixun/MemoShixun.css +++ b/public/react/src/modules/forums/shixun/MemoShixun.css @@ -11,7 +11,7 @@ height:48px; width: 48px; float: left; - margin-top: 7px; + margin-top: 4px; } .shixunReply{ max-width: 604px; diff --git a/public/react/src/modules/forums/shixun/MemoShixun.js b/public/react/src/modules/forums/shixun/MemoShixun.js index f82ed2e34..664b844ac 100644 --- a/public/react/src/modules/forums/shixun/MemoShixun.js +++ b/public/react/src/modules/forums/shixun/MemoShixun.js @@ -83,7 +83,7 @@ class MemoShixun extends Component { } const stringifid = queryString.stringify(paramsObject); - const url = `/discusses.json?${stringifid}` // /${challenge.identifier}/star + const url = `/discusses/forum_discusses.json?${stringifid}` // /${challenge.identifier}/star // 获取memo list this.setState({ diff --git a/public/react/src/modules/forums/shixun/ShiXunPostItem.js b/public/react/src/modules/forums/shixun/ShiXunPostItem.js index 1f8c0d379..961e16ff1 100644 --- a/public/react/src/modules/forums/shixun/ShiXunPostItem.js +++ b/public/react/src/modules/forums/shixun/ShiXunPostItem.js @@ -39,7 +39,7 @@ class ShiXunPostItem extends Component width="48px" height="48px" className="radius"/>
-
+

{memo.subject}