From dfcfcbd3acd9f677541e99eb87d0ee6d2c028f35 Mon Sep 17 00:00:00 2001 From: wyx Date: Sat, 11 Feb 2023 16:39:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1-=E8=AF=84=E8=AE=BA=E5=88=97=E8=A1=A8-?= =?UTF-8?q?=E5=8F=91=E8=A1=A8=E5=B8=96=E5=AD=90=E3=80=81=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E8=AF=A6=E6=83=85-=E5=B8=96=E5=AD=90=E5=B1=95=E7=A4=BA-?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA-=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0-=E5=9B=9E=E5=A4=8D=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 17 +- src/components/img/UploadPostImg.vue | 81 ++++++++++ src/views/discuss/DiscussPage.vue | 116 ++++---------- src/views/discussdetail/DiscussDetail.vue | 179 +++++++++++++++------- vite.config.js | 29 ++++ 5 files changed, 275 insertions(+), 147 deletions(-) create mode 100644 src/components/img/UploadPostImg.vue diff --git a/src/api/api.js b/src/api/api.js index 3f2d257..5ebe3c9 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -11,6 +11,7 @@ export const USER_INFO = '/admin/CheckUser/userInfo' // export const FILE_UPLOAD = 'http://143.143.139.204:30001/file/upload' export const FILE_UPLOAD = import.meta.env.VITE_BASE_API + '/file/uploadFile' export const FILE_UPLOAD_ANNEX = import.meta.env.VITE_BASE_API + '/file/stuUploadAnnex' +export const FILE_UPLOAD_IMG = import.meta.env.VITE_BASE_API + '/file/img' export const COMMON_TOKEN = 'https://upload-z2.qiniup.com' export const ROUTER_CHAPTER_LIST = '/stu/router/chapterList' export const ROUTER_LIST = '/stu/router/list post' @@ -51,7 +52,7 @@ export const VOTE_DETAIL2 = `/voteSubmit/queryVoteTaskDetailById post` // 投票详情接口 export const VOTE_DETAIL_SUBMIT = `/voteSubmit/vote/commit post` -export const COMMENT_ADD = '/comment post' +export const COMMENT_ADD = '/comment/add post' export const COMMENT_PRAISE = '/comment/praise post' export const COMMENT_COLLECTION = '/comment/collection post' @@ -100,13 +101,21 @@ export const PostAdd = `/statement/add post` // 帖子收藏 export const PostCollection = `/statement/collection post` // 帖子删除 -export const PostDelete = postId => `/statement/delete/?id=${postId} post` -// 查询讨论下的帖子 -export const PostList = `/statement/list` +export const PostDelete = postId => `/statement/delete?id=${postId} post` // 贴子点赞 export const PostPraise = `/statement/praise post` // 帖子更新 export const PostUpdate = `/statement/update post` +// 帖子详情查询 +export const PostDetails = `/statement/info` +// 查询帖子的评论 +export const GetComments = `/statement/getComments` +// 查询某个评论下更多的回复 +export const GetMoreComments = `/statement/getMoreComments` +// 查询讨论下的帖子 +export const PostList = `/statement/list` + + diff --git a/src/components/img/UploadPostImg.vue b/src/components/img/UploadPostImg.vue new file mode 100644 index 0000000..f1b17ad --- /dev/null +++ b/src/components/img/UploadPostImg.vue @@ -0,0 +1,81 @@ + + + diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue index 395d603..3421583 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -69,14 +69,12 @@ v-for="(d, j) in state?.postList" :key="j" > -
{{ d.discussSubmitTitle }}
-
- {{ d.discussSubmitContent }} -
+
{{ d.title }}
+
-
{{ d.discussReviewCount || 0 }}
+
{{ d.commentNum || 0 }}
-
{{ d.discussLikeCount || 0 }}
+
{{ d.praiseNum || 0 }}
-
{{ d.discussCollectionCount || 0 }}
+
{{ d.collectionNum || 0 }}
-
+
{ console.log('我是当前讨论下的帖子',e) - state.postList = e.data.rows; - state.total = e.data.total; - - // 添加一条假的数据 供测试使用 - state.postList =[ - { - "createTime": "", - "createUser": 0, - "discussCollectionCount": "234", - "discussId": "", - "discussLikeCount": "3576", - "discussReviewCount": "12353", - "discussSubmitContent": "帖子的内容----帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容", - "discussSubmitId": "", - "discussSubmitPictureAddress": "", - "discussSubmitTitle": "我是一个用来测试的帖子标题", - "stuId": "", - "stuName": "", - "updateTime": "", - "updateUser": 0, - - "submitReviewVoList": [ - { - "createTime": "", - "createUser": 0, - "discussLikeCount": "", - "discussReviewContent": "", - "discussReviewFlag": "", - "discussReviewId": "", - "discussReviewPictureAddress": "", - "discussSubmitId": "", - "stuId": "", - "stuName": "", - "submitReplyVoList": [ - { - "createTime": "", - "createUser": 0, - "discussReplyId": 0, - "discussReviewId": "", - "replyContent": "", - "replyFlag": "", - "replyPictureAddress": "", - "reviewStuId": "", - "reviewStuName": "", - "stuId": "", - "stuName": "", - "updateTime": "", - "updateUser": 0 - } - ], - "updateTime": "", - "updateUser": 0 - } - ] - } - ] - state.total = 100; + state.postList = e.data.records; + state.total = Number(e.data.total); }).catch(err=>{ console.log(err) }) @@ -363,20 +291,30 @@ function handleCurrentChange(e, k) { } -function comment({ discussId: id }) { - router.push({ path: "discussdetail", query: { id, type, pName, sName} }); +function comment({ discussId: id, id: postID }) { + router.push({ path: "discussdetail", query: { id, type, pName, sName, postID, postName:state.info.discussDtoList[0].discussName } }); } function like(d) { - d.praised ? (d.praiseNum -= 1) : (d.praiseNum += 1); + d.praised ? ((d.praiseNum) -= 1) : (d.praiseNum += 1); d.praised = !d.praised; - request(COMMENT_PRAISE, { targetId: d.discussId, type: 3 }); + console.log('我是点赞传递的参数', { targetId: d.discussId, type: 2 }) + request(PostPraise, { targetId: d.discussId, type: 2 }).then(res=>{ + console.log('我是点赞的操作',res) + }).catch(err=>{ + console.log(err) + }); } function collection(d) { d.collected ? (d.collectionNum -= 1) : (d.collectionNum += 1); d.collected = !d.collected; - request(COMMENT_COLLECTION, { targetId: d.discussId, type: 4 }); + console.log('我是收藏传递的参数', { targetId: d.discussId, type: 2 }) + request(PostCollection, { targetId: d.discussId, type: 2 }).then(res=>{ + console.log('我是收藏的操作',res) + }).catch(err=>{ + console.log(err) + }); } @@ -420,7 +358,9 @@ const postAdd = () => { if(res.code==200){ dialogVisible.value = false; ElMessage.success("发帖成功"); - getPostList(); + getPostList(state.info.discussDtoList[0].discussId); + titleName.value = ""; + valueHtml.value = ""; } }).catch(err=>{ console.log(err) diff --git a/src/views/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue index 9f1b2f7..43ba282 100644 --- a/src/views/discussdetail/DiscussDetail.vue +++ b/src/views/discussdetail/DiscussDetail.vue @@ -37,35 +37,29 @@
-
【讨论】管理者进阶腾飞班 - 班内成员讨论
+
【讨论】{{postName}}
- {{ disDetail.projectName }} + {{ postName }}
- +
-
{{ disDetail.stageName }}
+
{{ disDetail.title }}
进行中
-
{{ disDetail.discussName }}
+
{{ disDetail.title }}
+ style="display: flex;cursor: pointer;align-items: baseline;margin-left: 20px;"> + margin-left: 20px;"> - {{ disDetail.discussExplain }} + +
@@ -103,6 +98,7 @@
- + - +
@@ -171,13 +167,7 @@
+ style="display: flex;cursor: pointer;align-items: baseline;margin-left: 19px;"> + margin-left: 19px;">
+ v-if="commontList && commontList.length">
- + - - @@ -288,8 +275,10 @@