|
@@ -139,10 +139,10 @@ async function onSendMessage() {
|
|
|
id: 1,
|
|
|
conversationId: route.value.conversationId,
|
|
|
senderId: userInfo.value.id,
|
|
|
- senderAvatar: avatarObj.senderAvatar,
|
|
|
+ senderAvatar: avatarObj.senderAvatar || '',
|
|
|
senderType: 1,
|
|
|
receiverId: route.value.relUserId,
|
|
|
- receiverAvatar: avatarObj.receiverAvatar,
|
|
|
+ receiverAvatar: avatarObj.receiverAvatar || '',
|
|
|
receiverType: null,
|
|
|
contentType: 1,
|
|
|
content: JSON.stringify({ text: chat.msg }),
|
|
@@ -156,10 +156,10 @@ async function onSendMessage() {
|
|
|
isLoading: true,
|
|
|
conversationId: route.value.conversationId,
|
|
|
senderId: route.value.relUserId,
|
|
|
- senderAvatar: avatarObj.receiverAvatar,
|
|
|
+ senderAvatar: avatarObj.receiverAvatar || '',
|
|
|
senderType: 1,
|
|
|
receiverId: userInfo.value.id,
|
|
|
- receiverAvatar: avatarObj.senderAvatar,
|
|
|
+ receiverAvatar: avatarObj.senderAvatar || '',
|
|
|
receiverType: null,
|
|
|
contentType: 22,
|
|
|
content: '',
|
|
@@ -216,6 +216,7 @@ function onShowSelect(mode) {
|
|
|
}
|
|
|
|
|
|
async function onSelect({ type, data }) {
|
|
|
+ console.log(data, 555222233)
|
|
|
let msg;
|
|
|
switch (type) {
|
|
|
case 'image':
|
|
@@ -223,25 +224,29 @@ async function onSelect({ type, data }) {
|
|
|
msg = {
|
|
|
contentType: KeFuMessageContentTypeEnum.IMAGE,
|
|
|
content: JSON.stringify({ picUrl: res.data }),
|
|
|
+ conversationId: route.value.conversationId,
|
|
|
};
|
|
|
break;
|
|
|
case 'goods':
|
|
|
msg = {
|
|
|
contentType: KeFuMessageContentTypeEnum.PRODUCT,
|
|
|
content: JSON.stringify(data),
|
|
|
+ conversationId: route.value.conversationId,
|
|
|
};
|
|
|
break;
|
|
|
case 'order':
|
|
|
msg = {
|
|
|
contentType: KeFuMessageContentTypeEnum.ORDER,
|
|
|
content: JSON.stringify(data),
|
|
|
+ conversationId: route.value.conversationId,
|
|
|
};
|
|
|
break;
|
|
|
}
|
|
|
if (msg) {
|
|
|
// 发送消息
|
|
|
// scrollBottom();
|
|
|
- await KeFuApi.sendKefuMessage(msg);
|
|
|
+ // await KeFuApi.sendKefuMessage(msg);
|
|
|
+ await KeFuApi.listSendNew(msg);
|
|
|
await messageListRef.value.refreshMessageList();
|
|
|
chat.showTools = false;
|
|
|
chat.showSelect = false;
|