diff --git a/pages/Chat/Chat.vue b/pages/Chat/Chat.vue index ebe1ce4..edf42d4 100644 --- a/pages/Chat/Chat.vue +++ b/pages/Chat/Chat.vue @@ -938,6 +938,17 @@ } // 发送好友消息 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(); const receiverId = getReceiverId() const hasFiles = uploadedFiles.value.length > 0 @@ -959,17 +970,17 @@ "body": body } friendSocketStore.send(data) - 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] + // 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] textMessage.value = '' uploadedFiles.value = [] setTimeout(() => { @@ -979,6 +990,16 @@ // 发送群聊消息 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(); const hasFiles = uploadedFiles.value.length > 0 const body = { @@ -997,57 +1018,37 @@ "body": body } friendSocketStore.send(data) - 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] + // 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] textMessage.value = '' uploadedFiles.value = [] setTimeout(() => { takeGroupMessages() }, 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消息 const sendAIMessage = async () => { try { - await handleConnect(); let messageContent = textMessage.value + // 立即添加用户消息到列表(使用完整的 messageContent,包含文件信息) + allmessages.value = [...allmessages.value, { + role: 'user', + content: messageContent + }] + await handleConnect(); + if (uploadedFiles.value.length) { const fileJson = JSON.stringify(uploadedFiles.value) messageContent = messageContent ? @@ -1062,11 +1063,11 @@ socketStore.send(data) isThinking.value = true isSelfSent.value = true - // 立即添加用户消息到列表(使用完整的 messageContent,包含文件信息) - allmessages.value = [...allmessages.value, { - role: 'user', - content: messageContent - }] + // // 立即添加用户消息到列表(使用完整的 messageContent,包含文件信息) + // allmessages.value = [...allmessages.value, { + // role: 'user', + // content: messageContent + // }] // 添加流式消息气泡(加载中状态) streamingMessageId.value = 'streaming-' + Date.now() allmessages.value = [...allmessages.value, {