|
@@ -5,7 +5,7 @@
|
|
|
<main class="message-area">
|
|
|
<div class="message-area-title">
|
|
|
<label class="name">
|
|
|
- {{ isRoot ? message.nameCard || message.nick || message.from : message.messageSender }}
|
|
|
+ {{ isRoot ? message.nameCard || message.nick || message.from : message.messageSenderName || message.messageSender }}
|
|
|
</label>
|
|
|
<label class="time">
|
|
|
{{ caculateTimeago((isRoot ? message?.time : message?.messageTime) * 1000) }}
|
|
@@ -14,7 +14,7 @@
|
|
|
<div class="content content-in">
|
|
|
<MessageText v-if="message.messageType === constant.typeText || message.type === TIM.TYPES.MSG_TEXT || !isRoot" :data="handleTextMessageShowContext(isRoot ? message : { payload: { text: message?.messageAbstract } })" />
|
|
|
<span v-if="message.messageType === constant.typeCustom || message.type === TIM.TYPES.MSG_CUSTOM">
|
|
|
- <!-- <div class="notice-message" @click="handleNotice" v-if="isCustom.businessID === constant.TC_GROUP_NOTICE">
|
|
|
+ <div class="notice-message" @click="handleNotice" v-if="isCustom.businessID === constant.TC_GROUP_NOTICE">
|
|
|
<div class="notice-title">
|
|
|
<i class="iconNotice"></i>
|
|
|
<span>群公告</span>
|
|
@@ -25,8 +25,8 @@
|
|
|
</div>
|
|
|
<div class="content-text">{{isCustom.msgContent}}</div>
|
|
|
</div>
|
|
|
- </div> -->
|
|
|
- <span >{{ handleCustomMessageShowContext(message)?.custom }}</span>
|
|
|
+ </div>
|
|
|
+ <span v-else>{{ handleCustomMessageShowContext(message)?.custom }}</span>
|
|
|
</span>
|
|
|
<img v-if="message.messageType === constant.typeImage || message.type === TIM.TYPES.MSG_IMAGE" class="message-img" :src="message?.payload?.imageInfoArray[1].url" />
|
|
|
<div v-if="message.messageType === constant.typeAudio || message.type === TIM.TYPES.MSG_AUDIO" class="message-audio" :style="`width: ${message?.payload?.second * 10 + 40}Px`">
|
|
@@ -60,6 +60,7 @@ import { MessageText, MessageEmojiReact } from "../../components";
|
|
|
import { caculateTimeago } from "../../../utils";
|
|
|
import constant from "../../../constant";
|
|
|
import TIM from "../../../../../TUICore/tim/index";
|
|
|
+import { JSONToObject } from '../../utils/utils'
|
|
|
const RepliesItem = defineComponent({
|
|
|
props: {
|
|
|
message: {
|
|
@@ -91,9 +92,9 @@ const RepliesItem = defineComponent({
|
|
|
});
|
|
|
watchEffect(() => {
|
|
|
data.message = props.message;
|
|
|
- console.log(data.message, 'data.message')
|
|
|
const { payload } = props.message
|
|
|
- data.isCustom = payload ? JSONToObject(payload) : {}
|
|
|
+ data.isCustom = payload?.data || ''
|
|
|
+ data.isCustom = payload ? JSONToObject(payload?.data) : {}
|
|
|
data.isH5 = props.isH5;
|
|
|
data.isRoot = props.isRoot;
|
|
|
if (data.message.type === TIM.TYPES.MSG_FACE) {
|
|
@@ -230,7 +231,7 @@ export default RepliesItem;
|
|
|
word-break: break-all;
|
|
|
width: fit-content;
|
|
|
&-in {
|
|
|
- background: #f2f2f2;
|
|
|
+ background: #fff;
|
|
|
border-radius: 0px 10px 10px 10px;
|
|
|
.message-img,
|
|
|
.message-videoimg {
|