YiLin/phone-app------test1-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//修改优先把消息加入列表

Browse Source
This commit is contained in:
YiLin
2026-07-27 18:01:32 +08:00
parent 9bafcaed5d
commit c90600c66e
1 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
pages/Chat/Chat.vue
View File

@@ -938,6 +938,17 @@
} }
// 发送好友消息 // 发送好友消息
const sendFriendMessage = async () => { const sendFriendMessage = async () => {
const newMessageData = {
"sender": UserId.value,
"receiver": receiverId,
"content": textMessage.value,
"taskId": null,
"avatar": null,
"createTime": "",
"messageType": "null",
"contentJson": hasFiles ? JSON.stringify(uploadedFiles.value) : 'null'
}
allmessages.value = [...allmessages.value, newMessageData]
if (!friendSocketStore.isConnecting) await handleFriendConnect(); if (!friendSocketStore.isConnecting) await handleFriendConnect();
const receiverId = getReceiverId() const receiverId = getReceiverId()
const hasFiles = uploadedFiles.value.length > 0 const hasFiles = uploadedFiles.value.length > 0
@@ -959,17 +970,17 @@
"body": body "body": body
} }
friendSocketStore.send(data) friendSocketStore.send(data)
const newMessageData = { // const newMessageData = {
"sender": UserId.value, // "sender": UserId.value,
"receiver": receiverId, // "receiver": receiverId,
"content": textMessage.value, // "content": textMessage.value,
"taskId": null, // "taskId": null,
"avatar": null, // "avatar": null,
"createTime": "", // "createTime": "",
"messageType": "null", // "messageType": "null",
"contentJson": hasFiles ? JSON.stringify(uploadedFiles.value) : 'null' // "contentJson": hasFiles ? JSON.stringify(uploadedFiles.value) : 'null'
} // }
allmessages.value = [...allmessages.value, newMessageData] // allmessages.value = [...allmessages.value, newMessageData]
textMessage.value = '' textMessage.value = ''
uploadedFiles.value = [] uploadedFiles.value = []
setTimeout(() => { setTimeout(() => {
@@ -979,6 +990,16 @@
// 发送群聊消息 // 发送群聊消息
const sendGroupMessage = async () => { const sendGroupMessage = async () => {
const newMessageData = {
"id": allmessages.value.length + 1,
"message": textMessage.value,
"messageType": hasFiles ? 1 : 0,
"groupId": null,
"createTime": '',
"contentJson": hasFiles ? JSON.stringify(uploadedFiles.value) : '',
"sender": UserId.value
}
allmessages.value = [...allmessages.value, newMessageData]
if (!friendSocketStore.isConnecting) await handleFriendConnect(); if (!friendSocketStore.isConnecting) await handleFriendConnect();
const hasFiles = uploadedFiles.value.length > 0 const hasFiles = uploadedFiles.value.length > 0
const body = { const body = {
@@ -997,57 +1018,37 @@
"body": body "body": body
} }
friendSocketStore.send(data) friendSocketStore.send(data)
const newMessageData = { // const newMessageData = {
"id": allmessages.value.length + 1, // "id": allmessages.value.length + 1,
"message": textMessage.value, // "message": textMessage.value,
"messageType": hasFiles ? 1 : 0, // "messageType": hasFiles ? 1 : 0,
"groupId": null, // "groupId": null,
"createTime": '', // "createTime": '',
"contentJson": hasFiles ? JSON.stringify(uploadedFiles.value) : '', // "contentJson": hasFiles ? JSON.stringify(uploadedFiles.value) : '',
"sender": UserId.value // "sender": UserId.value
} // }
allmessages.value = [...allmessages.value, newMessageData] // allmessages.value = [...allmessages.value, newMessageData]
textMessage.value = '' textMessage.value = ''
uploadedFiles.value = [] uploadedFiles.value = []
setTimeout(() => { setTimeout(() => {
takeGroupMessages() takeGroupMessages()
}, 1000) }, 1000)
} }
// // 发送AI消息
// const sendAIMessage = async () => { //修改优先把消息加入列表
// try {
// handleConnect();
// let messageContent = textMessage.value
// if (uploadedFiles.value.length) {
// const fileJson = JSON.stringify(uploadedFiles.value)
// messageContent = messageContent ?
// `${messageContent}\n[文件信息:${fileJson}]` :
// `[文件信息:${fileJson}]`
// }
// const message_id = await addMessageDict(userToken.value, 'user', currentSessionId.value,
// messageContent)
// if (message_id) {
// textMessage.value = ''
// uploadedFiles.value = []
// isThinking.value = true
// }
// await waitForAIResponse();
// } catch (error) {
// isThinking.value = false
// uni.showToast({
// title: `用户发送消息失败${error}`,
// icon: 'error'
// })
// }
// }
// AI 回复超时定时器
// let aiResponseTimer = null
// 发送AI消息 // 发送AI消息
const sendAIMessage = async () => { const sendAIMessage = async () => {
try { try {
await handleConnect();
let messageContent = textMessage.value let messageContent = textMessage.value
// 立即添加用户消息到列表（使用完整的 messageContent，包含文件信息）
allmessages.value = [...allmessages.value, {
role: 'user',
content: messageContent
}]
await handleConnect();
if (uploadedFiles.value.length) { if (uploadedFiles.value.length) {
const fileJson = JSON.stringify(uploadedFiles.value) const fileJson = JSON.stringify(uploadedFiles.value)
messageContent = messageContent ? messageContent = messageContent ?
@@ -1062,11 +1063,11 @@
socketStore.send(data) socketStore.send(data)
isThinking.value = true isThinking.value = true
isSelfSent.value = true isSelfSent.value = true
// 立即添加用户消息到列表（使用完整的 messageContent，包含文件信息） // // 立即添加用户消息到列表（使用完整的 messageContent，包含文件信息）
allmessages.value = [...allmessages.value, { // allmessages.value = [...allmessages.value, {
role: 'user', // role: 'user',
content: messageContent // content: messageContent
}] // }]
// 添加流式消息气泡（加载中状态） // 添加流式消息气泡（加载中状态）
streamingMessageId.value = 'streaming-' + Date.now() streamingMessageId.value = 'streaming-' + Date.now()
allmessages.value = [...allmessages.value, { allmessages.value = [...allmessages.value, {