diff --git a/src/api/topic/comment.ts b/src/api/topic/comment.ts index a01cc2b5..915ec501 100644 --- a/src/api/topic/comment.ts +++ b/src/api/topic/comment.ts @@ -1,4 +1,6 @@ -import { fetchGet, fetchPost } from '@/utils/request' +import { fetchGet, fetchPut, fetchPost } from '@/utils/request' +// 将对象转为请求参数的函数 +import objectToQueryParams from '@/utils/objectToQueryParams' import * as Comment from './types/comment' @@ -19,6 +21,30 @@ export async function getCommentsByReplyRidApi( } } +// 点赞评论 +export async function updateCommentLikeApi( + request: Comment.TopicLikeCommentRequestData +): Promise { + const queryParams = objectToQueryParams(request, 'tid') + const url = `/topics/${request.tid}/comment/like?${queryParams}` + + const response = fetchPut(url) + + return response +} + +// 点踩评论 +export async function updateCommentDislikeApi( + request: Comment.TopicDislikeCommentRequestData +): Promise { + const queryParams = objectToQueryParams(request, 'tid') + const url = `/topics/${request.tid}/comment/dislike?${queryParams}` + + const response = fetchPut(url) + + return response +} + // 根据 tid 和 rid 创建一个评论 export async function postCommentByPidAndRidApi( request: Comment.TopicCreateCommentRequestData diff --git a/src/api/topic/types/comment.ts b/src/api/topic/types/comment.ts index b56bf253..407d64d9 100644 --- a/src/api/topic/types/comment.ts +++ b/src/api/topic/types/comment.ts @@ -2,6 +2,7 @@ import { TopicUserInfo, TopicToUserInfo } from './topic' // 评论的数据 export interface TopicComment { + cid: number rid: number tid: number c_user: Omit @@ -11,6 +12,20 @@ export interface TopicComment { dislikes: number[] } +// 点赞评论的请求数据 +export interface TopicLikeCommentRequestData { + tid: number + cid: number + to_uid: number +} + +// 点踩评论的请求数据 +export interface TopicDislikeCommentRequestData { + tid: number + cid: number + to_uid: number +} + // 发表评论的请求数据 export interface TopicCreateCommentRequestData { tid: number @@ -22,6 +37,12 @@ export interface TopicCreateCommentRequestData { // 单个回复底下所有的评论数据,是一个数组 export type TopicCommentResponseData = KUNGalgameResponseData +// 点赞评论的响应数据 +export type TopicLikeCommentResponseData = KUNGalgameResponseData<{}> + +// 点踩评论的响应数据 +export type TopicDislikeCommentResponseData = KUNGalgameResponseData<{}> + // 创建单个评论后返回的评论数据 export type TopicCreateCommentResponseData = KUNGalgameResponseData diff --git a/src/api/topic/types/reply.ts b/src/api/topic/types/reply.ts index ac93fcba..80a92aa1 100644 --- a/src/api/topic/types/reply.ts +++ b/src/api/topic/types/reply.ts @@ -27,7 +27,7 @@ export interface TopicReply { dislikes: number[] tags: string[] time: number - cid: number[] + comment: number[] } // 发表回复的请求数据 diff --git a/src/store/modules/topic.ts b/src/store/modules/topic.ts index 5486bd20..a16ba972 100644 --- a/src/store/modules/topic.ts +++ b/src/store/modules/topic.ts @@ -48,10 +48,19 @@ import type { } from '@/api' // 评论 -import { getCommentsByReplyRidApi, postCommentByPidAndRidApi } from '@/api' +import { + getCommentsByReplyRidApi, + updateCommentLikeApi, + updateCommentDislikeApi, + postCommentByPidAndRidApi, +} from '@/api' import type { TopicCommentResponseData, + TopicLikeCommentRequestData, + TopicLikeCommentResponseData, + TopicDislikeCommentRequestData, + TopicDislikeCommentResponseData, TopicCreateCommentRequestData, TopicCreateCommentResponseData, } from '@/api' @@ -254,6 +263,34 @@ export const useKUNGalgameTopicStore = defineStore({ return await getCommentsByReplyRidApi(tid, rid) }, + // 点赞评论 + async updateCommentLike( + tid: number, + cid: number, + toUid: number + ): Promise { + const requestData: TopicLikeCommentRequestData = { + tid: tid, + cid: cid, + to_uid: toUid, + } + return await updateCommentLikeApi(requestData) + }, + + // 点踩评论 + async updateCommentDislike( + tid: number, + cid: number, + toUid: number + ): Promise { + const requestData: TopicDislikeCommentRequestData = { + tid: tid, + cid: cid, + to_uid: toUid, + } + return await updateCommentDislikeApi(requestData) + }, + // 创建一个评论 async postNewComment( tid: number, diff --git a/src/views/topic/KUNGalgameTopicPage.vue b/src/views/topic/KUNGalgameTopicPage.vue index 549d4b9c..bd1ccab7 100644 --- a/src/views/topic/KUNGalgameTopicPage.vue +++ b/src/views/topic/KUNGalgameTopicPage.vue @@ -12,6 +12,8 @@ import { } from 'vue' import { onBeforeRouteLeave, useRoute } from 'vue-router' import message from '@/components/alert/Message' +// 全局消息组件(底部) +import { useKUNGalgameMessageStore } from '@/store/modules/message' import { TopicDetail, TopicReply } from '@/api' @@ -44,6 +46,7 @@ const { isShowAdvance, isEdit, replyRequest, + replyRewrite, isScrollToTop, isLoading, scrollToReplyId, @@ -236,31 +239,27 @@ const resetPanelStatus = () => { // useKUNGalgameTopicStore().resetRewriteTopicData() } -// 页面离开时关闭回复面板 -onBeforeRouteLeave(() => { - resetPanelStatus() +// 页面离开时关闭回复面板,如果重新编辑回复需要确认离开 +onBeforeRouteLeave(async (to, from, next) => { + // 如果是正在更新回复 + if (replyRewrite.value.isReplyRewriting) { + // 获取用户点击的结果 + const res = await useKUNGalgameMessageStore().alert( + 'AlertInfo.edit.leave', + true + ) + if (res) { + resetPanelStatus() + // 用户确认离开,继续导航 + next() + } else { + // 用户取消离开,阻止导航 + next(false) + } + } else { + next() + } }) -// onBeforeRouteLeave(async (to, from, next) => { -// // 如果是正在更新回复 -// if (replyRewrite.value.isReplyRewriting) { -// // 获取用户点击的结果 -// const res = await useKUNGalgameMessageStore().alert( -// 'AlertInfo.edit.leave', -// true -// ) -// if (res) { -// // 重置重新编辑话题的数据 -// useKUNGalgameEditStore().resetRewriteTopicData() -// // 用户确认离开,继续导航 -// next() -// } else { -// // 用户取消离开,阻止导航 -// next(false) -// } -// } else { -// next() -// } -// }) // 挂载之前关闭回复面板 onBeforeMount(() => { diff --git a/src/views/topic/components/comment/CommentPanel.vue b/src/views/topic/components/comment/CommentPanel.vue index 4182a8be..e53e1f2e 100644 --- a/src/views/topic/components/comment/CommentPanel.vue +++ b/src/views/topic/components/comment/CommentPanel.vue @@ -32,7 +32,7 @@ const handleInputComment = () => { // 创建一个防抖处理函数 const debouncedUpdateContent = debounce(() => { content.value = commentValue.value - }, 1007) + }, 300) // 调用防抖处理函数,会在延迟时间内只执行一次更新操作 debouncedUpdateContent() @@ -79,8 +79,6 @@ const handlePublishComment = async () => { message('Comment publish successfully!', '评论发布成功', 'success') handleCloseCommentPanel() - } else { - message('Comment publish failed!', '评论发布失败', 'success') } } diff --git a/src/views/topic/components/comment/Comments.vue b/src/views/topic/components/comment/Comments.vue index 1ab152a1..d953c5d9 100644 --- a/src/views/topic/components/comment/Comments.vue +++ b/src/views/topic/components/comment/Comments.vue @@ -4,12 +4,19 @@ + + + + diff --git a/src/views/topic/components/comment/Like.vue b/src/views/topic/components/comment/Like.vue new file mode 100644 index 00000000..dd1ad0e0 --- /dev/null +++ b/src/views/topic/components/comment/Like.vue @@ -0,0 +1,104 @@ + + + + + +