diff --git a/src/api/v1/message/messageReceived.ts b/src/api/v1/message/messageReceived.ts index 735cb7d..b178c8b 100644 --- a/src/api/v1/message/messageReceived.ts +++ b/src/api/v1/message/messageReceived.ts @@ -7,8 +7,8 @@ export const fetchGetMessageReceivedList = (data: any) => { }; /** 管理员操作用户消息---将用户消息标为已读 */ -export const fetchMarkMessageReceivedAsRead = (data: any) => { - return http.request>('put', 'messageReceived/markMessageReceivedAsRead', { data }); +export const fetchUpdateMarkMessageReceived = (data: any) => { + return http.request>('put', 'messageReceived/updateMarkMessageReceived', { data }); }; /** 管理员操作用户消息---管理删除用户消息 */ diff --git a/src/api/v1/message/messageSend.ts b/src/api/v1/message/messageSend.ts index 9e9b485..fc04494 100644 --- a/src/api/v1/message/messageSend.ts +++ b/src/api/v1/message/messageSend.ts @@ -8,25 +8,20 @@ export const fetchGetMessageList = (data: any) => { /** 系统消息---根据消息id获取接收人信息 */ export const fetchGetReceivedUserinfoByMessageId = (data: any) => { - return http.request>('get', `messageReceived/noManage/getReceivedUserinfoByMessageId`, { params: data }); + return http.request>('get', `message/noManage/getReceivedUserinfoByMessageId`, { params: data }); }; /** 系统消息---添加系统消息 */ export const fetchAddMessage = (data: any) => { - return http.request>('post', 'messageReceived/addMessage', { data }); + return http.request>('post', 'message/addMessage', { data }); }; /** 系统消息---更新系统消息 */ export const fetchUpdateMessage = (data: any) => { - return http.request>('put', 'messageReceived/updateMessage', { data }); + return http.request>('put', 'message/updateMessage', { data }); }; /** 系统消息---删除系统消息 */ export const fetchDeleteMessage = (data: any) => { return http.request>('delete', 'message/deleteMessage', { data }); }; - -/** 用户系统消息---根据消息id查询消息详情 */ -export const fetchGetMessageDetailById = (data: any) => { - return http.request>('get', `message/noManage/getMessageDetailById`, { params: data }); -}; diff --git a/src/api/v1/message/messageUser.ts b/src/api/v1/message/messageUser.ts index 2055ace..914119b 100644 --- a/src/api/v1/message/messageUser.ts +++ b/src/api/v1/message/messageUser.ts @@ -3,15 +3,20 @@ import type { BaseResult, ResultTable } from '@/api/service/types'; /** 用户系统消息---用户获取系统消息列表 */ export const fetchGetUserMessageList = (data: any) => { - return http.request>('get', `message/noManage/getUserMessageList/${data.currentPage}/${data.pageSize}`, { params: data }); + return http.request>('get', `messageReceived/noManage/getUserMessageList/${data.currentPage}/${data.pageSize}`, { params: data }); +}; + +/** 用户系统消息---根据消息id查询消息详情 */ +export const fetchGetMessageDetailById = (data: any) => { + return http.request>('get', `message/noManage/getMessageDetailById`, { params: data }); }; /** 系统消息---用户将消息标为已读 */ export const fetchUpdateUserMarkAsRead = (data: any) => { - return http.request>('put', 'messageReceived/noManage/updateUserMarkAsRead', { data }); + return http.request>('put', 'messageReceived/noManage/userMarkAsRead', { data }); }; /** 系统消息---用户删除系统消息 */ export const fetchDeleteUserMessageByIds = (data: any) => { - return http.request>('delete', 'message/noManage/deleteUserMessageByIds', { data }); + return http.request>('delete', 'messageReceived/noManage/deleteUserMessageByIds', { data }); }; diff --git a/src/store/message/messageReceived.ts b/src/store/message/messageReceived.ts index 0ee4ee4..09efd10 100644 --- a/src/store/message/messageReceived.ts +++ b/src/store/message/messageReceived.ts @@ -1,5 +1,5 @@ import { defineStore } from 'pinia'; -import { fetchDeleteMessageReceivedByIds, fetchGetMessageReceivedList, fetchMarkMessageReceivedAsRead } from '@/api/v1/message/messageReceived'; +import { fetchDeleteMessageReceivedByIds, fetchGetMessageReceivedList, fetchUpdateMarkMessageReceived } from '@/api/v1/message/messageReceived'; import { pageSizes } from '@/enums/baseConstant'; import { storeMessage } from '@/utils/message'; import { storePagination } from '@/store/useStorePagination'; @@ -16,16 +16,10 @@ export const useMessageReceivedStore = defineStore('messageReceivedStore', { form: { // 消息标题 title: undefined, - // 接收人用户ID - receivedUserIds: undefined, - // 发送人用户ID - sendUserId: undefined, // 发送人昵称 sendNickname: undefined, // 消息类型 messageType: undefined, - // 消息内容 - content: undefined, // 编辑器类型 editorType: undefined, // 消息等级 @@ -65,8 +59,8 @@ export const useMessageReceivedStore = defineStore('messageReceivedStore', { }, /** 管理员操作用户消息---将用户消息标为已读 */ - async markMessageReceivedAsRead(data: any) { - const result = await fetchMarkMessageReceivedAsRead(data); + async updateMarkMessageReceived(data: any) { + const result = await fetchUpdateMarkMessageReceived(data); return storeMessage(result); }, diff --git a/src/store/message/messageSend.ts b/src/store/message/messageSend.ts index e427ab8..08eda62 100644 --- a/src/store/message/messageSend.ts +++ b/src/store/message/messageSend.ts @@ -1,6 +1,6 @@ import { defineStore } from 'pinia'; import { pageSizes } from '@/enums/baseConstant'; -import { fetchAddMessage, fetchDeleteMessage, fetchGetMessageList, fetchUpdateMessage } from '@/api/v1/message/messageSend'; +import { fetchAddMessage, fetchDeleteMessage, fetchGetMessageList, fetchGetReceivedUserinfoByMessageId, fetchUpdateMessage } from '@/api/v1/message/messageSend'; import { storePagination } from '@/store/useStorePagination'; import { storeMessage } from '@/utils/message'; @@ -9,20 +9,16 @@ export const useMessageSendStore = defineStore('messageSendStore', { return { // 系统消息列表 datalist: [], + // 消息接受用戶信息列表 + receivedUserinfoList: [], // 查询表单 form: { // 消息标题 title: undefined, - // 接收人用户ID - receivedUserIds: undefined, - // 发送人用户ID - sendUserId: undefined, // 发送人昵称 sendNickname: undefined, // 消息类型 messageType: undefined, - // 消息内容 - content: undefined, // 编辑器类型 editorType: undefined, // 消息等级 @@ -61,6 +57,14 @@ export const useMessageSendStore = defineStore('messageSendStore', { return pagination(result); }, + /** 根据消息id获取接收人信息 */ + async getReceivedUserinfoByMessageId(data: any) { + const result = await fetchGetReceivedUserinfoByMessageId(data); + if (result.code === 200) { + this.receivedUserinfoList = result.data; + } + }, + /** 添加系统消息 */ async addMessage(data: any) { const result = await fetchAddMessage(data); diff --git a/src/store/message/messageUser.ts b/src/store/message/messageUser.ts index 3e569ec..a2d1da3 100644 --- a/src/store/message/messageUser.ts +++ b/src/store/message/messageUser.ts @@ -1,8 +1,9 @@ import { defineStore } from 'pinia'; -import { fetchDeleteUserMessageByIds, fetchGetUserMessageList, fetchUpdateUserMarkAsRead } from '@/api/v1/message/messageUser'; +import { fetchDeleteUserMessageByIds, fetchGetMessageDetailById, fetchGetUserMessageList, fetchUpdateUserMarkAsRead } from '@/api/v1/message/messageUser'; import { pageSizes } from '@/enums/baseConstant'; import { storePagination } from '@/store/useStorePagination'; import { storeMessage } from '@/utils/message'; +import { decode } from 'js-base64'; /** * 系统消息 Store @@ -12,6 +13,8 @@ export const useMessageUserStore = defineStore('messageUserStore', { return { // 系统消息列表 datalist: [], + // 消息详情 + messageDetail: {}, // 查询表单 form: { // 消息标题 @@ -50,6 +53,18 @@ export const useMessageUserStore = defineStore('messageUserStore', { return pagination(result); }, + /** 根据消息id获取消息详情 */ + async getMessageDetailById(id: string) { + const result = await fetchGetMessageDetailById({ id }); + + if (result.code === 200) { + this.messageDetail = result.data; + + // 解码消息内容 + this.messageDetail.content = decode(this.messageDetail?.content); + } + }, + /** 用户将消息标为已读 */ async updateUserMarkAsRead(data: any) { const result = await fetchUpdateUserMarkAsRead(data); diff --git a/src/views/message-management/message-detail/detail-message-id.vue b/src/views/message-management/message-detail/detail-message-id.vue index 08b47b8..e89c7fd 100644 --- a/src/views/message-management/message-detail/detail-message-id.vue +++ b/src/views/message-management/message-detail/detail-message-id.vue @@ -1,13 +1,12 @@