lex-xin hai 6 meses
pai
achega
7915f95294

+ 1 - 1
src/TUIKit/TUIComponents/container/TUIChat/manage-components/manage-notification-detail.vue

@@ -217,7 +217,7 @@ const ManageNotification = defineComponent({
         } else if (type === "top") {
           await imGroupNoticeUpdate({
             imGroupId: data.groupProfile.groupID,
-            isTop: item.isTop? false : true,
+            isTop: item.isTop ? false : true,
             id: item.id,
           });
           getNotification();

+ 1 - 1
src/TUIKit/TUIComponents/container/TUIChat/manage-components/manage-notification.vue

@@ -236,7 +236,7 @@ const ManageNotification = defineComponent({
         } else if (type === "top") {
           await imGroupNoticeUpdate({
             imGroupId: data.groupProfile.groupID,
-            isTop: true,
+            isTop: item.isTop ? false : true,
             id: item.id,
           });
           data.page = 1;

+ 8 - 7
src/TUIKit/TUIComponents/container/TUIChat/plugin-components/replies/replies-item.vue

@@ -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 {

+ 9 - 10
src/TUIKit/TUIComponents/container/TUIChat/plugin-components/replies/replies.vue

@@ -38,6 +38,7 @@ import { Message } from '../../interface';
 import TIM from '../../../../../TUICore/tim';
 import RepliesItem from './replies-item.vue';
 import { JSONToObject } from '../../utils/utils';
+import { imGroupMemberUserDetail } from '../../../../../api'
 const ReadReceiptDialog = defineComponent({
   type: 'custom',
   components: {
@@ -87,8 +88,6 @@ const ReadReceiptDialog = defineComponent({
       data.isH5 = props.isH5;
       data.url = props.url;
       data.messageList = props.messageList;
-
-      console.log(props.message, 'props.message')
     });
 
     watch(
@@ -123,19 +122,19 @@ const ReadReceiptDialog = defineComponent({
         if (!cloudCustomData) return;
         const cloudCustomObject = JSONToObject(cloudCustomData);
         data.replies = cloudCustomObject?.messageReplies?.replies;
-        data?.replies?.forEach((item: any) => {
+        data?.replies?.forEach(async (item: any) => {
           const { messageID, messageSender } = item;
           const message = data.messageList.find((item: Message) => 
             (item.ID === messageID || item.from === messageSender)
           );
           item.avatar = message ? (message as Message)?.avatar : '';
-          // try {
-          //   const res = await imUserFriendBatchFriend({ imUserIds: [messageSender] })
-          //   item.messageSenderName = res.data[0]?.friendNickname || res.data[0]?.imUserId
-          //   item.avatar = res.data[0]?.friendAvatar || '' 
-          // } catch {
-          //   // 
-          // }
+          try {
+            const res = await imGroupMemberUserDetail({ imUserId: messageSender })
+            item.messageSenderName = res.data?.friendNickname || res.data?.imUserId
+            item.avatar = res.data?.friendAvatar || '' 
+          } catch {
+            // 
+          }
         });
       } catch (err) {
         console.log(err);