diff --git a/NEUIKit/components/Icon.vue b/NEUIKit/components/Icon.vue
index b6618ac..9391f6f 100644
--- a/NEUIKit/components/Icon.vue
+++ b/NEUIKit/components/Icon.vue
@@ -339,11 +339,15 @@ const urlMap = {
   'icon-file':
     'https://yx-web-nosdn.netease.im/common/90485f277f50fc081970ded8772ec7c5/file.png',
   'icon-pin':
-    'https://yx-web-nosdn.netease.im/common/8874f30f648cde89dbbe9a59e9cb7f8a/pin.png',
+    'https://yx-web-nosdn.netease.im/common/6eb4fafcca008d2e93e90311696d6b96/black-pin.png',
   'icon-green-pin':
     'https://yx-web-nosdn.netease.im/common/4a1f15eff2f53563c4f1cf6ecde82d2c/green-pin.png',
   'choose-picture':
     'https://yx-web-nosdn.netease.im/common/97b3ca79a589d5753cbc0e8e8ec09501/choose-picture.png',
+  'icon-collection':
+    'https://yx-web-nosdn.netease.im/common/aa1bad3410009dea83d34d513dcd20f3/add-collection.png',
+  'blue-collection':
+    'https://yx-web-nosdn.netease.im/common/fb3836a8731b57720fcfdd3b589b3d5f/collection.png',
 }
 
 //以上链接访问有频率控制，建议您将静态放到您服务器上，然后修改上面的链接即可
diff --git a/NEUIKit/components/FriendSelect.vue b/NEUIKit/components/PersonSelect.vue
similarity index 89%
rename from NEUIKit/components/FriendSelect.vue
rename to NEUIKit/components/PersonSelect.vue
index ff72844..329bd72 100644
--- a/NEUIKit/components/FriendSelect.vue
+++ b/NEUIKit/components/PersonSelect.vue
@@ -1,10 +1,10 @@
 <template>
-  <div v-if="friendList.length > 0" class="friend-select-wrapper">
+  <div v-if="personList.length > 0" class="friend-select-wrapper">
     <div class="member-wrapper">
       <radio-group v-if="radio" @change="checkboxChange">
         <div
           class="member-item"
-          v-for="item in friendList"
+          v-for="item in personList"
           :key="item.accountId"
         >
           <radio
@@ -19,14 +19,14 @@
           />
           <Avatar class="user-avatar" size="36" :account="item.accountId" />
           <div class="user-name">
-            <Appellation :account="item.accountId" />
+            <Appellation :account="item.accountId" :teamId="item.teamId" />
           </div>
         </div>
       </radio-group>
       <checkbox-group v-else @change="checkboxChange">
         <div
           class="member-item"
-          v-for="item in friendList"
+          v-for="item in personList"
           :key="item.accountId"
         >
           <checkbox
@@ -41,7 +41,7 @@
           />
           <Avatar class="user-avatar" size="36" :account="item.accountId" />
           <div class="user-name">
-            <Appellation :account="item.accountId" />
+            <Appellation :account="item.accountId" :teamId="item.teamId" />
           </div>
         </div>
       </checkbox-group>
@@ -72,15 +72,16 @@ import {
   withDefaults,
 } from '../utils/transformVue'
 
-export type FriendSelectItem = {
+export type PersonSelectItem = {
   accountId: string
+  teamId?: string
   disabled?: boolean
   checked?: boolean
 }
 
 const props = withDefaults(
   defineProps<{
-    friendList: FriendSelectItem[]
+    personList: PersonSelectItem[]
     showBtn?: boolean
     btnText?: string
     radio?: boolean
@@ -97,7 +98,7 @@ const props = withDefaults(
 const selectAccount = ref<string[]>([])
 
 onMounted(() => {
-  selectAccount.value = props.friendList
+  selectAccount.value = props.personList
     .filter((item) => item.checked)
     .map((item) => item.accountId)
 })
diff --git a/NEUIKit/components/PinCard.vue b/NEUIKit/components/PinCard.vue
index 8c92fbd..b5f9b73 100644
--- a/NEUIKit/components/PinCard.vue
+++ b/NEUIKit/components/PinCard.vue
@@ -187,11 +187,11 @@ const handlePinMsg = () => {
           handleCopy()
         } else if (data.tapIndex === 2) {
           customNavigateTo({
-            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM}&msgIdClient=${props.msg.messageClientId}`,
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM}&msgIdClient=${props.msg.messageClientId}&origin=pin`,
           })
         } else if (data.tapIndex === 3) {
           customNavigateTo({
-            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P}&msgIdClient=${props.msg.messageClientId}`,
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P}&msgIdClient=${props.msg.messageClientId}&origin=pin`,
           })
         }
       } else if (
@@ -202,11 +202,11 @@ const handlePinMsg = () => {
           props.handleUnPinMsg()
         } else if (data.tapIndex === 1) {
           customNavigateTo({
-            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM}&msgIdClient=${props.msg.messageClientId}`,
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM}&msgIdClient=${props.msg.messageClientId}&origin=pin`,
           })
         } else if (data.tapIndex === 2) {
           customNavigateTo({
-            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P}&msgIdClient=${props.msg.messageClientId}`,
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P}&msgIdClient=${props.msg.messageClientId}&origin=pin`,
           })
         }
       } else {
@@ -307,7 +307,7 @@ const timeFormat = () => {
   }
   .content-wrapper {
     padding: 12px 16px 16px 16px;
-
+    word-wrap: break-word;
     .file-wrapper {
       position: relative;
       width: 50%;
@@ -344,10 +344,11 @@ const timeFormat = () => {
         transform: translate(-40%, -50%);
       }
       .audio-wrapper {
+        width: fit-content;
         opacity: 1;
         background: #d6e5f6;
         overflow: hidden;
-        padding: 12px 16px;
+        padding: 10px 12px;
         border-radius: 0 8px 8px 8px;
         background-color: #e8eaed;
       }
diff --git a/NEUIKit/locale/en.ts b/NEUIKit/locale/en.ts
index eead04a..619d40d 100644
--- a/NEUIKit/locale/en.ts
+++ b/NEUIKit/locale/en.ts
@@ -104,6 +104,12 @@ export default {
   unpinText: 'Unmark',
   unpinFailedText: 'Unmark Failed',
   noPinListText: 'No Mark',
+  collectionText: 'Add collection',
+  deleteCollectionText: 'Delete collection',
+  addCollectionSuccessText: 'Add collection success',
+  addCollectionFailedText: 'Add collection Failed',
+  deleteCollectionFailedText: 'Delete collection Failed',
+  noCollectionsText: 'No collection',
   teamBannedText: 'Message Banned',
   you: 'You',
   pinThisText: 'Marked this message',
@@ -190,7 +196,8 @@ export default {
   removeBlacklist: 'Unblock',
   forwardSuccessText: 'Forward Success',
   forwardFailText: 'Forward Failed',
-  getMessageFailed: 'Fail to get message ',
+  getMessageFailed: 'Fail to get message',
+  getForwardMessageFailed: 'Fail to get forward message',
   sendFailWithInBlackText:
     'The other party has blocked you, message sending failed',
   sendFailWithDeleteText:
@@ -223,8 +230,16 @@ export default {
   unreadText: 'Unread',
   fileText: 'file',
   allUnReadText: 'All Unread',
+  msgRecallTimeErrorText: 'Message recall time exceeded',
   allReadText: 'All Read',
-
+  searchText: 'Search',
+  searchTitleText: 'Search',
+  friendText: 'Friend',
+  teamText: 'Group',
+  searchResultNullText: 'User does not exist',
+  conversationSendFailText: '[Send Failed]',
+  conversationNotificationText: '[Notification]',
+  fileMsgTitleText: '[File Message]',
   // emoji 不能随便填，要用固定 key
   Laugh: '[Laugh]',
   Happy: '[Happy]',
@@ -316,6 +331,9 @@ export default {
   107320: 'PIN not exist',
   107322: 'PIN already exist',
   107327: 'PIN function disabled',
+  189301: 'collection limit exceeded',
+  189302: 'collection not exist',
+  189449: 'collection concurrent operation failed',
   // 群相关
   109432: 'no permission',
 }
diff --git a/NEUIKit/locale/zh-Hans.ts b/NEUIKit/locale/zh-Hans.ts
index 1682fc3..ef4e0c1 100644
--- a/NEUIKit/locale/zh-Hans.ts
+++ b/NEUIKit/locale/zh-Hans.ts
@@ -123,6 +123,8 @@ export default {
   getMessageFailed: '获取消息失败',
   replyText: '回复',
   replyNotFindText: '该消息已撤回或删除',
+  msgRecallTimeErrorText: '已超过时间无法撤回',
+
   forwardToTeamText: '转发到群组',
   forwardToFriendText: '转发到个人',
   sessionRecordText: '的会话记录',
@@ -132,6 +134,12 @@ export default {
   unpinText: '取消标记',
   unpinFailedText: '取消标记失败',
   noPinListText: '暂无标记消息',
+  collectionText: '收藏',
+  deleteCollectionText: '删除收藏',
+  addCollectionSuccessText: '收藏成功',
+  addCollectionFailedText: '添加收藏失败',
+  deleteCollectionFailedText: '删除收藏失败',
+  noCollectionsText: '暂无收藏',
   you: '你',
   pinThisText: '标记了这条消息',
   delete: '删除此消息',
@@ -267,7 +275,15 @@ export default {
   fileText: '文件',
   allUnReadText: '全部成员未读',
   allReadText: '全部成员已读',
-
+  searchText: '请输入你要搜索的关键字',
+  searchTitleText: '搜索',
+  friendText: '好友',
+  teamText: '群组',
+  searchResultNullText: '该用户不存在',
+  conversationSendFailText: '[发送失败]',
+  conversationNotificationText: '[通知消息]',
+  getForwardMessageFailed: '该消息已撤回或删除',
+  fileMsgTitleText: '[文件消息]',
   // emoji 不能随便填，要用固定 key
   Laugh: '[大笑]',
   Happy: '[开心]',
@@ -359,6 +375,9 @@ export default {
   107320: 'PIN 消息不存在',
   107322: '重复 PIN',
   107327: '未开启 PIN 功能',
+  189301: '收藏数量超限',
+  189302: '收藏不存在',
+  189449: '并发操作收藏失败',
   // 群相关
   109432: '没有权限',
 }
diff --git a/NEUIKit/pages.json b/NEUIKit/pages.json
index 421a821..7f68028 100644
--- a/NEUIKit/pages.json
+++ b/NEUIKit/pages.json
@@ -12,6 +12,12 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/Conversation/conversation-search/index",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/Login/index",
       "style": {
@@ -157,6 +163,18 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/user-card/my/collection-card",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/user-card/my/collection-list",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/user-card/my-detail/index",
       "style": {
diff --git a/NEUIKit/pages/Chat/forward.vue b/NEUIKit/pages/Chat/forward.vue
index 8d0fc44..ef024af 100644
--- a/NEUIKit/pages/Chat/forward.vue
+++ b/NEUIKit/pages/Chat/forward.vue
@@ -104,6 +104,7 @@ const teamList = ref<V2NIMTeam[]>([])
 
 const conversationId = uni.$UIKitStore?.uiStore.selectedConversation
 let msgIdClient = ''
+let origin = ''
 // 转发相关
 const forwardModalVisible = ref(false)
 const forwardTo = ref('')
@@ -118,7 +119,7 @@ const handleForwardConfirm = (forwardComment: string) => {
 
   if (!forwardMsg.value) {
     uni.showToast({
-      title: t('getMessageFailed'),
+      title: t('getForwardMessageFailed'),
       icon: 'error',
     })
     setTimeout(() => {
@@ -163,6 +164,7 @@ onLoad((props) => {
   forwardConversationType.value = Number(props?.forwardConversationType)
   console.log('forwardConversationType: ', props?.forwardConversationType)
   msgIdClient = props?.msgIdClient
+  origin = props?.origin
 })
 
 const uninstallTeamListWatch = autorun(() => {
@@ -206,8 +208,7 @@ const handleItemClick = (_forwardTo: string) => {
     forwardMsg.value = deepClone(
       uni.$UIKitStore.msgStore.getMsg(conversationId, [msgIdClient])?.[0]
     )
-    if (!forwardMsg.value) {
-      // forwardMsg.value 为空，说明是转发的 pin 消息，此时内存里面可能没有该消息，需要从 pinMsgs 中去查。
+    if (origin === 'pin') {
       const curPinMsgsMap = uni.$UIKitStore.msgStore.pinMsgs.get(conversationId)
 
       const pinInfo = [...curPinMsgsMap.values()].find((pinInfo) => {
@@ -221,6 +222,11 @@ const handleItemClick = (_forwardTo: string) => {
       if (pinInfo) {
         forwardMsg.value = pinInfo.message
       }
+    } else if (origin === 'collection') {
+      const msg = uni.$UIKitStore.msgStore.collectionMsgs.get(msgIdClient)
+      if (msg) {
+        forwardMsg.value = msg
+      }
     }
 
     forwardModalVisible.value = true
diff --git a/NEUIKit/pages/Chat/index.vue b/NEUIKit/pages/Chat/index.vue
index 73535a8..4e495c5 100644
--- a/NEUIKit/pages/Chat/index.vue
+++ b/NEUIKit/pages/Chat/index.vue
@@ -48,13 +48,13 @@ import NavBar from './message/nav-bar.vue'
 import Icon from '../../components/Icon.vue'
 import MessageList from './message/message-list.vue'
 import MessageInput from './message/message-input.vue'
-import { HISTORY_LIMIT, MSG_ID_FLAG } from '../../utils/constants'
+import { HISTORY_LIMIT } from '../../utils/constants'
 import { t } from '../../utils/i18n'
 import { V2NIMMessage } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK/V2NIMMessageService'
 import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
 
 export interface YxReplyMsg {
-  idClient: string
+  messageClientId: string
   scene: V2NIMConst.V2NIMConversationType
   from: string
   receiverId: string
@@ -321,7 +321,7 @@ const msgsWatch = autorun(() => {
   if (messages.length !== 0) {
     const _replyMsgsMap: any = {}
     const reqMsgs: YxReplyMsg[] = []
-    const idClients: Record<string, string> = {}
+    const messageClientIds: Record<string, string> = {}
     msgs.value.forEach((msg) => {
       if (msg.serverExtension) {
         try {
@@ -337,16 +337,23 @@ const msgsWatch = autorun(() => {
               _replyMsgsMap[msg.messageClientId] = replyMsg
               // 如果没找到，说明被回复的消息可能有三种情况：1.被删除 2.被撤回 3.不在当前消息列表中（一次性没拉到，在之前的消息中）
             } else {
-              _replyMsgsMap[msg.messageClientId] = { idClient: 'noFind' }
-              const { scene, from, to, idServer, idClient, time, receiverId } =
-                yxReplyMsg
+              _replyMsgsMap[msg.messageClientId] = { messageClientId: 'noFind' }
+              const {
+                scene,
+                from,
+                to,
+                idServer,
+                messageClientId,
+                time,
+                receiverId,
+              } = yxReplyMsg
 
               if (
                 scene &&
                 from &&
                 to &&
                 idServer &&
-                idClient &&
+                messageClientId &&
                 time &&
                 receiverId
               ) {
@@ -355,11 +362,11 @@ const msgsWatch = autorun(() => {
                   from,
                   to,
                   idServer,
-                  idClient,
+                  messageClientId,
                   time,
                   receiverId,
                 })
-                idClients[idServer] = msg.messageClientId
+                messageClientIds[idServer] = msg.messageClientId
               }
             }
           }
@@ -373,7 +380,7 @@ const msgsWatch = autorun(() => {
         reqMsgs.map((item) => ({
           senderId: item.from,
           receiverId: item.receiverId,
-          messageClientId: item.idClient,
+          messageClientId: item.messageClientId,
           messageServerId: item.idServer,
           createTime: item.time,
           conversationType: item.scene,
@@ -384,7 +391,7 @@ const msgsWatch = autorun(() => {
           if (res?.length > 0) {
             res.forEach((item: V2NIMMessage) => {
               if (item.messageServerId) {
-                _replyMsgsMap[idClients[item.messageServerId]] = item
+                _replyMsgsMap[messageClientIds[item.messageServerId]] = item
               }
             })
           }
diff --git a/NEUIKit/pages/Chat/message/message-audio.vue b/NEUIKit/pages/Chat/message/message-audio.vue
index 5857f8b..60e2f69 100644
--- a/NEUIKit/pages/Chat/message/message-audio.vue
+++ b/NEUIKit/pages/Chat/message/message-audio.vue
@@ -4,7 +4,7 @@
     :style="{ width: audioContainerWidth + 'px' }"
     @tap="onPlayAudio"
   >
-    <div>{{ duration }}s</div>
+    <div class="audio-dur">{{ duration }}s</div>
     <div class="audio-icon-wrapper">
       <Icon :size="24" :key="audioIconType" :type="audioIconType" />
     </div>
@@ -23,6 +23,7 @@ import Icon from '../../../components/Icon.vue'
 import { events } from '../../../utils/constants'
 import { V2NIMMessageForUI } from '@xkit-yx/im-store-v2/dist/types/types'
 import { V2NIMMessageAudioAttachment } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK/V2NIMMessageService'
+import { onHide, onUnload } from '@dcloudio/uni-app'
 
 const props = withDefaults(
   defineProps<{
@@ -88,6 +89,7 @@ const toggleAudioPlayState = () => {
   }
 }
 
+// 初始化音频实例
 function initAudioSrc() {
   const audioContext = getAudio()
   if (!audioContext) {
@@ -168,17 +170,34 @@ const playAudioAnimation = () => {
   }
 }
 
-onUnmounted(() => {
+const stopAudioOnHide = () => {
   const audioContext = getAudio()
   if (isAudioPlaying.value) {
     stopAudio()
   }
   audioContext?.destroy?.()
+  animationFlag.value = false
   audioMap.delete('audio')
+}
+
+onUnmounted(() => {
+  stopAudioOnHide()
+})
+
+onHide(() => {
+  stopAudioOnHide()
+})
+
+onUnload(() => {
+  stopAudioOnHide()
 })
 </script>
 
 <style scoped lang="scss">
+.audio-dur {
+  height: 24px;
+  line-height: 24px;
+}
 .audio-in,
 .audio-out {
   width: 50px;
@@ -194,4 +213,10 @@ onUnmounted(() => {
     transform: rotate(180deg);
   }
 }
+
+.audio-icon-wrapper {
+  height: 24px;
+  display: flex;
+  align-items: center;
+}
 </style>
diff --git a/NEUIKit/pages/Chat/message/message-bubble.vue b/NEUIKit/pages/Chat/message/message-bubble.vue
index c6d4325..a2623a6 100644
--- a/NEUIKit/pages/Chat/message/message-bubble.vue
+++ b/NEUIKit/pages/Chat/message/message-bubble.vue
@@ -85,6 +85,22 @@
           ></Icon>
           <text class="msg-action-btn-text">{{ t('deleteText') }}</text>
         </div>
+        <div
+          class="msg-action-btn"
+          v-if="
+            props.msg.messageType !==
+            V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_CALL
+          "
+          @tap="handleCollectionMsg"
+        >
+          <Icon
+            :size="18"
+            color="#656A72"
+            class="msg-action-btn-icon"
+            type="icon-collection"
+          ></Icon>
+          <text class="msg-action-btn-text">{{ t('collectionText') }}</text>
+        </div>
       </div>
       <!-- 未知消息体 -->
       <div class="msg-action-groups-unknown" v-else>
@@ -319,18 +335,30 @@
           ></Icon>
           <text class="msg-action-btn-text">{{ t('deleteText') }}</text>
         </div>
+        <div class="msg-action-btn" @tap="handleRecallMsg">
+          <Icon
+            :size="18"
+            color="#656A72"
+            class="msg-action-btn-icon"
+            type="icon-chehui"
+          ></Icon>
+          <text class="msg-action-btn-text">{{ t('recallText') }}</text>
+        </div>
         <div
           class="msg-action-btn"
-          v-if="props.msg.canRecall"
-          @tap="handleRecallMsg"
+          v-if="
+            props.msg.messageType !==
+            V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_CALL
+          "
+          @tap="handleCollectionMsg"
         >
           <Icon
             :size="18"
             color="#656A72"
             class="msg-action-btn-icon"
-            type="icon-chehui"
+            type="icon-collection"
           ></Icon>
-          <text class="msg-action-btn-text">{{ t('recallText') }}</text>
+          <text class="msg-action-btn-text">{{ t('collectionText') }}</text>
         </div>
       </div>
       <!-- 未知消息体 -->
@@ -377,7 +405,7 @@ import { autorun } from 'mobx'
 import { deepClone } from '../../../utils'
 import { V2NIMMessageForUI } from '@xkit-yx/im-store-v2/dist/types/types'
 import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
-
+import { msgRecallTime } from '../../../utils/constants'
 const tooltipRef = ref(null)
 
 const props = withDefaults(
@@ -544,9 +572,56 @@ const handlePinMsg = () => {
   }
   closeTooltip()
 }
-const handleUnPinMsg = () => {
+
+// 收藏消息
+const handleCollectionMsg = () => {
   const _msg = deepClone(props.msg)
 
+  const conversation = uni.$UIKitStore.conversationStore.conversations.get(
+    _msg.conversationId
+  )
+  const collectionDataObj = {
+    message: uni.$UIKitNIM.V2NIMMessageConverter.messageSerialization(_msg), // 序列化
+    avatar: uni.$UIKitStore.userStore.users.get(_msg.senderId)?.avatar,
+    conversationName: conversation?.name,
+    senderName: uni.$UIKitStore.uiStore.getAppellation({
+      account: _msg.senderId,
+      teamId:
+        conversationType ===
+        V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM
+          ? _msg.receiverId
+          : '',
+    }),
+  }
+  const addCollectionParams = {
+    collectionType: 1000 + _msg.messageType, // 和移动端对齐
+    collectionData: JSON.stringify(collectionDataObj),
+    uniqueId: _msg.messageServerId,
+  }
+
+  uni.$UIKitStore.msgStore
+    .addCollectionActive(addCollectionParams)
+    .then(() => {
+      uni.showToast({
+        title: t('addCollectionSuccessText'),
+        icon: 'success',
+      })
+    })
+    .catch((err: any) => {
+      if (err?.code && typeof t(`${err.code}`) !== 'undefined') {
+        uni.showToast({
+          title: t(`${err.code}`),
+          icon: 'error',
+          duration: 1000,
+        })
+      } else {
+        uni.showToast({
+          title: t('addCollectionFailedText'),
+          icon: 'error',
+          duration: 1000,
+        })
+      }
+    })
   closeTooltip()
 }
 
@@ -577,6 +652,15 @@ const handleReplyMsg = async () => {
 
 // 撤回消息
 const handleRecallMsg = () => {
+  const diff = Date.now() - props.msg.createTime
+  if (diff > msgRecallTime) {
+    uni.showToast({
+      title: t('msgRecallTimeErrorText'),
+      icon: 'none',
+    })
+    closeTooltip()
+    return
+  }
   uni.showModal({
     title: t('recallText'),
     content: t('recall3'),
diff --git a/NEUIKit/pages/Chat/message/message-file.vue b/NEUIKit/pages/Chat/message/message-file.vue
index 82f814c..c2d9cad 100644
--- a/NEUIKit/pages/Chat/message/message-file.vue
+++ b/NEUIKit/pages/Chat/message/message-file.vue
@@ -12,7 +12,9 @@
       <Icon :type="iconType" :size="32"></Icon>
       <div class="msg-file-content">
         <div class="msg-file-title">
-          <text class="msg-file-name" v-text="name"></text>
+          <div class="msg-file-title-prefix">{{ prefixName }}</div>
+          <div class="msg-file-title-suffix">{{ suffixName }}</div>
+          <!-- <text class="msg-file-name" v-text="name"></text> -->
         </div>
         <div class="msg-file-size">{{ parseFileSize(size) }}</div>
       </div>
@@ -25,7 +27,9 @@
       <Icon :type="iconType" :size="32"></Icon>
       <div class="msg-file-content">
         <div class="msg-file-title">
-          <text class="msg-file-name" v-text="name"></text>
+          <div class="msg-file-title-prefix">{{ prefixName }}</div>
+          <div class="msg-file-title-suffix">{{ suffixName }}</div>
+          <!-- <text class="msg-file-name" v-text="name"></text> -->
         </div>
         <div class="msg-file-size">{{ parseFileSize(size) }}</div>
       </div>
@@ -68,6 +72,11 @@ const {
 //@ts-ignore
 const iconType = fileIconMap[getFileType(ext)] || 'icon-weizhiwenjian'
 
+const index = name.lastIndexOf('.') > -1 ? name.lastIndexOf('.') : name.length
+
+const prefixName = name.slice(0, Math.max(index - 5, 0))
+const suffixName = name.slice(Math.max(index - 5, 0))
+
 const downloadUrl =
   url + ((url as string).includes('?') ? '&' : '?') + `download=${name}`
 
@@ -115,9 +124,16 @@ const mpDownload = () => {
     color: #333;
     font-size: 14px;
     font-weight: 400;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    display: flex;
+
+    &-prefix {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    &-suffix {
+      white-space: nowrap;
+    }
   }
 
   &-name {
diff --git a/NEUIKit/pages/Chat/message/message-forward-modal.vue b/NEUIKit/pages/Chat/message/message-forward-modal.vue
index bed9556..eb9ed80 100644
--- a/NEUIKit/pages/Chat/message/message-forward-modal.vue
+++ b/NEUIKit/pages/Chat/message/message-forward-modal.vue
@@ -102,7 +102,7 @@ const forwardToNick = computed(() => {
 const forwardFromNick = computed(() => {
   return deepClone(
     uni.$UIKitStore.uiStore.getAppellation({
-      account: props.forwardMsg.senderId,
+      account: props.forwardMsg?.senderId,
     })
   )
 })
diff --git a/NEUIKit/pages/Chat/message/message-item.vue b/NEUIKit/pages/Chat/message/message-item.vue
index c484dd2..c81f97b 100644
--- a/NEUIKit/pages/Chat/message/message-item.vue
+++ b/NEUIKit/pages/Chat/message/message-item.vue
@@ -141,10 +141,7 @@
           :tooltip-visible="true"
           :bg-visible="true"
         >
-          <ReplyMessage
-            v-if="!!props.replyMsg"
-            :replyMsg="props.replyMsg"
-          ></ReplyMessage>
+          <ReplyMessage v-if="!!replyMsg" :replyMsg="replyMsg"></ReplyMessage>
           <MessageText :msg="props.msg"></MessageText>
         </MessageBubble>
       </div>
@@ -420,6 +417,7 @@ import {
   onUnmounted,
   defineProps,
   withDefaults,
+  onMounted,
 } from '../../../utils/transformVue'
 import Avatar from '../../../components/Avatar.vue'
 import MessageBubble from './message-bubble.vue'
@@ -439,24 +437,32 @@ import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
 import MessageIsRead from './message-read.vue'
 import Icon from '../../../components/Icon.vue'
 import Appellation from '../../../components/Appellation.vue'
-import { onLoad } from '@dcloudio/uni-app'
 const props = withDefaults(
   defineProps<{
     msg: V2NIMMessageForUI & { timeValue?: number }
     index: number
-    replyMsg?: V2NIMMessageForUI
+    replyMsgsMap?: {
+      [key: string]: V2NIMMessageForUI
+    }
     broadcastNewAudioSrc: string
   }>(),
   {}
 )
 
+const replyMsg = computed(() => {
+  return props.replyMsgsMap && props.replyMsgsMap[props.msg.messageClientId]
+})
+
+// 昵称
 const appellation = ref('')
 const accountId = uni.$UIKitStore?.userStore?.myUserInfo.accountId
 
+// 会话类型
 const conversationType =
   uni.$UIKitNIM.V2NIMConversationIdUtil.parseConversationType(
     props.msg.conversationId
   )
+// 会话对象
 const to = uni.$UIKitNIM.V2NIMConversationIdUtil.parseConversationTargetId(
   props.msg.conversationId
 )
@@ -467,7 +473,12 @@ const videoFirstFrameDataUrl = computed(() => {
   return url ? `${url}${url.includes('?') ? '&' : '?'}vframe=1` : ''
 })
 
+// 图片
 const imageUrl = computed(() => {
+  // 被拉黑
+  if (props.msg.errorCode == 102426) {
+    return 'https://yx-web-nosdn.netease.im/common/c1f278b963b18667ecba4ee9a6e68047/img-fail.png'
+  }
   return props.msg?.attachment?.url || props.msg.attachment?.file
 })
 
@@ -496,6 +507,7 @@ const handleReeditMsg = (msg: V2NIMMessageForUI) => {
   uni.$emit(events.ON_REEDIT_MSG, msg)
 }
 
+// 监听昵称变化
 const uninstallAppellationWatch = autorun(() => {
   // 昵称展示顺序 群昵称 > 备注 > 个人昵称 > 帐号
   appellation.value = deepClone(
diff --git a/NEUIKit/pages/Chat/message/message-list.vue b/NEUIKit/pages/Chat/message/message-list.vue
index bbda0c2..df38fb4 100644
--- a/NEUIKit/pages/Chat/message/message-list.vue
+++ b/NEUIKit/pages/Chat/message/message-list.vue
@@ -15,9 +15,7 @@
           :msg="item"
           :index="index"
           :key="item.renderKey"
-          :reply-msg="
-            props.replyMsgsMap && props.replyMsgsMap[item.messageClientId]
-          "
+          :reply-msgs-map="replyMsgsMap"
           :broadcastNewAudioSrc="broadcastNewAudioSrc"
         >
         </MessageItem>
@@ -137,6 +135,7 @@ const finalMsgs = computed(() => {
       renderKey: `${item.createTime}`,
     })
   })
+
   return res
 })
 
@@ -184,14 +183,6 @@ const handleTapMessageList = () => {
   transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
 }
 
-// .msg-list {
-//   padding: 0 16px 20px 16px;
-//   box-sizing: border-box;
-//   transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-//   overflow-x: hidden;
-//   // height: 100%;
-// }
-
 .msg-tip {
   text-align: center;
   color: #b3b7bc;
@@ -216,6 +207,7 @@ const handleTapMessageList = () => {
   font-size: 15px;
   margin-top: 20px;
 }
+
 page > view > message > view > message-list {
   height: 100%;
 }
diff --git a/NEUIKit/pages/Chat/message/message-reply.vue b/NEUIKit/pages/Chat/message/message-reply.vue
index 03a10dd..eaca976 100644
--- a/NEUIKit/pages/Chat/message/message-reply.vue
+++ b/NEUIKit/pages/Chat/message/message-reply.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="props.replyMsg.messageClientId" class="reply-msg-wrapper">
+    <div v-if="props.replyMsg?.messageClientId" class="reply-msg-wrapper">
       <!-- replyMsg 不存在 说明回复的消息被删除或者撤回 -->
       <div v-if="!isReplyMsgExist">
         <span>{{ t('replyNotFindText') }}</span>
@@ -26,7 +26,7 @@
           class="other-msg-wrapper"
         >
           <uni-link :href="downloadUrl" :download="name" :showUnderLine="false">
-            [文件消息]
+            {{ t('fileMsgTitleText') }}
           </uni-link>
         </div>
         <div class="other-msg-wrapper" v-else>
@@ -93,6 +93,7 @@ import {
   computed,
   defineProps,
   withDefaults,
+  onUnmounted,
 } from '../../../utils/transformVue'
 import MessageText from './message-text.vue'
 // @ts-ignore
@@ -107,15 +108,20 @@ import MessageAudio from './message-audio.vue'
 import { V2NIMMessageForUI } from '@xkit-yx/im-store-v2/dist/types/types'
 import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
 
-const props = withDefaults(defineProps<{ replyMsg: V2NIMMessageForUI }>(), {})
+const props = withDefaults(
+  defineProps<{ replyMsg: V2NIMMessageForUI | undefined }>(),
+  {}
+)
 
 const isFullScreen = ref(false)
 const repliedTo = ref('')
 
 const { name = '', url = '' } = props.replyMsg?.attachment || {}
+
 const downloadUrl =
   url + ((url as string).includes('?') ? '&' : '?') + `download=${name}`
 
+// 被回复消息是否存在
 const isReplyMsgExist = computed(() => {
   return props.replyMsg?.messageClientId !== 'noFind'
 })
@@ -123,16 +129,16 @@ const isReplyMsgExist = computed(() => {
 onMounted(() => {
   repliedTo.value = deepClone(
     uni.$UIKitStore.uiStore.getAppellation({
-      account: props.replyMsg?.senderId,
+      account: props.replyMsg?.senderId as string,
       teamId: props.replyMsg?.receiverId,
     })
   )
 })
 
-autorun(() => {
+const repliedToWatch = autorun(() => {
   repliedTo.value = deepClone(
     uni.$UIKitStore.uiStore.getAppellation({
-      account: props.replyMsg?.senderId,
+      account: props.replyMsg?.senderId as string,
       teamId: props.replyMsg?.receiverId,
     })
   )
@@ -177,6 +183,10 @@ const closeFullReplyMsg = () => {
   stopAllAudio()
   uni.$emit(events.HANDLE_MOVE_THROUGH, false)
 }
+
+onUnmounted(() => {
+  repliedToWatch()
+})
 </script>
 
 <style lang="scss" scoped>
@@ -263,7 +273,7 @@ const closeFullReplyMsg = () => {
   position: fixed;
   right: 20px;
   z-index: 999999;
-  top: 40px;
+  top: 60px;
 }
 
 .reply-message-close-mp {
diff --git a/NEUIKit/pages/Chat/message/pin-list.vue b/NEUIKit/pages/Chat/message/pin-list.vue
index ad0ed11..1e11ec2 100644
--- a/NEUIKit/pages/Chat/message/pin-list.vue
+++ b/NEUIKit/pages/Chat/message/pin-list.vue
@@ -98,7 +98,7 @@ page {
   box-sizing: border-box;
   padding-bottom: 30px;
   background-color: rgb(245, 246, 247);
-
+  min-height: 100vh;
   .nav-bar-text {
     color: rgb(20, 146, 209);
   }
diff --git a/NEUIKit/pages/Contact/contact-list/valid-list.vue b/NEUIKit/pages/Contact/contact-list/valid-list.vue
index 1e30903..f2243fa 100644
--- a/NEUIKit/pages/Contact/contact-list/valid-list.vue
+++ b/NEUIKit/pages/Contact/contact-list/valid-list.vue
@@ -4,7 +4,8 @@
     <div class="valid-list-content">
       <Empty v-if="validMsg.length === 0" :text="t('validEmptyText')" />
       <template v-else>
-        <div class="valid-item" v-for="msg in validMsg">
+        <div class="valid-item" v-for="msg in validMsg" :key="msg.timestamp">
+          <!-- 好友申请 已同意 -->
           <template
             v-if="
               msg.status ===
@@ -16,11 +17,7 @@
               <Avatar :account="msg.applicantAccountId" />
               <div class="valid-name-container">
                 <div class="valid-name">
-                  {{
-                    getAppellation({
-                      account: msg.applicantAccountId,
-                    })
-                  }}
+                  <Appellation :account="msg.applicantAccountId" />
                 </div>
                 <div class="valid-action">{{ t('applyFriendText') }}</div>
               </div>
@@ -30,6 +27,7 @@
               <span class="valid-state-text">{{ t('acceptResultText') }}</span>
             </div>
           </template>
+          <!--好友申请 已拒绝 -->
           <template
             v-else-if="
               msg.status ===
@@ -42,11 +40,7 @@
                 <Avatar :account="msg.recipientAccountId" />
                 <div class="valid-name-container">
                   <div class="valid-name">
-                    {{
-                      getAppellation({
-                        account: msg.recipientAccountId,
-                      })
-                    }}
+                    <Appellation :account="msg.recipientAccountId" />
                   </div>
                   <div class="valid-action">{{ t('beRejectResultText') }}</div>
                 </div>
@@ -57,11 +51,7 @@
                 <Avatar :account="msg.applicantAccountId" />
                 <div class="valid-name-container">
                   <div class="valid-name">
-                    {{
-                      getAppellation({
-                        account: msg.applicantAccountId,
-                      })
-                    }}
+                    <Appellation :account="msg.applicantAccountId" />
                   </div>
                   <div class="valid-action">{{ t('applyFriendText') }}</div>
                 </div>
@@ -74,6 +64,7 @@
               </div>
             </template>
           </template>
+          <!-- 好友申请 未处理 -->
           <template
             v-else-if="
               msg.status ===
@@ -86,11 +77,7 @@
                 <Avatar :account="msg.applicantAccountId" />
                 <div class="valid-name-container">
                   <div class="valid-name">
-                    {{
-                      getAppellation({
-                        account: msg.applicantAccountId,
-                      })
-                    }}
+                    <Appellation :account="msg.applicantAccountId" />
                   </div>
                   <div class="valid-action">{{ t('applyFriendText') }}</div>
                 </div>
@@ -130,24 +117,18 @@ import { t } from '../../../utils/i18n'
 import { deepClone } from '../../../utils'
 import { V2NIMFriendAddApplicationForUI } from '@xkit-yx/im-store-v2/dist/types/types'
 import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
-
+import Appellation from '../../../components/Appellation.vue'
 const validMsg = ref<V2NIMFriendAddApplicationForUI[]>([])
 const applyFriendLoading = ref(false)
 
+// 是否是我发起的申请
 const isMeApplicant = (data: V2NIMFriendAddApplicationForUI) => {
   return (
     data.applicantAccountId === uni.$UIKitStore.userStore.myUserInfo.accountId
   )
 }
 
-const uninstallValidMsgWatch = autorun(() => {
-  validMsg.value = deepClone(uni.$UIKitStore.sysMsgStore.friendApplyMsgs)
-})
-
-const getAppellation = (params: { account: string }) => {
-  return uni.$UIKitStore.uiStore.getAppellation(params)
-}
-
+// 拒绝好友申请
 const handleRejectApplyFriendClick = async (
   msg: V2NIMFriendAddApplicationForUI
 ) => {
@@ -168,6 +149,7 @@ const handleRejectApplyFriendClick = async (
   }
 }
 
+// 接受好友申请
 const handleAcceptApplyFriendClick = async (
   msg: V2NIMFriendAddApplicationForUI
 ) => {
@@ -202,6 +184,13 @@ const handleAcceptApplyFriendClick = async (
   }
 }
 
+const uninstallValidMsgWatch = autorun(() => {
+  validMsg.value = deepClone(uni.$UIKitStore.sysMsgStore.friendApplyMsgs)
+  uni.$UIKitStore.sysMsgStore.friendApplyMsgs?.map((item) => {
+    uni.$UIKitStore.userStore.getUserActive(item.applicantAccountId)
+  })
+})
+
 onUnmounted(() => {
   uninstallValidMsgWatch()
 })
diff --git a/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue b/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
index aa9fe6b..e4fa5c6 100644
--- a/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
+++ b/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
@@ -42,7 +42,9 @@
             v-if="showSessionUnread"
             :conversation="props.conversation"
           ></ConversationItemIsRead>
-          <span class="conversation-item-desc-content">{{ content }}</span>
+          <span class="conversation-item-desc-content">{{
+            lastMsgContent
+          }}</span>
           <Icon
             v-if="isMute"
             iconClassName="conversation-item-desc-state"
@@ -111,6 +113,7 @@ const handleClick = (type: string) => {
   }
 }
 
+// 群头像
 const teamAvatar = computed(() => {
   if (
     props.conversation.type ===
@@ -121,6 +124,7 @@ const teamAvatar = computed(() => {
   }
 })
 
+// 对话方
 const sessionName = computed(() => {
   if (props.conversation.name) {
     return props.conversation.name
@@ -128,14 +132,8 @@ const sessionName = computed(() => {
   return props.conversation.conversationId
 })
 
-const to = computed(() => {
-  const res = uni.$UIKitNIM.V2NIMConversationIdUtil.parseConversationTargetId(
-    props.conversation.conversationId
-  )
-  return res
-})
-
-const content = computed(() => {
+// 会话最后一条消息内容
+const lastMsgContent = computed(() => {
   const lastMsg = props.conversation.lastMessage
 
   if (lastMsg) {
@@ -153,11 +151,15 @@ const content = computed(() => {
     }
 
     if (
-      sendingState ===
-        V2NIMConst.V2NIMMessageSendingState
-          .V2NIM_MESSAGE_SENDING_STATE_SENDING ||
       messageType ===
-        V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_NOTIFICATION
+      V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_NOTIFICATION
+    ) {
+      return t('conversationNotificationText')
+    }
+
+    if (
+      sendingState ===
+      V2NIMConst.V2NIMMessageSendingState.V2NIM_MESSAGE_SENDING_STATE_SENDING
     ) {
       return ''
     }
@@ -166,7 +168,7 @@ const content = computed(() => {
       sendingState ===
       V2NIMConst.V2NIMMessageSendingState.V2NIM_MESSAGE_SENDING_STATE_FAILED
     ) {
-      return '[发送失败]'
+      return t('conversationSendFailText')
     }
 
     return getMsgContentTipByType({
@@ -177,6 +179,13 @@ const content = computed(() => {
   return ''
 })
 
+const to = computed(() => {
+  const res = uni.$UIKitNIM.V2NIMConversationIdUtil.parseConversationTargetId(
+    props.conversation.conversationId
+  )
+  return res
+})
+
 const date = computed(() => {
   const time =
     props.conversation.lastMessage?.messageRefer.createTime ||
diff --git a/NEUIKit/pages/Conversation/conversation-list/index.vue b/NEUIKit/pages/Conversation/conversation-list/index.vue
index ca90cdf..ff5423b 100644
--- a/NEUIKit/pages/Conversation/conversation-list/index.vue
+++ b/NEUIKit/pages/Conversation/conversation-list/index.vue
@@ -45,12 +45,42 @@
     </div>
     <div class="block"></div>
     <NetworkAlert />
+    <div
+      v-if="!conversationList || conversationList.length === 0"
+      class="conversation-search"
+      @click="jumpToSearch"
+    >
+      <div class="search-input-wrapper">
+        <div class="search-icon-wrapper">
+          <Icon
+            iconClassName="search-icon"
+            :size="16"
+            color="#A6ADB6"
+            type="icon-sousuo"
+          ></Icon>
+        </div>
+        <div class="search-input">{{ t('searchText') }}</div>
+      </div>
+    </div>
     <!-- 页面初始化的过程中，sessionList编译到小程序和h5出现sessionList为undefined的情况，即使给了默认值为空数组，故在此处进行判断 -->
     <Empty
       v-if="!conversationList || conversationList.length === 0"
       :text="t('conversationEmptyText')"
     />
     <div v-else class="conversation-list-wrapper">
+      <div class="conversation-search" @click="jumpToSearch">
+        <div class="search-input-wrapper">
+          <div class="search-icon-wrapper">
+            <Icon
+              iconClassName="search-icon"
+              :size="16"
+              color="#A6ADB6"
+              type="icon-sousuo"
+            ></Icon>
+          </div>
+          <div class="search-input">{{ t('searchText') }}</div>
+        </div>
+      </div>
       <!-- 此处的key如果用session.id，会在ios上渲染存在问题，会出现会话列表显示undefined -->
       <div
         v-for="(conversation, index) in conversationList"
@@ -73,7 +103,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from '../../../utils/transformVue'
+import { onUnmounted, ref } from '../../../utils/transformVue'
 import { autorun } from 'mobx'
 import { onHide } from '@dcloudio/uni-app'
 import Icon from '../../../components/Icon.vue'
@@ -195,11 +225,17 @@ const onDropdownClick = (urlType: 'addFriend' | 'createGroup') => {
   })
 }
 
+const jumpToSearch = () => {
+  customNavigateTo({
+    url: '/pages/Conversation/conversation-search/index',
+  })
+}
+
 onHide(() => {
   addDropdownVisible.value = false
 })
 
-autorun(() => {
+const conversationListWatch = autorun(() => {
   conversationList.value = deepClone(uni.$UIKitStore?.uiStore?.conversations)
     ?.map((conversation: V2NIMConversation) => {
       return {
@@ -214,7 +250,7 @@ autorun(() => {
   setTabUnread()
 })
 
-autorun(() => {
+const getTotalUnreadMsgsCountWatch = autorun(() => {
   // 为了监听会触发得留着这个 console
   console.log(
     'unreadSysMsgCount:',
@@ -223,6 +259,10 @@ autorun(() => {
   )
   setContactTabUnread()
 })
+onUnmounted(() => {
+  conversationListWatch()
+  getTotalUnreadMsgsCountWatch()
+})
 </script>
 
 <style lang="scss" scoped>
@@ -247,7 +287,34 @@ autorun(() => {
   opacity: 1;
   z-index: 999;
 }
-
+.conversation-search {
+  display: flex;
+  align-items: center;
+  height: 54px;
+  box-sizing: border-box;
+  overflow: hidden;
+  padding: 10px;
+}
+.search-input-wrapper {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  height: 34px;
+  overflow: hidden;
+  box-sizing: border-box;
+  padding: 8px 10px;
+  background: #f3f5f7;
+  border-radius: 5px;
+}
+.search-input {
+  margin-left: 5px;
+  color: #999999;
+}
+.search-icon-wrapper {
+  height: 22px;
+  display: flex;
+  align-items: center;
+}
 .block {
   height: 60px;
   width: 100%;
diff --git a/NEUIKit/pages/Conversation/conversation-search/index.vue b/NEUIKit/pages/Conversation/conversation-search/index.vue
new file mode 100644
index 0000000..385c7f7
--- /dev/null
+++ b/NEUIKit/pages/Conversation/conversation-search/index.vue
@@ -0,0 +1,247 @@
+<template>
+  <div>
+    <NavBar :title="t('searchTitleText')" />
+    <div class="search-wrapper">
+      <div class="input-wrapper">
+        <div class="search-icon-wrapper">
+          <Icon
+            iconClassName="search-icon"
+            :size="16"
+            color="#A6ADB6"
+            type="icon-sousuo"
+          ></Icon>
+        </div>
+        <input
+          class="input"
+          :value="searchText"
+          @input="handleInput"
+          :focus="inputFocus"
+          @focus="handleFocus"
+          @blur="handleBlur"
+          :placeholder="t('searchText')"
+        />
+        <div v-if="searchText" class="clear-icon" @tap="clearInput()">
+          <Icon type="icon-shandiao" :size="16" />
+        </div>
+      </div>
+    </div>
+    <div v-if="searchResult.length > 0" class="search-result-wrapper">
+      <div class="search-result-list">
+        <div v-for="item in searchResult" :key="item.renderKey">
+          <div class="result-title" v-if="item.title == 'friends'">
+            {{ t('friendText') }}
+          </div>
+          <div class="result-title" v-else-if="item.title == 'groups'">
+            {{ t('teamText') }}
+          </div>
+          <div v-else>
+            <SearchResultItem :item="item" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="searchResult.length == 0 && searchText">
+      <Empty :text="t('searchResultNullText')" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {
+  ref,
+  onUnmounted,
+  computed,
+  onMounted,
+} from '../../../utils/transformVue'
+import { t } from '../../../utils/i18n'
+import NavBar from '../../../components/NavBar.vue'
+import Icon from '../../../components/Icon.vue'
+import { autorun } from 'mobx'
+import SearchResultItem from './search-result-item.vue'
+import Empty from '../../../components/Empty.vue'
+const inputFocus = ref(false)
+
+const searchText = ref('')
+
+const searchList = ref<{ id: string; list: any }[]>([])
+
+const searchListWatch = autorun(() => {
+  const friends =
+    uni.$UIKitStore.uiStore.friends
+      .filter(
+        (item) =>
+          !uni.$UIKitStore.relationStore.blacklist.includes(item.accountId)
+      )
+      .map((item) => {
+        const user = uni.$UIKitStore.userStore.users.get(item.accountId) || {
+          accountId: '',
+          name: '',
+          createTime: Date.now(),
+        }
+
+        return {
+          ...item,
+          ...user,
+        }
+      }) || []
+  const teamList = uni.$UIKitStore.uiStore.teamList || []
+  searchList.value = [
+    {
+      id: 'friends',
+      list: friends,
+    },
+    {
+      id: 'groups',
+      list: teamList,
+    },
+  ].filter((item) => !!item.list.length)
+})
+
+const searchResult = computed(() => {
+  const res: { title?: string; renderKey: string }[] = []
+  if (searchText.value) {
+    const finalSections = searchList.value
+      .map((item) => {
+        if (item.id === 'friends') {
+          return {
+            ...item,
+            list: item.list?.filter((item) => {
+              return (
+                item.alias?.includes(searchText.value) ||
+                item.name?.includes(searchText.value) ||
+                item.accountId?.includes(searchText.value)
+              )
+            }),
+          }
+        }
+
+        if (item.id === 'groups') {
+          return {
+            ...item,
+            list: item.list?.filter((item) => {
+              return (item.name || item.teamId).includes(searchText.value)
+            }),
+          }
+        }
+
+        return { ...item }
+      })
+      .filter((item) => !!item.list?.length)
+
+    finalSections.forEach((item) => {
+      if (item.id === 'friends') {
+        res.push({
+          title: 'friends',
+          renderKey: 'friends',
+        })
+        item.list.forEach((item: any) => {
+          res.push({
+            ...item,
+            renderKey: item.accountId,
+          })
+        })
+      } else if (item.id === 'groups') {
+        res.push({
+          title: 'groups',
+          renderKey: 'groups',
+        })
+        item.list.forEach((item: any) => {
+          res.push({
+            ...item,
+            renderKey: item.teamId,
+          })
+        })
+      }
+    })
+  }
+  console.log('==================res', res)
+  return res
+})
+
+onMounted(() => {
+  inputFocus.value = true
+})
+
+const handleBlur = () => {
+  inputFocus.value = false
+}
+
+const handleFocus = () => {
+  inputFocus.value = true
+}
+
+const handleInput = (event: any) => {
+  searchText.value = event.detail.value
+}
+
+const clearInput = () => {
+  inputFocus.value = true
+  searchText.value = ''
+}
+
+onUnmounted(() => {
+  searchListWatch()
+})
+</script>
+
+<style lang="scss" scoped>
+$primary-color: #337eff;
+$error-color: #f56c6c;
+
+.search-wrapper {
+  padding: 8px 10px;
+}
+
+.input-wrapper {
+  height: 40px;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  background: #f3f5f7;
+  border-radius: 5px;
+  padding: 8px 10px;
+}
+
+.search-icon-wrapper {
+  margin-right: 5px;
+  display: flex;
+  align-items: center;
+}
+.form-input-item {
+  border-bottom: 1px solid #dcdfe5;
+  padding: 10px 10px 5px 0px;
+  display: flex;
+  height: 44px;
+  align-items: center;
+
+  &.focus {
+    border-color: $primary-color;
+  }
+
+  &.error {
+    border-color: $error-color;
+  }
+}
+
+.result-title {
+  height: 30px;
+  color: #c0c0c1;
+  font-size: 14px;
+  border-bottom: 1px solid #c0c0c1;
+}
+
+.input {
+  flex: 1;
+  height: 30px;
+  border: none;
+  outline: none;
+}
+.clear-icon {
+  width: 40px;
+  text-align: right;
+}
+
+.search-result-wrapper {
+  padding: 0 10px;
+}
+</style>
diff --git a/NEUIKit/pages/Conversation/conversation-search/search-result-item.vue b/NEUIKit/pages/Conversation/conversation-search/search-result-item.vue
new file mode 100644
index 0000000..6e56dbe
--- /dev/null
+++ b/NEUIKit/pages/Conversation/conversation-search/search-result-item.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="search-result-list-item" @click="handleItemClick">
+    <div class="result-item-avatar">
+      <Avatar :account="to" :avatar="teamAvatar" />
+    </div>
+    <div v-if="!isTeam" class="result-item-title">
+      <Appellation :account="to" />
+      <div class="result-item-account">{{ to }}</div>
+    </div>
+    <div v-else class="result-item-title">
+      {{ teamName }}
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {
+  defineProps,
+  withDefaults,
+  computed,
+} from '../../../utils/transformVue'
+import { t } from '../../../utils/i18n'
+import Avatar from '../../../components/Avatar.vue'
+import Appellation from '../../../components/Appellation.vue'
+import { customNavigateTo } from '../../../utils/customNavigate'
+import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
+
+const props = withDefaults(
+  defineProps<{
+    item: any
+  }>(),
+  {}
+)
+
+// 群头像
+const teamAvatar = computed(() => {
+  if (props.item.teamId) {
+    return props.item.avatar
+  }
+})
+
+// 对话方
+const to = computed(() => {
+  if (props.item.teamId) {
+    return props.item.teamId
+  }
+  return props.item.accountId
+})
+
+// 是否是群
+const isTeam = computed(() => {
+  return !!props.item.teamId
+})
+
+// 群名
+const teamName = computed(() => {
+  if (props.item.teamId) {
+    return props.item.name
+  }
+  return ''
+})
+
+let flag = false
+
+const handleItemClick = async () => {
+  if (flag) return
+  try {
+    flag = true
+    let conversationType
+    let receiverId
+    let item = props.item
+    if (item.accountId) {
+      conversationType =
+        V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P
+      receiverId = item.accountId
+    } else if (item.teamId) {
+      conversationType =
+        V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM
+      receiverId = item.teamId
+    } else {
+      throw Error('unknow scene')
+    }
+    await uni.$UIKitStore.conversationStore.insertConversationActive(
+      conversationType,
+      receiverId
+    )
+
+    customNavigateTo({
+      url: '/pages/Chat/index',
+    })
+  } catch {
+    uni.showToast({
+      title: t('selectSessionFailText'),
+      icon: 'error',
+    })
+  } finally {
+    flag = false
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.search-result-list-item {
+  display: flex;
+  align-items: center;
+  height: 50px;
+  margin: 10px 0;
+}
+
+.result-item-avatar {
+  width: 42px;
+}
+
+.result-item-title {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  margin-left: 10px;
+  font-size: 14px;
+}
+.result-item-account {
+  font-size: 13px;
+  color: #b5b6b8;
+}
+</style>
diff --git a/NEUIKit/pages/Conversation/index.vue b/NEUIKit/pages/Conversation/index.vue
index 96123d5..1eacaed 100644
--- a/NEUIKit/pages/Conversation/index.vue
+++ b/NEUIKit/pages/Conversation/index.vue
@@ -7,9 +7,6 @@ import ConversationList from './conversation-list/index.vue'
 import { trackInit } from '../../utils/reporter'
 import { onShow } from '@dcloudio/uni-app'
 
-import { setContactTabUnread, setTabUnread } from '../../utils/msg'
-import { autorun } from 'mobx'
-
 trackInit('ConversationUIKit')
 
 onShow(() => {
diff --git a/NEUIKit/pages/Group/group-add/index.vue b/NEUIKit/pages/Group/group-add/index.vue
index d20fec8..c7ff48e 100644
--- a/NEUIKit/pages/Group/group-add/index.vue
+++ b/NEUIKit/pages/Group/group-add/index.vue
@@ -1,20 +1,20 @@
 <template>
   <div>
     <NavBar :title="t('friendSelectText')" />
-    <FriendSelect
-      :friendList="friendList"
+    <PersonSelect
+      :personList="friendList"
       @checkboxChange="checkboxChange"
       :showBtn="true"
       :onBtnClick="addTeamMember"
     >
-    </FriendSelect>
+    </PersonSelect>
   </div>
 </template>
 
 <script lang="ts" setup>
-import FriendSelect, {
-  FriendSelectItem,
-} from '../../../components/FriendSelect.vue'
+import PersonSelect, {
+  PersonSelectItem,
+} from '../../../components/PersonSelect.vue'
 import { ref } from '../../../utils/transformVue'
 import NavBar from '../../../components/NavBar.vue'
 import { t } from '../../../utils/i18n'
@@ -23,7 +23,7 @@ import { debounce } from '@xkit-yx/utils'
 import { deepClone } from '../../../utils'
 import { events } from '../../../utils/constants'
 
-const friendList = ref<FriendSelectItem[]>([])
+const friendList = ref<PersonSelectItem[]>([])
 let teamId = ''
 let newTeamMember: string[] = []
 
diff --git a/NEUIKit/pages/Group/group-create/index.vue b/NEUIKit/pages/Group/group-create/index.vue
index 063e9a8..d22c467 100644
--- a/NEUIKit/pages/Group/group-create/index.vue
+++ b/NEUIKit/pages/Group/group-create/index.vue
@@ -1,20 +1,20 @@
 <template>
   <div>
     <NavBar :title="t('createTeamText')" />
-    <FriendSelect
-      :friendList="friendList"
+    <PersonSelect
+      :personList="friendList"
       @checkboxChange="checkboxChange"
       :showBtn="true"
       :btnText="t('createButtonText') + '(' + groupMembers.length + ')'"
     >
-    </FriendSelect>
+    </PersonSelect>
   </div>
 </template>
 
 <script lang="ts" setup>
-import FriendSelect, {
-  type FriendSelectItem,
-} from '../../../components/FriendSelect.vue'
+import PersonSelect, {
+  type PersonSelectItem,
+} from '../../../components/PersonSelect.vue'
 import { ref, computed } from '../../../utils/transformVue'
 import NavBar from '../../../components/NavBar.vue'
 import { t } from '../../../utils/i18n'
@@ -22,7 +22,7 @@ import { onLoad, onUnload } from '@dcloudio/uni-app'
 import { customRedirectTo } from '../../../utils/customNavigate'
 import { events } from '../../../utils/constants'
 
-const friendList = ref<FriendSelectItem[]>([])
+const friendList = ref<PersonSelectItem[]>([])
 
 const groupMembers = computed(() => {
   return friendList.value
diff --git a/NEUIKit/pages/Group/group-set/add-group-manager.vue b/NEUIKit/pages/Group/group-set/add-group-manager.vue
index 57ea6ba..80395a5 100644
--- a/NEUIKit/pages/Group/group-set/add-group-manager.vue
+++ b/NEUIKit/pages/Group/group-set/add-group-manager.vue
@@ -1,21 +1,21 @@
 <template>
   <div>
-    <NavBar :title="t('teamMemebrSelect')" />
-    <FriendSelect
+    <NavBar :title="t('teamMemberSelect')" />
+    <PersonSelect
       :max="10"
-      :friendList="teamMemberList"
+      :personList="teamMemberList"
       @checkboxChange="checkboxChange"
       :showBtn="true"
       :onBtnClick="onOk"
     >
-    </FriendSelect>
+    </PersonSelect>
   </div>
 </template>
 
 <script lang="ts" setup>
-import FriendSelect, {
-  FriendSelectItem,
-} from '../../../components/FriendSelect.vue'
+import PersonSelect, {
+  PersonSelectItem,
+} from '../../../components/PersonSelect.vue'
 import { onUnmounted, ref } from '../../../utils/transformVue'
 import NavBar from '../../../components/NavBar.vue'
 import { t } from '../../../utils/i18n'
@@ -26,7 +26,7 @@ import { events } from '../../../utils/constants'
 import { autorun } from 'mobx'
 import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
 
-const teamMemberList = ref<FriendSelectItem[]>([])
+const teamMemberList = ref<PersonSelectItem[]>([])
 let selectManager: string[] = []
 let teamId = ''
 
@@ -88,8 +88,8 @@ let uninstallTeamMemberListWatch = () => {}
 
 onLoad((props) => {
   teamId = props ? props.id : ''
-  autorun(() => {
-    uninstallTeamMemberListWatch = teamMemberList.value = deepClone(
+  uninstallTeamMemberListWatch = autorun(() => {
+    teamMemberList.value = deepClone(
       uni.$UIKitStore.teamMemberStore
         .getTeamMember(teamId)
         .filter((item) => {
@@ -107,6 +107,7 @@ onLoad((props) => {
           }
           return {
             accountId: item.accountId,
+            teamId: item.teamId,
             checked:
               item.memberRole ===
               V2NIMConst.V2NIMTeamMemberRole.V2NIM_TEAM_MEMBER_ROLE_MANAGER,
diff --git a/NEUIKit/pages/user-card/my/about.vue b/NEUIKit/pages/user-card/my/about.vue
index f671ca3..c0a2d87 100644
--- a/NEUIKit/pages/user-card/my/about.vue
+++ b/NEUIKit/pages/user-card/my/about.vue
@@ -11,7 +11,7 @@
     <div class="aboutInfo-item-wrapper">
       <div class="item">
         <div>版本号</div>
-        <div>10.1.0</div>
+        <div>10.2.0</div>
       </div>
       <div class="item">
         <div>IM 版本</div>
diff --git a/NEUIKit/pages/user-card/my/collection-card.vue b/NEUIKit/pages/user-card/my/collection-card.vue
new file mode 100644
index 0000000..074efa0
--- /dev/null
+++ b/NEUIKit/pages/user-card/my/collection-card.vue
@@ -0,0 +1,380 @@
+<template>
+  <div class="collection-card-wrapper">
+    <div class="info-wrapper">
+      <div class="info" @tap="gotoChat">
+        <div class="info-left">
+          <image
+            :lazy-load="true"
+            class="avatar-img"
+            v-if="collectionData.avatar"
+            :src="collectionData.avatar"
+            mode="aspectFill"
+          />
+        </div>
+        <div class="info-right">
+          <div class="name">
+            {{ collectionData.senderName }}
+          </div>
+          <div class="conversation">
+            来自于 {{ collectionData.conversationName }}
+          </div>
+        </div>
+      </div>
+      <div class="info-icon">
+        <Icon type="icon-More" @tap="handleCollection" />
+      </div>
+    </div>
+    <div class="content-wrapper">
+      <div
+        class="file-wrapper"
+        v-if="
+          msg.messageType ===
+          V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_IMAGE
+        "
+      >
+        <div
+          @tap="
+            () => {
+              handleImageTouch(msg.attachment.url)
+            }
+          "
+        >
+          <image
+            class="msg-image"
+            :lazy-load="true"
+            mode="aspectFill"
+            :src="imageUrl"
+          ></image>
+        </div>
+      </div>
+      <div
+        class="file-wrapper"
+        v-else-if="
+          msg.messageType ===
+          V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_VIDEO
+        "
+      >
+        <div class="video-msg-wrapper" @tap="() => handleVideoTouch(msg)">
+          <div class="video-play-button">
+            <div class="video-play-icon"></div>
+          </div>
+          <image
+            class="msg-image"
+            :lazy-load="true"
+            mode="aspectFill"
+            :src="videoFirstFrameDataUrl"
+          ></image>
+        </div>
+      </div>
+      <div
+        class="file-wrapper extra"
+        v-else-if="
+          msg.messageType ===
+          V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_FILE
+        "
+      >
+        <MessageFile :msg="msg" />
+      </div>
+      <div
+        class="file-wrapper"
+        v-else-if="
+          msg.messageType ===
+          V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_AUDIO
+        "
+      >
+        <div class="audio-wrapper">
+          <MessageAudio :msg="msg" mode="audio-in" />
+        </div>
+      </div>
+      <div
+        v-else-if="
+          msg.messageType ===
+          V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_TEXT
+        "
+        class="text-wrapper"
+      >
+        <template v-for="item in textArr">
+          <template v-if="item.type === 'text'">
+            {{ item.value }}
+          </template>
+
+          <template v-else-if="item.type === 'emoji'">
+            <Icon
+              :type="emojiMap[item.value]"
+              :size="fontSize || 22"
+              :style="{ margin: '0 2px 2px 2px', verticalAlign: 'bottom' }"
+            />
+          </template>
+        </template>
+      </div>
+
+      <div v-else>[{{ t('unknowMsgText') }}]</div>
+    </div>
+    <div class="updatetime">
+      {{ timeFormat() }}
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed } from '../../../utils/transformVue'
+import { stopAllAudio } from '../../../utils'
+import Avatar from '../../../components/Avatar.vue'
+import Icon from '../../../components/Icon.vue'
+import { defineProps, withDefaults } from '../../../utils/transformVue'
+import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
+import { V2NIMMessageForUI } from '@xkit-yx/im-store-v2/dist/types/types'
+
+import dayjs from 'dayjs'
+import { customNavigateTo } from '../../../utils/customNavigate'
+import MessageFile from '../../../pages/Chat/message/message-file.vue'
+import MessageAudio from '../../../pages/Chat/message/message-audio.vue'
+import { t } from '../../../utils/i18n'
+import { customRedirectTo } from '../../../utils/customNavigate'
+import { parseText } from '../../../utils/parseText'
+import { emojiMap } from '../../../utils/emoji'
+import { V2NIMCollection } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK/V2NIMMessageService'
+
+const props = withDefaults(
+  defineProps<{
+    data: V2NIMCollection
+    handleRemoveCollection: any
+  }>(),
+  {}
+)
+
+const collectionData = JSON.parse(props.data.collectionData)
+
+collectionData.message =
+  uni.$UIKitNIM.V2NIMMessageConverter.messageDeserialization(
+    collectionData.message
+  )
+
+const msg = collectionData.message
+
+const textArr = parseText(msg?.text || '')
+
+const handleCopy = () => {
+  uni.setClipboardData({
+    data: msg.text,
+  })
+}
+
+const handleCollection = () => {
+  let itemList = [t('deleteCollectionText')]
+  if (msg.messageType === V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_TEXT) {
+    itemList = itemList.concat([
+      t('copyText'),
+      t('forwardToTeamText'),
+      t('forwardToFriendText'),
+    ])
+  } else if (
+    msg.messageType !== V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_AUDIO
+  ) {
+    itemList = itemList.concat([
+      t('forwardToTeamText'),
+      t('forwardToFriendText'),
+    ])
+  }
+  uni.showActionSheet({
+    itemList,
+    success(data) {
+      if (
+        msg.messageType === V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_TEXT
+      ) {
+        if (data.tapIndex === 0) {
+          props.handleRemoveCollection()
+        } else if (data.tapIndex === 1) {
+          handleCopy()
+        } else if (data.tapIndex === 2) {
+          customNavigateTo({
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM}&msgIdClient=${msg.messageClientId}&origin=collection`,
+          })
+        } else if (data.tapIndex === 3) {
+          customNavigateTo({
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P}&msgIdClient=${msg.messageClientId}&origin=collection`,
+          })
+        }
+      } else if (
+        msg.messageType !== V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_AUDIO
+      ) {
+        if (data.tapIndex === 0) {
+          props.handleRemoveCollection()
+        } else if (data.tapIndex === 1) {
+          customNavigateTo({
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM}&msgIdClient=${msg.messageClientId}&origin=collection`,
+          })
+        } else if (data.tapIndex === 2) {
+          customNavigateTo({
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P}&msgIdClient=${msg.messageClientId}&origin=collection`,
+          })
+        }
+      } else {
+        if (data.tapIndex === 0) {
+          props.handleRemoveCollection()
+        }
+      }
+    },
+    complete() {},
+  })
+}
+
+const imageUrl = computed(() => {
+  return msg?.attachment?.url || msg.attachment?.file
+})
+
+// 获取视频首帧
+const videoFirstFrameDataUrl = computed(() => {
+  const url = msg.attachment?.url
+  return url ? `${url}${url.includes('?') ? '&' : '?'}vframe=1` : ''
+})
+// 点击图片预览
+const handleImageTouch = (url: string) => {
+  if (url) {
+    uni.previewImage({
+      urls: [url],
+    })
+  }
+}
+
+// 点击视频播放
+const handleVideoTouch = (msg: V2NIMMessageForUI) => {
+  stopAllAudio()
+  const url = msg.attachment?.url
+  if (url) {
+    customNavigateTo({
+      url: `/pages/Chat/video-play?videoUrl=${encodeURIComponent(url)}`,
+    })
+  }
+}
+
+const isToday = (time) => {
+  const createTime = new Date(time)
+  const now = new Date()
+  return (
+    createTime.getFullYear() === now.getFullYear() &&
+    createTime.getMonth() === now.getMonth() &&
+    createTime.getDate() === now.getDate()
+  )
+}
+const isThisYear = (time) => {
+  const createTime = new Date(time)
+  const now = new Date()
+  return createTime.getFullYear() === now.getFullYear()
+}
+const timeFormat = () => {
+  const updateTime = props.data.updateTime
+
+  if (isToday(updateTime)) {
+    return dayjs(updateTime).format('HH:mm')
+  } else if (isThisYear(updateTime)) {
+    return dayjs(updateTime).format('MM月DD日 HH:mm')
+  } else {
+    return dayjs(updateTime).format('YYYY年MM月DD日 HH:mm')
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '../../../pages/styles/common.scss';
+
+.collection-card-wrapper {
+  background-color: #fff;
+  margin: 0 20px;
+  margin-top: 12px;
+  overflow: hidden;
+  border-radius: 8px;
+  .info-wrapper {
+    display: flex;
+    margin: 0 16px;
+    padding: 16px 0 12px 0;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid #e4e9f2;
+    .info {
+      display: flex;
+      overflow: hidden;
+      .info-left {
+        margin-right: 8px;
+        .avatar-img {
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+        }
+      }
+      .info-right {
+        overflow: hidden;
+        font-size: 12px;
+        .conversation {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          color: #999999;
+        }
+      }
+    }
+    .info-icon {
+      width: 16px;
+    }
+  }
+  .updatetime {
+    padding: 0 16px 10px 16px;
+    color: #999999;
+    font-size: 12px;
+  }
+  .content-wrapper {
+    margin: 0 16px;
+    padding: 16px 0 12px 0;
+
+    word-wrap: break-word;
+    .file-wrapper {
+      position: relative;
+      width: 50%;
+
+      .msg-image {
+        width: 100%;
+      }
+      .video-msg-wrapper {
+        box-sizing: border-box;
+        max-width: 360rpx;
+      }
+      .video-play-button {
+        width: 50px;
+        height: 50px;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        background-color: rgba(0, 0, 0, 0.5);
+        border-radius: 50%;
+        z-index: 9;
+      }
+      .video-play-icon {
+        width: 0;
+        height: 0;
+        border-top: 10px solid transparent;
+        border-bottom: 10px solid transparent;
+        border-left: 18px solid #fff;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-40%, -50%);
+      }
+      .audio-wrapper {
+        opacity: 1;
+        width: fit-content;
+        background: #d6e5f6;
+        overflow: hidden;
+        padding: 10px 12px;
+        border-radius: 0 8px 8px 8px;
+        background-color: #e8eaed;
+      }
+    }
+    .extra {
+      width: 100%;
+      position: relative;
+      right: 8px;
+    }
+  }
+}
+</style>
diff --git a/NEUIKit/pages/user-card/my/collection-list.vue b/NEUIKit/pages/user-card/my/collection-list.vue
new file mode 100644
index 0000000..980733f
--- /dev/null
+++ b/NEUIKit/pages/user-card/my/collection-list.vue
@@ -0,0 +1,140 @@
+<template>
+  <div :class="`wrapper ${collectionList.length === 0 ? 'bg-white' : ''}`">
+    <NavBar :title="t('collectionText')">
+      <template v-slot:left>
+        <div class="nav-bar-text" @tap="back">{{ t('collectionText') }}</div>
+      </template>
+    </NavBar>
+    <div class="collection-card-item-wrapper">
+      <Empty
+        v-if="collectionList.length === 0"
+        :text="t('noCollectionsText')"
+      />
+
+      <div
+        v-else
+        v-for="(item, index) in collectionList"
+        :key="item.collectionId"
+      >
+        <CollectionCard
+          :data="item"
+          :index="index"
+          :key="item.collectionId"
+          :handleRemoveCollection="handleRemoveCollection(item)"
+        >
+        </CollectionCard>
+      </div>
+      <div
+        v-show="collectionList.length !== 0 && !noMore"
+        @click="onLoadMore"
+        class="view-more-text"
+      >
+        {{ t('viewMoreText') }}
+      </div>
+      <view class="msg-tip" v-show="collectionList.length !== 0 && noMore">{{
+        t('noMoreText')
+      }}</view>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { onLoad } from '@dcloudio/uni-app'
+import { ref, onUnmounted } from '../../../utils/transformVue'
+import Icon from '../../../components/Icon.vue'
+import NavBar from '../../../components/NavBar.vue'
+import CollectionCard from '../my/collection-card.vue'
+import { t } from '../../../utils/i18n'
+
+import Empty from '../../../components/Empty.vue'
+
+let collectionList = ref([])
+let noMore = ref(false)
+
+onLoad(() => {
+  uni.$UIKitStore.msgStore.getCollectionListByOptionActive({}).then((data) => {
+    collectionList.value = data
+  })
+})
+
+const handleRemoveCollection = (collection) => {
+  return () => {
+    return uni.$UIKitStore.msgStore
+      .removeCollectionsActive([collection])
+      .then(() => {
+        const list = collectionList.value
+        const index = list.findIndex((item) => item === collection)
+        list.splice(index, 1)
+      })
+      .catch((err: any) => {
+        if (err?.code && typeof t(`${err.code}`) !== 'undefined') {
+          uni.showToast({
+            title: t(`${err.code}`),
+            icon: 'error',
+            duration: 1000,
+          })
+        } else {
+          uni.showToast({
+            title: t('deleteCollectionFailedText'),
+            icon: 'error',
+            duration: 1000,
+          })
+        }
+      })
+  }
+}
+
+const onLoadMore = () => {
+  let length = collectionList.value.length
+  const anchorCollection = collectionList.value[length - 1]
+
+  uni.$UIKitStore.msgStore
+    .getCollectionListByOptionActive({
+      anchorCollection, // 锚点
+      direction: 0, // 从大到小
+    })
+    .then((data) => {
+      if (!data.length) {
+        noMore.value = true
+        return
+      }
+      collectionList.value = collectionList.value.concat(data)
+    })
+}
+onUnmounted(() => {})
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/common.scss';
+
+page {
+  padding-top: var(--status-bar-height);
+  background-color: rgb(245, 246, 247);
+}
+
+.wrapper {
+  width: 100%;
+  box-sizing: border-box;
+  padding-bottom: 30px;
+  background-color: rgb(245, 246, 247);
+  min-height: 100vh;
+  .nav-bar-text {
+    color: rgb(20, 146, 209);
+  }
+  .view-more-text {
+    text-align: center;
+    color: #b3b7bc;
+    font-size: 15px;
+    margin-top: 20px;
+  }
+  .msg-tip {
+    text-align: center;
+    color: #b3b7bc;
+    font-size: 12px;
+    margin-top: 10px;
+  }
+}
+.bg-white {
+  background: #fff;
+}
+</style>
diff --git a/NEUIKit/pages/user-card/my/index.vue b/NEUIKit/pages/user-card/my/index.vue
index 2239865..ddc5387 100644
--- a/NEUIKit/pages/user-card/my/index.vue
+++ b/NEUIKit/pages/user-card/my/index.vue
@@ -9,18 +9,26 @@
     </div>
     <div class="box-shadow"></div>
     <div class="userInfo-item-wrapper">
-      <div class="userInfo-item" @click="gotoAbout">
+      <div class="userInfo-item" @click="gotoSetting">
         <div class="item-left">
-          <Icon iconClassName="guanyu" type="icon-guanyu"></Icon>
-          {{ t('commsEaseText') }}
+          <Icon iconClassName="guanyu" type="icon-shezhi1"></Icon>
+          {{ t('setText') }}
         </div>
         <Icon iconClassName="icon-arrow" type="icon-jiantou"></Icon>
       </div>
       <div class="shadow"></div>
-      <div class="userInfo-item" @click="gotoSetting">
+      <div class="userInfo-item" @click="gotoCollection">
         <div class="item-left">
-          <Icon iconClassName="guanyu" type="icon-shezhi1"></Icon>
-          {{ t('setText') }}
+          <Icon iconClassName="guanyu" type="blue-collection"></Icon>
+          {{ t('collectionText') }}
+        </div>
+        <Icon iconClassName="icon-arrow" type="icon-jiantou"></Icon>
+      </div>
+      <div class="shadow"></div>
+      <div class="userInfo-item" @click="gotoAbout">
+        <div class="item-left">
+          <Icon iconClassName="guanyu" type="icon-guanyu"></Icon>
+          {{ t('commsEaseText') }}
         </div>
         <Icon iconClassName="icon-arrow" type="icon-jiantou"></Icon>
       </div>
@@ -65,6 +73,11 @@ const gotoAbout = () => {
     url: '/pages/user-card/my/about',
   })
 }
+const gotoCollection = () => {
+  customNavigateTo({
+    url: '/pages/user-card/my/collection-list',
+  })
+}
 
 const navigatorToMyDetail = () => {
   customNavigateTo({
diff --git a/NEUIKit/static/add-collection.png b/NEUIKit/static/add-collection.png
new file mode 100644
index 0000000..2172087
Binary files /dev/null and b/NEUIKit/static/add-collection.png differ
diff --git a/NEUIKit/static/black-pin.png b/NEUIKit/static/black-pin.png
new file mode 100644
index 0000000..5dd94bc
Binary files /dev/null and b/NEUIKit/static/black-pin.png differ
diff --git a/NEUIKit/utils/constants.ts b/NEUIKit/utils/constants.ts
index d6c203e..52ce773 100644
--- a/NEUIKit/utils/constants.ts
+++ b/NEUIKit/utils/constants.ts
@@ -1,4 +1,3 @@
-import { V2NIMMessageType } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK/V2NIMMessageService'
 import { t } from './i18n'
 import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
 
@@ -87,3 +86,5 @@ export const g2StatusMap: any = {
   4: t('callTimeoutText'),
   5: t('callBusyText'),
 }
+
+export const msgRecallTime = 2 * 60 * 1000
diff --git a/NEUIKit/utils/reporter.ts b/NEUIKit/utils/reporter.ts
index dedbf91..516d0d8 100644
--- a/NEUIKit/utils/reporter.ts
+++ b/NEUIKit/utils/reporter.ts
@@ -1,17 +1,17 @@
-import { EventTracking } from "@xkit-yx/utils/dist/uniapp";
-import imPkg from "nim-web-sdk-ng/package.json";
+import { EventTracking } from '@xkit-yx/utils/dist/uniapp'
+import imPkg from 'nim-web-sdk-ng/package.json'
 
 export const trackInit = (
-  component: "ChatUIKit" | "ContactUIKit" | "ConversationUIKit" | "SearchUIKit"
+  component: 'ChatUIKit' | 'ContactUIKit' | 'ConversationUIKit' | 'SearchUIKit'
 ): void => {
   if (uni.$UIKitNIM.options.appkey) {
     const eventTracking = new EventTracking({
       appKey: uni.$UIKitNIM.options.appkey,
-      version: "10.1.0",
+      version: '10.2.0',
       component,
       imVersion: imPkg.version,
-      platform: "UniApp",
-    });
-    eventTracking.track("init", "");
+      platform: 'UniApp',
+    })
+    eventTracking.track('init', '')
   }
-};
+}
diff --git a/im-uniapp-ui/package-lock.json b/im-uniapp-ui/package-lock.json
index 57dc6aa..0fbf288 100644
--- a/im-uniapp-ui/package-lock.json
+++ b/im-uniapp-ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@xkit-yx/im-uniapp-ui",
-  "version": "0.0.0",
+  "version": "10.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@xkit-yx/im-uniapp-ui",
-      "version": "0.0.0",
+      "version": "10.1.0",
       "dependencies": {
         "@dcloudio/uni-app": "3.0.0-3090920231225001",
         "@dcloudio/uni-app-plus": "3.0.0-3090920231225001",
@@ -22,7 +22,7 @@
         "@dcloudio/uni-mp-weixin": "3.0.0-3090920231225001",
         "@dcloudio/uni-mp-xhs": "3.0.0-3090920231225001",
         "@dcloudio/uni-quickapp-webview": "3.0.0-3090920231225001",
-        "@xkit-yx/im-store-v2": "^0.3.0",
+        "@xkit-yx/im-store-v2": "^0.4.0",
         "@xkit-yx/utils": "^0.5.6",
         "dayjs": "^1.11.7",
         "mobx": "^6.6.1",
@@ -38,6 +38,7 @@
         "@dcloudio/vite-plugin-uni": "3.0.0-4020420240722002",
         "@vue/runtime-core": "3.4.21",
         "@vue/tsconfig": "^0.1.3",
+        "esbuild": "^0.20.2",
         "mini-program-iconfont-cli": "^0.6.1",
         "sass": "^1.58.1",
         "sass-loader": "^13.2.0",
@@ -7023,9 +7024,9 @@
       }
     },
     "node_modules/@xkit-yx/im-store-v2": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@xkit-yx/im-store-v2/-/im-store-v2-0.3.0.tgz",
-      "integrity": "sha512-y41wtbpApCQs8UnIDlyE8Zv7j0qhjfl+SVsqygt9sclHErXfLV4U3CUStySkURNh0gYyo4ZLYMEKRSZMptWxzw==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@xkit-yx/im-store-v2/-/im-store-v2-0.4.0.tgz",
+      "integrity": "sha512-XWJfOZ3ECp6ixlck3CB+alICC4zT1oYrIl4R1saPYv0ou0g6VtlZY1NE7hMi/X/G/6aWR8VC/eBfAXjZBy8Z0g==",
       "dependencies": {
         "@xkit-yx/utils": "^0.7.1",
         "mobx": "^6.6.1"
diff --git a/im-uniapp-ui/package.json b/im-uniapp-ui/package.json
index 7f28c00..becdd12 100644
--- a/im-uniapp-ui/package.json
+++ b/im-uniapp-ui/package.json
@@ -54,7 +54,7 @@
     "@dcloudio/uni-mp-weixin": "3.0.0-3090920231225001",
     "@dcloudio/uni-mp-xhs": "3.0.0-3090920231225001",
     "@dcloudio/uni-quickapp-webview": "3.0.0-3090920231225001",
-    "@xkit-yx/im-store-v2": "^0.3.0",
+    "@xkit-yx/im-store-v2": "^0.4.0",
     "@xkit-yx/utils": "^0.5.6",
     "dayjs": "^1.11.7",
     "mobx": "^6.6.1",
diff --git a/im-uniapp-ui/src/App.vue b/im-uniapp-ui/src/App.vue
index fc86890..25f18b2 100644
--- a/im-uniapp-ui/src/App.vue
+++ b/im-uniapp-ui/src/App.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
-import RootStore from "@xkit-yx/im-store-v2";
-
+// import RootStore from '@xkit-yx/im-store-v2'
+import RootStore from "./store/dist/index.esm.js";
 import V2NIM, { V2NIMConst } from "nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK";
 import {
   customRedirectTo,
@@ -61,7 +61,7 @@ export default {
     // #endif
   },
   methods: {
-    initNim(opts: { account: string; token: string; appkey: string }) {
+    initNim(opts: { appkey: string; account: string; token: string }) {
       // 保存登录信息
 
       uni.setStorage({
@@ -237,7 +237,7 @@ export default {
       console.log("-------------callkit init 开始", opts.account, opts.token);
       nimCallKit.initConfig(
         {
-          appKey: "", // 请填写你的appkey
+          appKey: opts.appkey, // 请填写你的appkey
           account: opts.account, // 请填写你的account
           token: opts.token, // 请填写你的token
           apnsCername: "",
diff --git a/im-uniapp-ui/src/components/Icon.vue b/im-uniapp-ui/src/components/Icon.vue
index b6618ac..9391f6f 100644
--- a/im-uniapp-ui/src/components/Icon.vue
+++ b/im-uniapp-ui/src/components/Icon.vue
@@ -339,11 +339,15 @@ const urlMap = {
   'icon-file':
     'https://yx-web-nosdn.netease.im/common/90485f277f50fc081970ded8772ec7c5/file.png',
   'icon-pin':
-    'https://yx-web-nosdn.netease.im/common/8874f30f648cde89dbbe9a59e9cb7f8a/pin.png',
+    'https://yx-web-nosdn.netease.im/common/6eb4fafcca008d2e93e90311696d6b96/black-pin.png',
   'icon-green-pin':
     'https://yx-web-nosdn.netease.im/common/4a1f15eff2f53563c4f1cf6ecde82d2c/green-pin.png',
   'choose-picture':
     'https://yx-web-nosdn.netease.im/common/97b3ca79a589d5753cbc0e8e8ec09501/choose-picture.png',
+  'icon-collection':
+    'https://yx-web-nosdn.netease.im/common/aa1bad3410009dea83d34d513dcd20f3/add-collection.png',
+  'blue-collection':
+    'https://yx-web-nosdn.netease.im/common/fb3836a8731b57720fcfdd3b589b3d5f/collection.png',
 }
 
 //以上链接访问有频率控制，建议您将静态放到您服务器上，然后修改上面的链接即可
diff --git a/im-uniapp-ui/src/components/FriendSelect.vue b/im-uniapp-ui/src/components/PersonSelect.vue
similarity index 89%
rename from im-uniapp-ui/src/components/FriendSelect.vue
rename to im-uniapp-ui/src/components/PersonSelect.vue
index ff72844..329bd72 100644
--- a/im-uniapp-ui/src/components/FriendSelect.vue
+++ b/im-uniapp-ui/src/components/PersonSelect.vue
@@ -1,10 +1,10 @@
 <template>
-  <div v-if="friendList.length > 0" class="friend-select-wrapper">
+  <div v-if="personList.length > 0" class="friend-select-wrapper">
     <div class="member-wrapper">
       <radio-group v-if="radio" @change="checkboxChange">
         <div
           class="member-item"
-          v-for="item in friendList"
+          v-for="item in personList"
           :key="item.accountId"
         >
           <radio
@@ -19,14 +19,14 @@
           />
           <Avatar class="user-avatar" size="36" :account="item.accountId" />
           <div class="user-name">
-            <Appellation :account="item.accountId" />
+            <Appellation :account="item.accountId" :teamId="item.teamId" />
           </div>
         </div>
       </radio-group>
       <checkbox-group v-else @change="checkboxChange">
         <div
           class="member-item"
-          v-for="item in friendList"
+          v-for="item in personList"
           :key="item.accountId"
         >
           <checkbox
@@ -41,7 +41,7 @@
           />
           <Avatar class="user-avatar" size="36" :account="item.accountId" />
           <div class="user-name">
-            <Appellation :account="item.accountId" />
+            <Appellation :account="item.accountId" :teamId="item.teamId" />
           </div>
         </div>
       </checkbox-group>
@@ -72,15 +72,16 @@ import {
   withDefaults,
 } from '../utils/transformVue'
 
-export type FriendSelectItem = {
+export type PersonSelectItem = {
   accountId: string
+  teamId?: string
   disabled?: boolean
   checked?: boolean
 }
 
 const props = withDefaults(
   defineProps<{
-    friendList: FriendSelectItem[]
+    personList: PersonSelectItem[]
     showBtn?: boolean
     btnText?: string
     radio?: boolean
@@ -97,7 +98,7 @@ const props = withDefaults(
 const selectAccount = ref<string[]>([])
 
 onMounted(() => {
-  selectAccount.value = props.friendList
+  selectAccount.value = props.personList
     .filter((item) => item.checked)
     .map((item) => item.accountId)
 })
diff --git a/im-uniapp-ui/src/components/PinCard.vue b/im-uniapp-ui/src/components/PinCard.vue
index 8c92fbd..b5f9b73 100644
--- a/im-uniapp-ui/src/components/PinCard.vue
+++ b/im-uniapp-ui/src/components/PinCard.vue
@@ -187,11 +187,11 @@ const handlePinMsg = () => {
           handleCopy()
         } else if (data.tapIndex === 2) {
           customNavigateTo({
-            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM}&msgIdClient=${props.msg.messageClientId}`,
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM}&msgIdClient=${props.msg.messageClientId}&origin=pin`,
           })
         } else if (data.tapIndex === 3) {
           customNavigateTo({
-            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P}&msgIdClient=${props.msg.messageClientId}`,
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P}&msgIdClient=${props.msg.messageClientId}&origin=pin`,
           })
         }
       } else if (
@@ -202,11 +202,11 @@ const handlePinMsg = () => {
           props.handleUnPinMsg()
         } else if (data.tapIndex === 1) {
           customNavigateTo({
-            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM}&msgIdClient=${props.msg.messageClientId}`,
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM}&msgIdClient=${props.msg.messageClientId}&origin=pin`,
           })
         } else if (data.tapIndex === 2) {
           customNavigateTo({
-            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P}&msgIdClient=${props.msg.messageClientId}`,
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P}&msgIdClient=${props.msg.messageClientId}&origin=pin`,
           })
         }
       } else {
@@ -307,7 +307,7 @@ const timeFormat = () => {
   }
   .content-wrapper {
     padding: 12px 16px 16px 16px;
-
+    word-wrap: break-word;
     .file-wrapper {
       position: relative;
       width: 50%;
@@ -344,10 +344,11 @@ const timeFormat = () => {
         transform: translate(-40%, -50%);
       }
       .audio-wrapper {
+        width: fit-content;
         opacity: 1;
         background: #d6e5f6;
         overflow: hidden;
-        padding: 12px 16px;
+        padding: 10px 12px;
         border-radius: 0 8px 8px 8px;
         background-color: #e8eaed;
       }
diff --git a/im-uniapp-ui/src/locale/en.ts b/im-uniapp-ui/src/locale/en.ts
index eead04a..619d40d 100644
--- a/im-uniapp-ui/src/locale/en.ts
+++ b/im-uniapp-ui/src/locale/en.ts
@@ -104,6 +104,12 @@ export default {
   unpinText: 'Unmark',
   unpinFailedText: 'Unmark Failed',
   noPinListText: 'No Mark',
+  collectionText: 'Add collection',
+  deleteCollectionText: 'Delete collection',
+  addCollectionSuccessText: 'Add collection success',
+  addCollectionFailedText: 'Add collection Failed',
+  deleteCollectionFailedText: 'Delete collection Failed',
+  noCollectionsText: 'No collection',
   teamBannedText: 'Message Banned',
   you: 'You',
   pinThisText: 'Marked this message',
@@ -190,7 +196,8 @@ export default {
   removeBlacklist: 'Unblock',
   forwardSuccessText: 'Forward Success',
   forwardFailText: 'Forward Failed',
-  getMessageFailed: 'Fail to get message ',
+  getMessageFailed: 'Fail to get message',
+  getForwardMessageFailed: 'Fail to get forward message',
   sendFailWithInBlackText:
     'The other party has blocked you, message sending failed',
   sendFailWithDeleteText:
@@ -223,8 +230,16 @@ export default {
   unreadText: 'Unread',
   fileText: 'file',
   allUnReadText: 'All Unread',
+  msgRecallTimeErrorText: 'Message recall time exceeded',
   allReadText: 'All Read',
-
+  searchText: 'Search',
+  searchTitleText: 'Search',
+  friendText: 'Friend',
+  teamText: 'Group',
+  searchResultNullText: 'User does not exist',
+  conversationSendFailText: '[Send Failed]',
+  conversationNotificationText: '[Notification]',
+  fileMsgTitleText: '[File Message]',
   // emoji 不能随便填，要用固定 key
   Laugh: '[Laugh]',
   Happy: '[Happy]',
@@ -316,6 +331,9 @@ export default {
   107320: 'PIN not exist',
   107322: 'PIN already exist',
   107327: 'PIN function disabled',
+  189301: 'collection limit exceeded',
+  189302: 'collection not exist',
+  189449: 'collection concurrent operation failed',
   // 群相关
   109432: 'no permission',
 }
diff --git a/im-uniapp-ui/src/locale/zh-Hans.ts b/im-uniapp-ui/src/locale/zh-Hans.ts
index 1682fc3..ef4e0c1 100644
--- a/im-uniapp-ui/src/locale/zh-Hans.ts
+++ b/im-uniapp-ui/src/locale/zh-Hans.ts
@@ -123,6 +123,8 @@ export default {
   getMessageFailed: '获取消息失败',
   replyText: '回复',
   replyNotFindText: '该消息已撤回或删除',
+  msgRecallTimeErrorText: '已超过时间无法撤回',
+
   forwardToTeamText: '转发到群组',
   forwardToFriendText: '转发到个人',
   sessionRecordText: '的会话记录',
@@ -132,6 +134,12 @@ export default {
   unpinText: '取消标记',
   unpinFailedText: '取消标记失败',
   noPinListText: '暂无标记消息',
+  collectionText: '收藏',
+  deleteCollectionText: '删除收藏',
+  addCollectionSuccessText: '收藏成功',
+  addCollectionFailedText: '添加收藏失败',
+  deleteCollectionFailedText: '删除收藏失败',
+  noCollectionsText: '暂无收藏',
   you: '你',
   pinThisText: '标记了这条消息',
   delete: '删除此消息',
@@ -267,7 +275,15 @@ export default {
   fileText: '文件',
   allUnReadText: '全部成员未读',
   allReadText: '全部成员已读',
-
+  searchText: '请输入你要搜索的关键字',
+  searchTitleText: '搜索',
+  friendText: '好友',
+  teamText: '群组',
+  searchResultNullText: '该用户不存在',
+  conversationSendFailText: '[发送失败]',
+  conversationNotificationText: '[通知消息]',
+  getForwardMessageFailed: '该消息已撤回或删除',
+  fileMsgTitleText: '[文件消息]',
   // emoji 不能随便填，要用固定 key
   Laugh: '[大笑]',
   Happy: '[开心]',
@@ -359,6 +375,9 @@ export default {
   107320: 'PIN 消息不存在',
   107322: '重复 PIN',
   107327: '未开启 PIN 功能',
+  189301: '收藏数量超限',
+  189302: '收藏不存在',
+  189449: '并发操作收藏失败',
   // 群相关
   109432: '没有权限',
 }
diff --git a/im-uniapp-ui/src/manifest.json b/im-uniapp-ui/src/manifest.json
index 9b7402b..ca23475 100644
--- a/im-uniapp-ui/src/manifest.json
+++ b/im-uniapp-ui/src/manifest.json
@@ -1,142 +1,174 @@
 {
-  "name": "云信IM即时通讯",
-  "fallbackLocale": "zh-Hans",
-  "appid": "",
-  "description": "",
-  "versionName": "10.1.0",
-  "versionCode": "100",
-  "transformPx": false,
-  "app-plus": {
-    "usingComponents": true,
-    "nvueStyleCompiler": "uni-app",
-    "compilerVersion": 3,
-    "compatible": {
-      "ignoreVersion": true
-    },
-    "splashscreen": {
-      "alwaysShowBeforeRender": false,
-      "waiting": true,
-      "autoclose": true,
-      "delay": 0
-    },
-    "modules": {
-      "Camera": {},
-      "Push": {},
-      "Record": {},
-      "VideoPlayer": {}
-    },
-    "distribute": {
-      "android": {
-        "permissions": [
-          "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-          "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-          "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-          "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-          "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-          "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-          "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-          "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-          "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-          "<uses-feature android:name=\"android.hardware.camera\"/>",
-          "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-          "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-          "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>"
-        ],
-        "minSdkVersion": 21
-      },
-      "ios": {
-        "dSYMs": false
-      },
-      "sdkConfigs": {
-        "push": {},
-        "ad": {}
-      }
-    },
-    "nativePlugins": {
-      "NIMUniPlugin": {
-        "PUSH_VIVO_APPID": "23432",
-        "PUSH_VIVO_APPKEY": "432423",
-        "PUSH_HONOR_APPID": "3123123123",
-        "__plugin_info__": {
-          "name": "NIMUniPlugin",
-          "description": "uni消息推送插件",
-          "platforms": "Android,iOS",
-          "url": "",
-          "android_package_name": "",
-          "ios_bundle_id": "",
-          "isCloud": false,
-          "bought": -1,
-          "pid": "",
-          "parameters": {
-            "PUSH_VIVO_APPID": {
-              "des": "厂商VIVO-app_id",
-              "key": "com.vivo.push.app_id",
-              "value": ""
+    "name" : "云信IM",
+    "fallbackLocale" : "zh-Hans",
+    "appid" : "__UNI__A5CDF0D",
+    "description" : "",
+    "versionName" : "10.2.0",
+    "versionCode" : 1,
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "compatible" : {
+            "ignoreVersion" : true
+        },
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : false,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {
+            "Camera" : {},
+            "Push" : {},
+            "Record" : {},
+            "VideoPlayer" : {}
+        },
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>"
+                ],
+                "minSdkVersion" : 21
             },
-            "PUSH_VIVO_APPKEY": {
-              "des": "厂商VIVO-app_key",
-              "key": "com.vivo.push.api_key",
-              "value": ""
+            "ios" : {
+                "dSYMs" : false
             },
-            "PUSH_HONOR_APPID": {
-              "des": "厂商HONOR-app_id",
-              "key": "com.hihonor.push.app_id",
-              "value": ""
+            "sdkConfigs" : {
+                "push" : {},
+                "ad" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        },
+        "nativePlugins" : {
+            "NIMUniPlugin" : {
+                "PUSH_VIVO_APPID" : "23432",
+                "PUSH_VIVO_APPKEY" : "432423",
+                "PUSH_HONOR_APPID" : "3123123123",
+                "__plugin_info__" : {
+                    "name" : "NIMUniPlugin",
+                    "description" : "uni消息推送插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {
+                        "PUSH_VIVO_APPID" : {
+                            "des" : "厂商VIVO-app_id",
+                            "key" : "com.vivo.push.app_id",
+                            "value" : ""
+                        },
+                        "PUSH_VIVO_APPKEY" : {
+                            "des" : "厂商VIVO-app_key",
+                            "key" : "com.vivo.push.api_key",
+                            "value" : ""
+                        },
+                        "PUSH_HONOR_APPID" : {
+                            "des" : "厂商HONOR-app_id",
+                            "key" : "com.hihonor.push.app_id",
+                            "value" : ""
+                        }
+                    }
+                }
+            },
+            "netease-CallKit" : {
+                "__plugin_info__" : {
+                    "name" : "netease-CallKit",
+                    "description" : "网易云信音视频通话插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "",
+                    "android_package_name" : "",
+                    "ios_bundle_id" : "",
+                    "isCloud" : false,
+                    "bought" : -1,
+                    "pid" : "",
+                    "parameters" : {}
+                }
             }
-          }
-        }
-      },
-      "netease-CallKit": {
-        "__plugin_info__": {
-          "name": "netease-CallKit",
-          "description": "网易云信音视频通话插件",
-          "platforms": "Android,iOS",
-          "url": "",
-          "android_package_name": "",
-          "ios_bundle_id": "",
-          "isCloud": false,
-          "bought": -1,
-          "pid": "",
-          "parameters": {}
         }
-      }
-    }
-  },
-  "quickapp": {},
-  "mp-weixin": {
-    "appid": "",
-    "setting": {
-      "urlCheck": false
     },
-    "usingComponents": true
-  },
-  "mp-alipay": {
-    "usingComponents": true
-  },
-  "mp-baidu": {
-    "usingComponents": true
-  },
-  "mp-toutiao": {
-    "usingComponents": true
-  },
-  "uniStatistics": {
-    "enable": false
-  },
-  "vueVersion": "3",
-  "h5": {
-    "title": "即时通讯 IM",
-    "router": {
-      "mode": "hash",
-      "base": "./"
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "wx602277f87659ef54",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
     },
-    "optimization": {
-      "treeShaking": {
-        "enable": false
-      }
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "3",
+    "h5" : {
+        "title" : "即时通讯 IM",
+        "router" : {
+            "mode" : "hash",
+            "base" : "./"
+        },
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : false
+            }
+        }
     }
-  }
 }
diff --git a/im-uniapp-ui/src/pages.json b/im-uniapp-ui/src/pages.json
index 421a821..7f68028 100644
--- a/im-uniapp-ui/src/pages.json
+++ b/im-uniapp-ui/src/pages.json
@@ -12,6 +12,12 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/Conversation/conversation-search/index",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/Login/index",
       "style": {
@@ -157,6 +163,18 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/user-card/my/collection-card",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/user-card/my/collection-list",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/user-card/my-detail/index",
       "style": {
diff --git a/im-uniapp-ui/src/pages/Chat/forward.vue b/im-uniapp-ui/src/pages/Chat/forward.vue
index 8d0fc44..ef024af 100644
--- a/im-uniapp-ui/src/pages/Chat/forward.vue
+++ b/im-uniapp-ui/src/pages/Chat/forward.vue
@@ -104,6 +104,7 @@ const teamList = ref<V2NIMTeam[]>([])
 
 const conversationId = uni.$UIKitStore?.uiStore.selectedConversation
 let msgIdClient = ''
+let origin = ''
 // 转发相关
 const forwardModalVisible = ref(false)
 const forwardTo = ref('')
@@ -118,7 +119,7 @@ const handleForwardConfirm = (forwardComment: string) => {
 
   if (!forwardMsg.value) {
     uni.showToast({
-      title: t('getMessageFailed'),
+      title: t('getForwardMessageFailed'),
       icon: 'error',
     })
     setTimeout(() => {
@@ -163,6 +164,7 @@ onLoad((props) => {
   forwardConversationType.value = Number(props?.forwardConversationType)
   console.log('forwardConversationType: ', props?.forwardConversationType)
   msgIdClient = props?.msgIdClient
+  origin = props?.origin
 })
 
 const uninstallTeamListWatch = autorun(() => {
@@ -206,8 +208,7 @@ const handleItemClick = (_forwardTo: string) => {
     forwardMsg.value = deepClone(
       uni.$UIKitStore.msgStore.getMsg(conversationId, [msgIdClient])?.[0]
     )
-    if (!forwardMsg.value) {
-      // forwardMsg.value 为空，说明是转发的 pin 消息，此时内存里面可能没有该消息，需要从 pinMsgs 中去查。
+    if (origin === 'pin') {
       const curPinMsgsMap = uni.$UIKitStore.msgStore.pinMsgs.get(conversationId)
 
       const pinInfo = [...curPinMsgsMap.values()].find((pinInfo) => {
@@ -221,6 +222,11 @@ const handleItemClick = (_forwardTo: string) => {
       if (pinInfo) {
         forwardMsg.value = pinInfo.message
       }
+    } else if (origin === 'collection') {
+      const msg = uni.$UIKitStore.msgStore.collectionMsgs.get(msgIdClient)
+      if (msg) {
+        forwardMsg.value = msg
+      }
     }
 
     forwardModalVisible.value = true
diff --git a/im-uniapp-ui/src/pages/Chat/index.vue b/im-uniapp-ui/src/pages/Chat/index.vue
index 73535a8..4e495c5 100644
--- a/im-uniapp-ui/src/pages/Chat/index.vue
+++ b/im-uniapp-ui/src/pages/Chat/index.vue
@@ -48,13 +48,13 @@ import NavBar from './message/nav-bar.vue'
 import Icon from '../../components/Icon.vue'
 import MessageList from './message/message-list.vue'
 import MessageInput from './message/message-input.vue'
-import { HISTORY_LIMIT, MSG_ID_FLAG } from '../../utils/constants'
+import { HISTORY_LIMIT } from '../../utils/constants'
 import { t } from '../../utils/i18n'
 import { V2NIMMessage } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK/V2NIMMessageService'
 import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
 
 export interface YxReplyMsg {
-  idClient: string
+  messageClientId: string
   scene: V2NIMConst.V2NIMConversationType
   from: string
   receiverId: string
@@ -321,7 +321,7 @@ const msgsWatch = autorun(() => {
   if (messages.length !== 0) {
     const _replyMsgsMap: any = {}
     const reqMsgs: YxReplyMsg[] = []
-    const idClients: Record<string, string> = {}
+    const messageClientIds: Record<string, string> = {}
     msgs.value.forEach((msg) => {
       if (msg.serverExtension) {
         try {
@@ -337,16 +337,23 @@ const msgsWatch = autorun(() => {
               _replyMsgsMap[msg.messageClientId] = replyMsg
               // 如果没找到，说明被回复的消息可能有三种情况：1.被删除 2.被撤回 3.不在当前消息列表中（一次性没拉到，在之前的消息中）
             } else {
-              _replyMsgsMap[msg.messageClientId] = { idClient: 'noFind' }
-              const { scene, from, to, idServer, idClient, time, receiverId } =
-                yxReplyMsg
+              _replyMsgsMap[msg.messageClientId] = { messageClientId: 'noFind' }
+              const {
+                scene,
+                from,
+                to,
+                idServer,
+                messageClientId,
+                time,
+                receiverId,
+              } = yxReplyMsg
 
               if (
                 scene &&
                 from &&
                 to &&
                 idServer &&
-                idClient &&
+                messageClientId &&
                 time &&
                 receiverId
               ) {
@@ -355,11 +362,11 @@ const msgsWatch = autorun(() => {
                   from,
                   to,
                   idServer,
-                  idClient,
+                  messageClientId,
                   time,
                   receiverId,
                 })
-                idClients[idServer] = msg.messageClientId
+                messageClientIds[idServer] = msg.messageClientId
               }
             }
           }
@@ -373,7 +380,7 @@ const msgsWatch = autorun(() => {
         reqMsgs.map((item) => ({
           senderId: item.from,
           receiverId: item.receiverId,
-          messageClientId: item.idClient,
+          messageClientId: item.messageClientId,
           messageServerId: item.idServer,
           createTime: item.time,
           conversationType: item.scene,
@@ -384,7 +391,7 @@ const msgsWatch = autorun(() => {
           if (res?.length > 0) {
             res.forEach((item: V2NIMMessage) => {
               if (item.messageServerId) {
-                _replyMsgsMap[idClients[item.messageServerId]] = item
+                _replyMsgsMap[messageClientIds[item.messageServerId]] = item
               }
             })
           }
diff --git a/im-uniapp-ui/src/pages/Chat/message/message-audio.vue b/im-uniapp-ui/src/pages/Chat/message/message-audio.vue
index 5857f8b..60e2f69 100644
--- a/im-uniapp-ui/src/pages/Chat/message/message-audio.vue
+++ b/im-uniapp-ui/src/pages/Chat/message/message-audio.vue
@@ -4,7 +4,7 @@
     :style="{ width: audioContainerWidth + 'px' }"
     @tap="onPlayAudio"
   >
-    <div>{{ duration }}s</div>
+    <div class="audio-dur">{{ duration }}s</div>
     <div class="audio-icon-wrapper">
       <Icon :size="24" :key="audioIconType" :type="audioIconType" />
     </div>
@@ -23,6 +23,7 @@ import Icon from '../../../components/Icon.vue'
 import { events } from '../../../utils/constants'
 import { V2NIMMessageForUI } from '@xkit-yx/im-store-v2/dist/types/types'
 import { V2NIMMessageAudioAttachment } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK/V2NIMMessageService'
+import { onHide, onUnload } from '@dcloudio/uni-app'
 
 const props = withDefaults(
   defineProps<{
@@ -88,6 +89,7 @@ const toggleAudioPlayState = () => {
   }
 }
 
+// 初始化音频实例
 function initAudioSrc() {
   const audioContext = getAudio()
   if (!audioContext) {
@@ -168,17 +170,34 @@ const playAudioAnimation = () => {
   }
 }
 
-onUnmounted(() => {
+const stopAudioOnHide = () => {
   const audioContext = getAudio()
   if (isAudioPlaying.value) {
     stopAudio()
   }
   audioContext?.destroy?.()
+  animationFlag.value = false
   audioMap.delete('audio')
+}
+
+onUnmounted(() => {
+  stopAudioOnHide()
+})
+
+onHide(() => {
+  stopAudioOnHide()
+})
+
+onUnload(() => {
+  stopAudioOnHide()
 })
 </script>
 
 <style scoped lang="scss">
+.audio-dur {
+  height: 24px;
+  line-height: 24px;
+}
 .audio-in,
 .audio-out {
   width: 50px;
@@ -194,4 +213,10 @@ onUnmounted(() => {
     transform: rotate(180deg);
   }
 }
+
+.audio-icon-wrapper {
+  height: 24px;
+  display: flex;
+  align-items: center;
+}
 </style>
diff --git a/im-uniapp-ui/src/pages/Chat/message/message-bubble.vue b/im-uniapp-ui/src/pages/Chat/message/message-bubble.vue
index c6d4325..a2623a6 100644
--- a/im-uniapp-ui/src/pages/Chat/message/message-bubble.vue
+++ b/im-uniapp-ui/src/pages/Chat/message/message-bubble.vue
@@ -85,6 +85,22 @@
           ></Icon>
           <text class="msg-action-btn-text">{{ t('deleteText') }}</text>
         </div>
+        <div
+          class="msg-action-btn"
+          v-if="
+            props.msg.messageType !==
+            V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_CALL
+          "
+          @tap="handleCollectionMsg"
+        >
+          <Icon
+            :size="18"
+            color="#656A72"
+            class="msg-action-btn-icon"
+            type="icon-collection"
+          ></Icon>
+          <text class="msg-action-btn-text">{{ t('collectionText') }}</text>
+        </div>
       </div>
       <!-- 未知消息体 -->
       <div class="msg-action-groups-unknown" v-else>
@@ -319,18 +335,30 @@
           ></Icon>
           <text class="msg-action-btn-text">{{ t('deleteText') }}</text>
         </div>
+        <div class="msg-action-btn" @tap="handleRecallMsg">
+          <Icon
+            :size="18"
+            color="#656A72"
+            class="msg-action-btn-icon"
+            type="icon-chehui"
+          ></Icon>
+          <text class="msg-action-btn-text">{{ t('recallText') }}</text>
+        </div>
         <div
           class="msg-action-btn"
-          v-if="props.msg.canRecall"
-          @tap="handleRecallMsg"
+          v-if="
+            props.msg.messageType !==
+            V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_CALL
+          "
+          @tap="handleCollectionMsg"
         >
           <Icon
             :size="18"
             color="#656A72"
             class="msg-action-btn-icon"
-            type="icon-chehui"
+            type="icon-collection"
           ></Icon>
-          <text class="msg-action-btn-text">{{ t('recallText') }}</text>
+          <text class="msg-action-btn-text">{{ t('collectionText') }}</text>
         </div>
       </div>
       <!-- 未知消息体 -->
@@ -377,7 +405,7 @@ import { autorun } from 'mobx'
 import { deepClone } from '../../../utils'
 import { V2NIMMessageForUI } from '@xkit-yx/im-store-v2/dist/types/types'
 import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
-
+import { msgRecallTime } from '../../../utils/constants'
 const tooltipRef = ref(null)
 
 const props = withDefaults(
@@ -544,9 +572,56 @@ const handlePinMsg = () => {
   }
   closeTooltip()
 }
-const handleUnPinMsg = () => {
+
+// 收藏消息
+const handleCollectionMsg = () => {
   const _msg = deepClone(props.msg)
 
+  const conversation = uni.$UIKitStore.conversationStore.conversations.get(
+    _msg.conversationId
+  )
+  const collectionDataObj = {
+    message: uni.$UIKitNIM.V2NIMMessageConverter.messageSerialization(_msg), // 序列化
+    avatar: uni.$UIKitStore.userStore.users.get(_msg.senderId)?.avatar,
+    conversationName: conversation?.name,
+    senderName: uni.$UIKitStore.uiStore.getAppellation({
+      account: _msg.senderId,
+      teamId:
+        conversationType ===
+        V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM
+          ? _msg.receiverId
+          : '',
+    }),
+  }
+  const addCollectionParams = {
+    collectionType: 1000 + _msg.messageType, // 和移动端对齐
+    collectionData: JSON.stringify(collectionDataObj),
+    uniqueId: _msg.messageServerId,
+  }
+
+  uni.$UIKitStore.msgStore
+    .addCollectionActive(addCollectionParams)
+    .then(() => {
+      uni.showToast({
+        title: t('addCollectionSuccessText'),
+        icon: 'success',
+      })
+    })
+    .catch((err: any) => {
+      if (err?.code && typeof t(`${err.code}`) !== 'undefined') {
+        uni.showToast({
+          title: t(`${err.code}`),
+          icon: 'error',
+          duration: 1000,
+        })
+      } else {
+        uni.showToast({
+          title: t('addCollectionFailedText'),
+          icon: 'error',
+          duration: 1000,
+        })
+      }
+    })
   closeTooltip()
 }
 
@@ -577,6 +652,15 @@ const handleReplyMsg = async () => {
 
 // 撤回消息
 const handleRecallMsg = () => {
+  const diff = Date.now() - props.msg.createTime
+  if (diff > msgRecallTime) {
+    uni.showToast({
+      title: t('msgRecallTimeErrorText'),
+      icon: 'none',
+    })
+    closeTooltip()
+    return
+  }
   uni.showModal({
     title: t('recallText'),
     content: t('recall3'),
diff --git a/im-uniapp-ui/src/pages/Chat/message/message-file.vue b/im-uniapp-ui/src/pages/Chat/message/message-file.vue
index 82f814c..c2d9cad 100644
--- a/im-uniapp-ui/src/pages/Chat/message/message-file.vue
+++ b/im-uniapp-ui/src/pages/Chat/message/message-file.vue
@@ -12,7 +12,9 @@
       <Icon :type="iconType" :size="32"></Icon>
       <div class="msg-file-content">
         <div class="msg-file-title">
-          <text class="msg-file-name" v-text="name"></text>
+          <div class="msg-file-title-prefix">{{ prefixName }}</div>
+          <div class="msg-file-title-suffix">{{ suffixName }}</div>
+          <!-- <text class="msg-file-name" v-text="name"></text> -->
         </div>
         <div class="msg-file-size">{{ parseFileSize(size) }}</div>
       </div>
@@ -25,7 +27,9 @@
       <Icon :type="iconType" :size="32"></Icon>
       <div class="msg-file-content">
         <div class="msg-file-title">
-          <text class="msg-file-name" v-text="name"></text>
+          <div class="msg-file-title-prefix">{{ prefixName }}</div>
+          <div class="msg-file-title-suffix">{{ suffixName }}</div>
+          <!-- <text class="msg-file-name" v-text="name"></text> -->
         </div>
         <div class="msg-file-size">{{ parseFileSize(size) }}</div>
       </div>
@@ -68,6 +72,11 @@ const {
 //@ts-ignore
 const iconType = fileIconMap[getFileType(ext)] || 'icon-weizhiwenjian'
 
+const index = name.lastIndexOf('.') > -1 ? name.lastIndexOf('.') : name.length
+
+const prefixName = name.slice(0, Math.max(index - 5, 0))
+const suffixName = name.slice(Math.max(index - 5, 0))
+
 const downloadUrl =
   url + ((url as string).includes('?') ? '&' : '?') + `download=${name}`
 
@@ -115,9 +124,16 @@ const mpDownload = () => {
     color: #333;
     font-size: 14px;
     font-weight: 400;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    display: flex;
+
+    &-prefix {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    &-suffix {
+      white-space: nowrap;
+    }
   }
 
   &-name {
diff --git a/im-uniapp-ui/src/pages/Chat/message/message-forward-modal.vue b/im-uniapp-ui/src/pages/Chat/message/message-forward-modal.vue
index bed9556..eb9ed80 100644
--- a/im-uniapp-ui/src/pages/Chat/message/message-forward-modal.vue
+++ b/im-uniapp-ui/src/pages/Chat/message/message-forward-modal.vue
@@ -102,7 +102,7 @@ const forwardToNick = computed(() => {
 const forwardFromNick = computed(() => {
   return deepClone(
     uni.$UIKitStore.uiStore.getAppellation({
-      account: props.forwardMsg.senderId,
+      account: props.forwardMsg?.senderId,
     })
   )
 })
diff --git a/im-uniapp-ui/src/pages/Chat/message/message-item.vue b/im-uniapp-ui/src/pages/Chat/message/message-item.vue
index c484dd2..c81f97b 100644
--- a/im-uniapp-ui/src/pages/Chat/message/message-item.vue
+++ b/im-uniapp-ui/src/pages/Chat/message/message-item.vue
@@ -141,10 +141,7 @@
           :tooltip-visible="true"
           :bg-visible="true"
         >
-          <ReplyMessage
-            v-if="!!props.replyMsg"
-            :replyMsg="props.replyMsg"
-          ></ReplyMessage>
+          <ReplyMessage v-if="!!replyMsg" :replyMsg="replyMsg"></ReplyMessage>
           <MessageText :msg="props.msg"></MessageText>
         </MessageBubble>
       </div>
@@ -420,6 +417,7 @@ import {
   onUnmounted,
   defineProps,
   withDefaults,
+  onMounted,
 } from '../../../utils/transformVue'
 import Avatar from '../../../components/Avatar.vue'
 import MessageBubble from './message-bubble.vue'
@@ -439,24 +437,32 @@ import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
 import MessageIsRead from './message-read.vue'
 import Icon from '../../../components/Icon.vue'
 import Appellation from '../../../components/Appellation.vue'
-import { onLoad } from '@dcloudio/uni-app'
 const props = withDefaults(
   defineProps<{
     msg: V2NIMMessageForUI & { timeValue?: number }
     index: number
-    replyMsg?: V2NIMMessageForUI
+    replyMsgsMap?: {
+      [key: string]: V2NIMMessageForUI
+    }
     broadcastNewAudioSrc: string
   }>(),
   {}
 )
 
+const replyMsg = computed(() => {
+  return props.replyMsgsMap && props.replyMsgsMap[props.msg.messageClientId]
+})
+
+// 昵称
 const appellation = ref('')
 const accountId = uni.$UIKitStore?.userStore?.myUserInfo.accountId
 
+// 会话类型
 const conversationType =
   uni.$UIKitNIM.V2NIMConversationIdUtil.parseConversationType(
     props.msg.conversationId
   )
+// 会话对象
 const to = uni.$UIKitNIM.V2NIMConversationIdUtil.parseConversationTargetId(
   props.msg.conversationId
 )
@@ -467,7 +473,12 @@ const videoFirstFrameDataUrl = computed(() => {
   return url ? `${url}${url.includes('?') ? '&' : '?'}vframe=1` : ''
 })
 
+// 图片
 const imageUrl = computed(() => {
+  // 被拉黑
+  if (props.msg.errorCode == 102426) {
+    return 'https://yx-web-nosdn.netease.im/common/c1f278b963b18667ecba4ee9a6e68047/img-fail.png'
+  }
   return props.msg?.attachment?.url || props.msg.attachment?.file
 })
 
@@ -496,6 +507,7 @@ const handleReeditMsg = (msg: V2NIMMessageForUI) => {
   uni.$emit(events.ON_REEDIT_MSG, msg)
 }
 
+// 监听昵称变化
 const uninstallAppellationWatch = autorun(() => {
   // 昵称展示顺序 群昵称 > 备注 > 个人昵称 > 帐号
   appellation.value = deepClone(
diff --git a/im-uniapp-ui/src/pages/Chat/message/message-list.vue b/im-uniapp-ui/src/pages/Chat/message/message-list.vue
index bbda0c2..df38fb4 100644
--- a/im-uniapp-ui/src/pages/Chat/message/message-list.vue
+++ b/im-uniapp-ui/src/pages/Chat/message/message-list.vue
@@ -15,9 +15,7 @@
           :msg="item"
           :index="index"
           :key="item.renderKey"
-          :reply-msg="
-            props.replyMsgsMap && props.replyMsgsMap[item.messageClientId]
-          "
+          :reply-msgs-map="replyMsgsMap"
           :broadcastNewAudioSrc="broadcastNewAudioSrc"
         >
         </MessageItem>
@@ -137,6 +135,7 @@ const finalMsgs = computed(() => {
       renderKey: `${item.createTime}`,
     })
   })
+
   return res
 })
 
@@ -184,14 +183,6 @@ const handleTapMessageList = () => {
   transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
 }
 
-// .msg-list {
-//   padding: 0 16px 20px 16px;
-//   box-sizing: border-box;
-//   transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-//   overflow-x: hidden;
-//   // height: 100%;
-// }
-
 .msg-tip {
   text-align: center;
   color: #b3b7bc;
@@ -216,6 +207,7 @@ const handleTapMessageList = () => {
   font-size: 15px;
   margin-top: 20px;
 }
+
 page > view > message > view > message-list {
   height: 100%;
 }
diff --git a/im-uniapp-ui/src/pages/Chat/message/message-reply.vue b/im-uniapp-ui/src/pages/Chat/message/message-reply.vue
index 03a10dd..eaca976 100644
--- a/im-uniapp-ui/src/pages/Chat/message/message-reply.vue
+++ b/im-uniapp-ui/src/pages/Chat/message/message-reply.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="props.replyMsg.messageClientId" class="reply-msg-wrapper">
+    <div v-if="props.replyMsg?.messageClientId" class="reply-msg-wrapper">
       <!-- replyMsg 不存在 说明回复的消息被删除或者撤回 -->
       <div v-if="!isReplyMsgExist">
         <span>{{ t('replyNotFindText') }}</span>
@@ -26,7 +26,7 @@
           class="other-msg-wrapper"
         >
           <uni-link :href="downloadUrl" :download="name" :showUnderLine="false">
-            [文件消息]
+            {{ t('fileMsgTitleText') }}
           </uni-link>
         </div>
         <div class="other-msg-wrapper" v-else>
@@ -93,6 +93,7 @@ import {
   computed,
   defineProps,
   withDefaults,
+  onUnmounted,
 } from '../../../utils/transformVue'
 import MessageText from './message-text.vue'
 // @ts-ignore
@@ -107,15 +108,20 @@ import MessageAudio from './message-audio.vue'
 import { V2NIMMessageForUI } from '@xkit-yx/im-store-v2/dist/types/types'
 import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
 
-const props = withDefaults(defineProps<{ replyMsg: V2NIMMessageForUI }>(), {})
+const props = withDefaults(
+  defineProps<{ replyMsg: V2NIMMessageForUI | undefined }>(),
+  {}
+)
 
 const isFullScreen = ref(false)
 const repliedTo = ref('')
 
 const { name = '', url = '' } = props.replyMsg?.attachment || {}
+
 const downloadUrl =
   url + ((url as string).includes('?') ? '&' : '?') + `download=${name}`
 
+// 被回复消息是否存在
 const isReplyMsgExist = computed(() => {
   return props.replyMsg?.messageClientId !== 'noFind'
 })
@@ -123,16 +129,16 @@ const isReplyMsgExist = computed(() => {
 onMounted(() => {
   repliedTo.value = deepClone(
     uni.$UIKitStore.uiStore.getAppellation({
-      account: props.replyMsg?.senderId,
+      account: props.replyMsg?.senderId as string,
       teamId: props.replyMsg?.receiverId,
     })
   )
 })
 
-autorun(() => {
+const repliedToWatch = autorun(() => {
   repliedTo.value = deepClone(
     uni.$UIKitStore.uiStore.getAppellation({
-      account: props.replyMsg?.senderId,
+      account: props.replyMsg?.senderId as string,
       teamId: props.replyMsg?.receiverId,
     })
   )
@@ -177,6 +183,10 @@ const closeFullReplyMsg = () => {
   stopAllAudio()
   uni.$emit(events.HANDLE_MOVE_THROUGH, false)
 }
+
+onUnmounted(() => {
+  repliedToWatch()
+})
 </script>
 
 <style lang="scss" scoped>
@@ -263,7 +273,7 @@ const closeFullReplyMsg = () => {
   position: fixed;
   right: 20px;
   z-index: 999999;
-  top: 40px;
+  top: 60px;
 }
 
 .reply-message-close-mp {
diff --git a/im-uniapp-ui/src/pages/Chat/message/pin-list.vue b/im-uniapp-ui/src/pages/Chat/message/pin-list.vue
index ad0ed11..1e11ec2 100644
--- a/im-uniapp-ui/src/pages/Chat/message/pin-list.vue
+++ b/im-uniapp-ui/src/pages/Chat/message/pin-list.vue
@@ -98,7 +98,7 @@ page {
   box-sizing: border-box;
   padding-bottom: 30px;
   background-color: rgb(245, 246, 247);
-
+  min-height: 100vh;
   .nav-bar-text {
     color: rgb(20, 146, 209);
   }
diff --git a/im-uniapp-ui/src/pages/Contact/contact-list/valid-list.vue b/im-uniapp-ui/src/pages/Contact/contact-list/valid-list.vue
index 1e30903..f2243fa 100644
--- a/im-uniapp-ui/src/pages/Contact/contact-list/valid-list.vue
+++ b/im-uniapp-ui/src/pages/Contact/contact-list/valid-list.vue
@@ -4,7 +4,8 @@
     <div class="valid-list-content">
       <Empty v-if="validMsg.length === 0" :text="t('validEmptyText')" />
       <template v-else>
-        <div class="valid-item" v-for="msg in validMsg">
+        <div class="valid-item" v-for="msg in validMsg" :key="msg.timestamp">
+          <!-- 好友申请 已同意 -->
           <template
             v-if="
               msg.status ===
@@ -16,11 +17,7 @@
               <Avatar :account="msg.applicantAccountId" />
               <div class="valid-name-container">
                 <div class="valid-name">
-                  {{
-                    getAppellation({
-                      account: msg.applicantAccountId,
-                    })
-                  }}
+                  <Appellation :account="msg.applicantAccountId" />
                 </div>
                 <div class="valid-action">{{ t('applyFriendText') }}</div>
               </div>
@@ -30,6 +27,7 @@
               <span class="valid-state-text">{{ t('acceptResultText') }}</span>
             </div>
           </template>
+          <!--好友申请 已拒绝 -->
           <template
             v-else-if="
               msg.status ===
@@ -42,11 +40,7 @@
                 <Avatar :account="msg.recipientAccountId" />
                 <div class="valid-name-container">
                   <div class="valid-name">
-                    {{
-                      getAppellation({
-                        account: msg.recipientAccountId,
-                      })
-                    }}
+                    <Appellation :account="msg.recipientAccountId" />
                   </div>
                   <div class="valid-action">{{ t('beRejectResultText') }}</div>
                 </div>
@@ -57,11 +51,7 @@
                 <Avatar :account="msg.applicantAccountId" />
                 <div class="valid-name-container">
                   <div class="valid-name">
-                    {{
-                      getAppellation({
-                        account: msg.applicantAccountId,
-                      })
-                    }}
+                    <Appellation :account="msg.applicantAccountId" />
                   </div>
                   <div class="valid-action">{{ t('applyFriendText') }}</div>
                 </div>
@@ -74,6 +64,7 @@
               </div>
             </template>
           </template>
+          <!-- 好友申请 未处理 -->
           <template
             v-else-if="
               msg.status ===
@@ -86,11 +77,7 @@
                 <Avatar :account="msg.applicantAccountId" />
                 <div class="valid-name-container">
                   <div class="valid-name">
-                    {{
-                      getAppellation({
-                        account: msg.applicantAccountId,
-                      })
-                    }}
+                    <Appellation :account="msg.applicantAccountId" />
                   </div>
                   <div class="valid-action">{{ t('applyFriendText') }}</div>
                 </div>
@@ -130,24 +117,18 @@ import { t } from '../../../utils/i18n'
 import { deepClone } from '../../../utils'
 import { V2NIMFriendAddApplicationForUI } from '@xkit-yx/im-store-v2/dist/types/types'
 import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
-
+import Appellation from '../../../components/Appellation.vue'
 const validMsg = ref<V2NIMFriendAddApplicationForUI[]>([])
 const applyFriendLoading = ref(false)
 
+// 是否是我发起的申请
 const isMeApplicant = (data: V2NIMFriendAddApplicationForUI) => {
   return (
     data.applicantAccountId === uni.$UIKitStore.userStore.myUserInfo.accountId
   )
 }
 
-const uninstallValidMsgWatch = autorun(() => {
-  validMsg.value = deepClone(uni.$UIKitStore.sysMsgStore.friendApplyMsgs)
-})
-
-const getAppellation = (params: { account: string }) => {
-  return uni.$UIKitStore.uiStore.getAppellation(params)
-}
-
+// 拒绝好友申请
 const handleRejectApplyFriendClick = async (
   msg: V2NIMFriendAddApplicationForUI
 ) => {
@@ -168,6 +149,7 @@ const handleRejectApplyFriendClick = async (
   }
 }
 
+// 接受好友申请
 const handleAcceptApplyFriendClick = async (
   msg: V2NIMFriendAddApplicationForUI
 ) => {
@@ -202,6 +184,13 @@ const handleAcceptApplyFriendClick = async (
   }
 }
 
+const uninstallValidMsgWatch = autorun(() => {
+  validMsg.value = deepClone(uni.$UIKitStore.sysMsgStore.friendApplyMsgs)
+  uni.$UIKitStore.sysMsgStore.friendApplyMsgs?.map((item) => {
+    uni.$UIKitStore.userStore.getUserActive(item.applicantAccountId)
+  })
+})
+
 onUnmounted(() => {
   uninstallValidMsgWatch()
 })
diff --git a/im-uniapp-ui/src/pages/Conversation/conversation-list/conversation-item.vue b/im-uniapp-ui/src/pages/Conversation/conversation-list/conversation-item.vue
index aa9fe6b..e4fa5c6 100644
--- a/im-uniapp-ui/src/pages/Conversation/conversation-list/conversation-item.vue
+++ b/im-uniapp-ui/src/pages/Conversation/conversation-list/conversation-item.vue
@@ -42,7 +42,9 @@
             v-if="showSessionUnread"
             :conversation="props.conversation"
           ></ConversationItemIsRead>
-          <span class="conversation-item-desc-content">{{ content }}</span>
+          <span class="conversation-item-desc-content">{{
+            lastMsgContent
+          }}</span>
           <Icon
             v-if="isMute"
             iconClassName="conversation-item-desc-state"
@@ -111,6 +113,7 @@ const handleClick = (type: string) => {
   }
 }
 
+// 群头像
 const teamAvatar = computed(() => {
   if (
     props.conversation.type ===
@@ -121,6 +124,7 @@ const teamAvatar = computed(() => {
   }
 })
 
+// 对话方
 const sessionName = computed(() => {
   if (props.conversation.name) {
     return props.conversation.name
@@ -128,14 +132,8 @@ const sessionName = computed(() => {
   return props.conversation.conversationId
 })
 
-const to = computed(() => {
-  const res = uni.$UIKitNIM.V2NIMConversationIdUtil.parseConversationTargetId(
-    props.conversation.conversationId
-  )
-  return res
-})
-
-const content = computed(() => {
+// 会话最后一条消息内容
+const lastMsgContent = computed(() => {
   const lastMsg = props.conversation.lastMessage
 
   if (lastMsg) {
@@ -153,11 +151,15 @@ const content = computed(() => {
     }
 
     if (
-      sendingState ===
-        V2NIMConst.V2NIMMessageSendingState
-          .V2NIM_MESSAGE_SENDING_STATE_SENDING ||
       messageType ===
-        V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_NOTIFICATION
+      V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_NOTIFICATION
+    ) {
+      return t('conversationNotificationText')
+    }
+
+    if (
+      sendingState ===
+      V2NIMConst.V2NIMMessageSendingState.V2NIM_MESSAGE_SENDING_STATE_SENDING
     ) {
       return ''
     }
@@ -166,7 +168,7 @@ const content = computed(() => {
       sendingState ===
       V2NIMConst.V2NIMMessageSendingState.V2NIM_MESSAGE_SENDING_STATE_FAILED
     ) {
-      return '[发送失败]'
+      return t('conversationSendFailText')
     }
 
     return getMsgContentTipByType({
@@ -177,6 +179,13 @@ const content = computed(() => {
   return ''
 })
 
+const to = computed(() => {
+  const res = uni.$UIKitNIM.V2NIMConversationIdUtil.parseConversationTargetId(
+    props.conversation.conversationId
+  )
+  return res
+})
+
 const date = computed(() => {
   const time =
     props.conversation.lastMessage?.messageRefer.createTime ||
diff --git a/im-uniapp-ui/src/pages/Conversation/conversation-list/index.vue b/im-uniapp-ui/src/pages/Conversation/conversation-list/index.vue
index ca90cdf..ff5423b 100644
--- a/im-uniapp-ui/src/pages/Conversation/conversation-list/index.vue
+++ b/im-uniapp-ui/src/pages/Conversation/conversation-list/index.vue
@@ -45,12 +45,42 @@
     </div>
     <div class="block"></div>
     <NetworkAlert />
+    <div
+      v-if="!conversationList || conversationList.length === 0"
+      class="conversation-search"
+      @click="jumpToSearch"
+    >
+      <div class="search-input-wrapper">
+        <div class="search-icon-wrapper">
+          <Icon
+            iconClassName="search-icon"
+            :size="16"
+            color="#A6ADB6"
+            type="icon-sousuo"
+          ></Icon>
+        </div>
+        <div class="search-input">{{ t('searchText') }}</div>
+      </div>
+    </div>
     <!-- 页面初始化的过程中，sessionList编译到小程序和h5出现sessionList为undefined的情况，即使给了默认值为空数组，故在此处进行判断 -->
     <Empty
       v-if="!conversationList || conversationList.length === 0"
       :text="t('conversationEmptyText')"
     />
     <div v-else class="conversation-list-wrapper">
+      <div class="conversation-search" @click="jumpToSearch">
+        <div class="search-input-wrapper">
+          <div class="search-icon-wrapper">
+            <Icon
+              iconClassName="search-icon"
+              :size="16"
+              color="#A6ADB6"
+              type="icon-sousuo"
+            ></Icon>
+          </div>
+          <div class="search-input">{{ t('searchText') }}</div>
+        </div>
+      </div>
       <!-- 此处的key如果用session.id，会在ios上渲染存在问题，会出现会话列表显示undefined -->
       <div
         v-for="(conversation, index) in conversationList"
@@ -73,7 +103,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from '../../../utils/transformVue'
+import { onUnmounted, ref } from '../../../utils/transformVue'
 import { autorun } from 'mobx'
 import { onHide } from '@dcloudio/uni-app'
 import Icon from '../../../components/Icon.vue'
@@ -195,11 +225,17 @@ const onDropdownClick = (urlType: 'addFriend' | 'createGroup') => {
   })
 }
 
+const jumpToSearch = () => {
+  customNavigateTo({
+    url: '/pages/Conversation/conversation-search/index',
+  })
+}
+
 onHide(() => {
   addDropdownVisible.value = false
 })
 
-autorun(() => {
+const conversationListWatch = autorun(() => {
   conversationList.value = deepClone(uni.$UIKitStore?.uiStore?.conversations)
     ?.map((conversation: V2NIMConversation) => {
       return {
@@ -214,7 +250,7 @@ autorun(() => {
   setTabUnread()
 })
 
-autorun(() => {
+const getTotalUnreadMsgsCountWatch = autorun(() => {
   // 为了监听会触发得留着这个 console
   console.log(
     'unreadSysMsgCount:',
@@ -223,6 +259,10 @@ autorun(() => {
   )
   setContactTabUnread()
 })
+onUnmounted(() => {
+  conversationListWatch()
+  getTotalUnreadMsgsCountWatch()
+})
 </script>
 
 <style lang="scss" scoped>
@@ -247,7 +287,34 @@ autorun(() => {
   opacity: 1;
   z-index: 999;
 }
-
+.conversation-search {
+  display: flex;
+  align-items: center;
+  height: 54px;
+  box-sizing: border-box;
+  overflow: hidden;
+  padding: 10px;
+}
+.search-input-wrapper {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  height: 34px;
+  overflow: hidden;
+  box-sizing: border-box;
+  padding: 8px 10px;
+  background: #f3f5f7;
+  border-radius: 5px;
+}
+.search-input {
+  margin-left: 5px;
+  color: #999999;
+}
+.search-icon-wrapper {
+  height: 22px;
+  display: flex;
+  align-items: center;
+}
 .block {
   height: 60px;
   width: 100%;
diff --git a/im-uniapp-ui/src/pages/Conversation/conversation-search/index.vue b/im-uniapp-ui/src/pages/Conversation/conversation-search/index.vue
new file mode 100644
index 0000000..385c7f7
--- /dev/null
+++ b/im-uniapp-ui/src/pages/Conversation/conversation-search/index.vue
@@ -0,0 +1,247 @@
+<template>
+  <div>
+    <NavBar :title="t('searchTitleText')" />
+    <div class="search-wrapper">
+      <div class="input-wrapper">
+        <div class="search-icon-wrapper">
+          <Icon
+            iconClassName="search-icon"
+            :size="16"
+            color="#A6ADB6"
+            type="icon-sousuo"
+          ></Icon>
+        </div>
+        <input
+          class="input"
+          :value="searchText"
+          @input="handleInput"
+          :focus="inputFocus"
+          @focus="handleFocus"
+          @blur="handleBlur"
+          :placeholder="t('searchText')"
+        />
+        <div v-if="searchText" class="clear-icon" @tap="clearInput()">
+          <Icon type="icon-shandiao" :size="16" />
+        </div>
+      </div>
+    </div>
+    <div v-if="searchResult.length > 0" class="search-result-wrapper">
+      <div class="search-result-list">
+        <div v-for="item in searchResult" :key="item.renderKey">
+          <div class="result-title" v-if="item.title == 'friends'">
+            {{ t('friendText') }}
+          </div>
+          <div class="result-title" v-else-if="item.title == 'groups'">
+            {{ t('teamText') }}
+          </div>
+          <div v-else>
+            <SearchResultItem :item="item" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="searchResult.length == 0 && searchText">
+      <Empty :text="t('searchResultNullText')" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {
+  ref,
+  onUnmounted,
+  computed,
+  onMounted,
+} from '../../../utils/transformVue'
+import { t } from '../../../utils/i18n'
+import NavBar from '../../../components/NavBar.vue'
+import Icon from '../../../components/Icon.vue'
+import { autorun } from 'mobx'
+import SearchResultItem from './search-result-item.vue'
+import Empty from '../../../components/Empty.vue'
+const inputFocus = ref(false)
+
+const searchText = ref('')
+
+const searchList = ref<{ id: string; list: any }[]>([])
+
+const searchListWatch = autorun(() => {
+  const friends =
+    uni.$UIKitStore.uiStore.friends
+      .filter(
+        (item) =>
+          !uni.$UIKitStore.relationStore.blacklist.includes(item.accountId)
+      )
+      .map((item) => {
+        const user = uni.$UIKitStore.userStore.users.get(item.accountId) || {
+          accountId: '',
+          name: '',
+          createTime: Date.now(),
+        }
+
+        return {
+          ...item,
+          ...user,
+        }
+      }) || []
+  const teamList = uni.$UIKitStore.uiStore.teamList || []
+  searchList.value = [
+    {
+      id: 'friends',
+      list: friends,
+    },
+    {
+      id: 'groups',
+      list: teamList,
+    },
+  ].filter((item) => !!item.list.length)
+})
+
+const searchResult = computed(() => {
+  const res: { title?: string; renderKey: string }[] = []
+  if (searchText.value) {
+    const finalSections = searchList.value
+      .map((item) => {
+        if (item.id === 'friends') {
+          return {
+            ...item,
+            list: item.list?.filter((item) => {
+              return (
+                item.alias?.includes(searchText.value) ||
+                item.name?.includes(searchText.value) ||
+                item.accountId?.includes(searchText.value)
+              )
+            }),
+          }
+        }
+
+        if (item.id === 'groups') {
+          return {
+            ...item,
+            list: item.list?.filter((item) => {
+              return (item.name || item.teamId).includes(searchText.value)
+            }),
+          }
+        }
+
+        return { ...item }
+      })
+      .filter((item) => !!item.list?.length)
+
+    finalSections.forEach((item) => {
+      if (item.id === 'friends') {
+        res.push({
+          title: 'friends',
+          renderKey: 'friends',
+        })
+        item.list.forEach((item: any) => {
+          res.push({
+            ...item,
+            renderKey: item.accountId,
+          })
+        })
+      } else if (item.id === 'groups') {
+        res.push({
+          title: 'groups',
+          renderKey: 'groups',
+        })
+        item.list.forEach((item: any) => {
+          res.push({
+            ...item,
+            renderKey: item.teamId,
+          })
+        })
+      }
+    })
+  }
+  console.log('==================res', res)
+  return res
+})
+
+onMounted(() => {
+  inputFocus.value = true
+})
+
+const handleBlur = () => {
+  inputFocus.value = false
+}
+
+const handleFocus = () => {
+  inputFocus.value = true
+}
+
+const handleInput = (event: any) => {
+  searchText.value = event.detail.value
+}
+
+const clearInput = () => {
+  inputFocus.value = true
+  searchText.value = ''
+}
+
+onUnmounted(() => {
+  searchListWatch()
+})
+</script>
+
+<style lang="scss" scoped>
+$primary-color: #337eff;
+$error-color: #f56c6c;
+
+.search-wrapper {
+  padding: 8px 10px;
+}
+
+.input-wrapper {
+  height: 40px;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  background: #f3f5f7;
+  border-radius: 5px;
+  padding: 8px 10px;
+}
+
+.search-icon-wrapper {
+  margin-right: 5px;
+  display: flex;
+  align-items: center;
+}
+.form-input-item {
+  border-bottom: 1px solid #dcdfe5;
+  padding: 10px 10px 5px 0px;
+  display: flex;
+  height: 44px;
+  align-items: center;
+
+  &.focus {
+    border-color: $primary-color;
+  }
+
+  &.error {
+    border-color: $error-color;
+  }
+}
+
+.result-title {
+  height: 30px;
+  color: #c0c0c1;
+  font-size: 14px;
+  border-bottom: 1px solid #c0c0c1;
+}
+
+.input {
+  flex: 1;
+  height: 30px;
+  border: none;
+  outline: none;
+}
+.clear-icon {
+  width: 40px;
+  text-align: right;
+}
+
+.search-result-wrapper {
+  padding: 0 10px;
+}
+</style>
diff --git a/im-uniapp-ui/src/pages/Conversation/conversation-search/search-result-item.vue b/im-uniapp-ui/src/pages/Conversation/conversation-search/search-result-item.vue
new file mode 100644
index 0000000..c2df50f
--- /dev/null
+++ b/im-uniapp-ui/src/pages/Conversation/conversation-search/search-result-item.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="search-result-list-item" @click="handleItemClick">
+    <div class="result-item-avatar">
+      <Avatar :account="to" :avatar="teamAvatar" />
+    </div>
+    <div v-if="!isTeam" class="result-item-title">
+      <Appellation :account="to" />
+      <div class="result-item-account">{{ to }}</div>
+    </div>
+    <div v-else class="result-item-title">
+      {{ teamName }}
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {
+  defineProps,
+  withDefaults,
+  computed,
+} from '../../../utils/transformVue'
+import { t } from '../../../utils/i18n'
+import Avatar from '../../../components/Avatar.vue'
+import Appellation from '../../../components/Appellation.vue'
+import { customNavigateTo } from '../../../utils/customNavigate'
+import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
+
+const props = withDefaults(
+  defineProps<{
+    item: any
+  }>(),
+  {}
+)
+
+// 群头像
+const teamAvatar = computed(() => {
+  if (props.item.teamId) {
+    return props.item.avatar
+  }
+})
+
+// 对话方
+const to = computed(() => {
+  if (props.item.teamId) {
+    return props.item.teamId
+  }
+  return props.item.accountId
+})
+
+// 是否是群
+const isTeam = computed(() => {
+  return !!props.item.teamId
+})
+
+// 群名
+const teamName = computed(() => {
+  if (props.item.teamId) {
+    return props.item.name
+  }
+  return ''
+})
+
+let flag = false
+
+const handleItemClick = async () => {
+  if (flag) return
+  try {
+    flag = true
+    let conversationType = ''
+    let receiverId = ''
+    let item = props.item
+    if (item.accountId) {
+      conversationType =
+        V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P
+      receiverId = item.accountId
+    } else if (item.teamId) {
+      conversationType =
+        V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM
+      receiverId = item.teamId
+    } else {
+      throw Error('unknow scene')
+    }
+    await uni.$UIKitStore.conversationStore.insertConversationActive(
+      conversationType,
+      receiverId
+    )
+
+    customNavigateTo({
+      url: '/pages/Chat/index',
+    })
+  } catch {
+    uni.showToast({
+      title: t('selectSessionFailText'),
+      icon: 'error',
+    })
+  } finally {
+    flag = false
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.search-result-list-item {
+  display: flex;
+  align-items: center;
+  height: 50px;
+  margin: 10px 0;
+}
+
+.result-item-avatar {
+  width: 42px;
+}
+
+.result-item-title {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  margin-left: 10px;
+  font-size: 14px;
+}
+.result-item-account {
+  font-size: 13px;
+  color: #b5b6b8;
+}
+</style>
diff --git a/im-uniapp-ui/src/pages/Conversation/index.vue b/im-uniapp-ui/src/pages/Conversation/index.vue
index 96123d5..1eacaed 100644
--- a/im-uniapp-ui/src/pages/Conversation/index.vue
+++ b/im-uniapp-ui/src/pages/Conversation/index.vue
@@ -7,9 +7,6 @@ import ConversationList from './conversation-list/index.vue'
 import { trackInit } from '../../utils/reporter'
 import { onShow } from '@dcloudio/uni-app'
 
-import { setContactTabUnread, setTabUnread } from '../../utils/msg'
-import { autorun } from 'mobx'
-
 trackInit('ConversationUIKit')
 
 onShow(() => {
diff --git a/im-uniapp-ui/src/pages/Group/group-add/index.vue b/im-uniapp-ui/src/pages/Group/group-add/index.vue
index d20fec8..c7ff48e 100644
--- a/im-uniapp-ui/src/pages/Group/group-add/index.vue
+++ b/im-uniapp-ui/src/pages/Group/group-add/index.vue
@@ -1,20 +1,20 @@
 <template>
   <div>
     <NavBar :title="t('friendSelectText')" />
-    <FriendSelect
-      :friendList="friendList"
+    <PersonSelect
+      :personList="friendList"
       @checkboxChange="checkboxChange"
       :showBtn="true"
       :onBtnClick="addTeamMember"
     >
-    </FriendSelect>
+    </PersonSelect>
   </div>
 </template>
 
 <script lang="ts" setup>
-import FriendSelect, {
-  FriendSelectItem,
-} from '../../../components/FriendSelect.vue'
+import PersonSelect, {
+  PersonSelectItem,
+} from '../../../components/PersonSelect.vue'
 import { ref } from '../../../utils/transformVue'
 import NavBar from '../../../components/NavBar.vue'
 import { t } from '../../../utils/i18n'
@@ -23,7 +23,7 @@ import { debounce } from '@xkit-yx/utils'
 import { deepClone } from '../../../utils'
 import { events } from '../../../utils/constants'
 
-const friendList = ref<FriendSelectItem[]>([])
+const friendList = ref<PersonSelectItem[]>([])
 let teamId = ''
 let newTeamMember: string[] = []
 
diff --git a/im-uniapp-ui/src/pages/Group/group-create/index.vue b/im-uniapp-ui/src/pages/Group/group-create/index.vue
index 063e9a8..d22c467 100644
--- a/im-uniapp-ui/src/pages/Group/group-create/index.vue
+++ b/im-uniapp-ui/src/pages/Group/group-create/index.vue
@@ -1,20 +1,20 @@
 <template>
   <div>
     <NavBar :title="t('createTeamText')" />
-    <FriendSelect
-      :friendList="friendList"
+    <PersonSelect
+      :personList="friendList"
       @checkboxChange="checkboxChange"
       :showBtn="true"
       :btnText="t('createButtonText') + '(' + groupMembers.length + ')'"
     >
-    </FriendSelect>
+    </PersonSelect>
   </div>
 </template>
 
 <script lang="ts" setup>
-import FriendSelect, {
-  type FriendSelectItem,
-} from '../../../components/FriendSelect.vue'
+import PersonSelect, {
+  type PersonSelectItem,
+} from '../../../components/PersonSelect.vue'
 import { ref, computed } from '../../../utils/transformVue'
 import NavBar from '../../../components/NavBar.vue'
 import { t } from '../../../utils/i18n'
@@ -22,7 +22,7 @@ import { onLoad, onUnload } from '@dcloudio/uni-app'
 import { customRedirectTo } from '../../../utils/customNavigate'
 import { events } from '../../../utils/constants'
 
-const friendList = ref<FriendSelectItem[]>([])
+const friendList = ref<PersonSelectItem[]>([])
 
 const groupMembers = computed(() => {
   return friendList.value
diff --git a/im-uniapp-ui/src/pages/Group/group-set/add-group-manager.vue b/im-uniapp-ui/src/pages/Group/group-set/add-group-manager.vue
index 57ea6ba..80395a5 100644
--- a/im-uniapp-ui/src/pages/Group/group-set/add-group-manager.vue
+++ b/im-uniapp-ui/src/pages/Group/group-set/add-group-manager.vue
@@ -1,21 +1,21 @@
 <template>
   <div>
-    <NavBar :title="t('teamMemebrSelect')" />
-    <FriendSelect
+    <NavBar :title="t('teamMemberSelect')" />
+    <PersonSelect
       :max="10"
-      :friendList="teamMemberList"
+      :personList="teamMemberList"
       @checkboxChange="checkboxChange"
       :showBtn="true"
       :onBtnClick="onOk"
     >
-    </FriendSelect>
+    </PersonSelect>
   </div>
 </template>
 
 <script lang="ts" setup>
-import FriendSelect, {
-  FriendSelectItem,
-} from '../../../components/FriendSelect.vue'
+import PersonSelect, {
+  PersonSelectItem,
+} from '../../../components/PersonSelect.vue'
 import { onUnmounted, ref } from '../../../utils/transformVue'
 import NavBar from '../../../components/NavBar.vue'
 import { t } from '../../../utils/i18n'
@@ -26,7 +26,7 @@ import { events } from '../../../utils/constants'
 import { autorun } from 'mobx'
 import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
 
-const teamMemberList = ref<FriendSelectItem[]>([])
+const teamMemberList = ref<PersonSelectItem[]>([])
 let selectManager: string[] = []
 let teamId = ''
 
@@ -88,8 +88,8 @@ let uninstallTeamMemberListWatch = () => {}
 
 onLoad((props) => {
   teamId = props ? props.id : ''
-  autorun(() => {
-    uninstallTeamMemberListWatch = teamMemberList.value = deepClone(
+  uninstallTeamMemberListWatch = autorun(() => {
+    teamMemberList.value = deepClone(
       uni.$UIKitStore.teamMemberStore
         .getTeamMember(teamId)
         .filter((item) => {
@@ -107,6 +107,7 @@ onLoad((props) => {
           }
           return {
             accountId: item.accountId,
+            teamId: item.teamId,
             checked:
               item.memberRole ===
               V2NIMConst.V2NIMTeamMemberRole.V2NIM_TEAM_MEMBER_ROLE_MANAGER,
diff --git a/im-uniapp-ui/src/pages/Group/group-set/group-info-edit11.vue b/im-uniapp-ui/src/pages/Group/group-set/group-info-edit11.vue
deleted file mode 100644
index fcf12ba..0000000
--- a/im-uniapp-ui/src/pages/Group/group-set/group-info-edit11.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-  <div class="group-set-container">
-    <NavBar :title="t('teamTitle')" />
-    <div class="group-name-input-container">
-      <FormInput
-        :model-value="teamName"
-        :allow-clear="true"
-        :maxlength="15"
-        @input="handleInput"
-      />
-      <div class="input-length">{{ inputLengthTips }}</div>
-    </div>
-    <div
-      :class="getUniPlatform() === 'mp-weixin' ? 'ok-btn-mp' : 'ok-btn'"
-      @tap="handleSave"
-    >
-      {{ t('saveText') }}
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import NavBar from '../../../components/NavBar.vue'
-import FormInput from '../../../components/FormInput.vue'
-import { onLoad } from '@dcloudio/uni-app'
-import { ref, computed } from '../../../utils/transformVue'
-import { t } from '../../../utils/i18n'
-import { getUniPlatform } from '../../../utils'
-
-const teamName = ref<string>()
-let teamId = ''
-
-const inputLengthTips = computed(() => {
-  return `${teamName.value ? teamName.value?.length : 0}/${15}`
-})
-
-// 保存群名称
-const handleSave = () => {
-  if (!teamName.value) {
-    uni.showToast({
-      title: t('teamTitleConfirmText'),
-      icon: 'error',
-    })
-    return
-  }
-
-  teamName.value &&
-    uni.$UIKitStore.teamStore
-      .updateTeamActive({
-        teamId,
-        info: {
-          name: teamName.value,
-        },
-      })
-      .then(() => {
-        uni.showToast({
-          title: t('updateTeamSuccessText'),
-          icon: 'success',
-        })
-        uni.navigateBack()
-      })
-      .catch((err: any) => {
-        switch (err?.code) {
-          case 109432:
-            uni.showToast({
-              title: t('noPermission'),
-              icon: 'error',
-            })
-            break
-          default:
-            uni.showToast({
-              title: t('updateTeamFailedText'),
-              icon: 'error',
-            })
-            break
-        }
-      })
-}
-
-const handleInput = (value: string) => {
-  teamName.value = value ? value.replace(/\s*/g, '') : value
-}
-
-onLoad((option) => {
-  teamId = option?.id
-
-  const team = uni.$UIKitStore.teamStore.teams.get(teamId)
-  teamName.value = team ? team.name.substring(0, 15) : ''
-})
-</script>
-
-<style lang="scss" scoped>
-@import '../../styles/common.scss';
-
-page {
-  padding-top: var(--status-bar-height);
-  height: 100vh;
-  overflow: hidden;
-}
-
-.group-set-container {
-  height: 100vh;
-  box-sizing: border-box;
-  background-color: #eff1f4;
-}
-
-.group-name-input-container {
-  background: #ffffff;
-  border-radius: 8px;
-  padding: 0 16px 5px;
-  position: relative;
-  margin: 10px 20px;
-
-  .input-length {
-    position: absolute;
-    right: 25px;
-    bottom: 5px;
-    font-size: 12px;
-    color: #999999;
-  }
-
-  ::v-deep.form-input-item {
-    border: none;
-  }
-}
-</style>
diff --git a/im-uniapp-ui/src/pages/user-card/my/about.vue b/im-uniapp-ui/src/pages/user-card/my/about.vue
index f671ca3..c0a2d87 100644
--- a/im-uniapp-ui/src/pages/user-card/my/about.vue
+++ b/im-uniapp-ui/src/pages/user-card/my/about.vue
@@ -11,7 +11,7 @@
     <div class="aboutInfo-item-wrapper">
       <div class="item">
         <div>版本号</div>
-        <div>10.1.0</div>
+        <div>10.2.0</div>
       </div>
       <div class="item">
         <div>IM 版本</div>
diff --git a/im-uniapp-ui/src/pages/user-card/my/collection-card.vue b/im-uniapp-ui/src/pages/user-card/my/collection-card.vue
new file mode 100644
index 0000000..074efa0
--- /dev/null
+++ b/im-uniapp-ui/src/pages/user-card/my/collection-card.vue
@@ -0,0 +1,380 @@
+<template>
+  <div class="collection-card-wrapper">
+    <div class="info-wrapper">
+      <div class="info" @tap="gotoChat">
+        <div class="info-left">
+          <image
+            :lazy-load="true"
+            class="avatar-img"
+            v-if="collectionData.avatar"
+            :src="collectionData.avatar"
+            mode="aspectFill"
+          />
+        </div>
+        <div class="info-right">
+          <div class="name">
+            {{ collectionData.senderName }}
+          </div>
+          <div class="conversation">
+            来自于 {{ collectionData.conversationName }}
+          </div>
+        </div>
+      </div>
+      <div class="info-icon">
+        <Icon type="icon-More" @tap="handleCollection" />
+      </div>
+    </div>
+    <div class="content-wrapper">
+      <div
+        class="file-wrapper"
+        v-if="
+          msg.messageType ===
+          V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_IMAGE
+        "
+      >
+        <div
+          @tap="
+            () => {
+              handleImageTouch(msg.attachment.url)
+            }
+          "
+        >
+          <image
+            class="msg-image"
+            :lazy-load="true"
+            mode="aspectFill"
+            :src="imageUrl"
+          ></image>
+        </div>
+      </div>
+      <div
+        class="file-wrapper"
+        v-else-if="
+          msg.messageType ===
+          V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_VIDEO
+        "
+      >
+        <div class="video-msg-wrapper" @tap="() => handleVideoTouch(msg)">
+          <div class="video-play-button">
+            <div class="video-play-icon"></div>
+          </div>
+          <image
+            class="msg-image"
+            :lazy-load="true"
+            mode="aspectFill"
+            :src="videoFirstFrameDataUrl"
+          ></image>
+        </div>
+      </div>
+      <div
+        class="file-wrapper extra"
+        v-else-if="
+          msg.messageType ===
+          V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_FILE
+        "
+      >
+        <MessageFile :msg="msg" />
+      </div>
+      <div
+        class="file-wrapper"
+        v-else-if="
+          msg.messageType ===
+          V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_AUDIO
+        "
+      >
+        <div class="audio-wrapper">
+          <MessageAudio :msg="msg" mode="audio-in" />
+        </div>
+      </div>
+      <div
+        v-else-if="
+          msg.messageType ===
+          V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_TEXT
+        "
+        class="text-wrapper"
+      >
+        <template v-for="item in textArr">
+          <template v-if="item.type === 'text'">
+            {{ item.value }}
+          </template>
+
+          <template v-else-if="item.type === 'emoji'">
+            <Icon
+              :type="emojiMap[item.value]"
+              :size="fontSize || 22"
+              :style="{ margin: '0 2px 2px 2px', verticalAlign: 'bottom' }"
+            />
+          </template>
+        </template>
+      </div>
+
+      <div v-else>[{{ t('unknowMsgText') }}]</div>
+    </div>
+    <div class="updatetime">
+      {{ timeFormat() }}
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed } from '../../../utils/transformVue'
+import { stopAllAudio } from '../../../utils'
+import Avatar from '../../../components/Avatar.vue'
+import Icon from '../../../components/Icon.vue'
+import { defineProps, withDefaults } from '../../../utils/transformVue'
+import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
+import { V2NIMMessageForUI } from '@xkit-yx/im-store-v2/dist/types/types'
+
+import dayjs from 'dayjs'
+import { customNavigateTo } from '../../../utils/customNavigate'
+import MessageFile from '../../../pages/Chat/message/message-file.vue'
+import MessageAudio from '../../../pages/Chat/message/message-audio.vue'
+import { t } from '../../../utils/i18n'
+import { customRedirectTo } from '../../../utils/customNavigate'
+import { parseText } from '../../../utils/parseText'
+import { emojiMap } from '../../../utils/emoji'
+import { V2NIMCollection } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK/V2NIMMessageService'
+
+const props = withDefaults(
+  defineProps<{
+    data: V2NIMCollection
+    handleRemoveCollection: any
+  }>(),
+  {}
+)
+
+const collectionData = JSON.parse(props.data.collectionData)
+
+collectionData.message =
+  uni.$UIKitNIM.V2NIMMessageConverter.messageDeserialization(
+    collectionData.message
+  )
+
+const msg = collectionData.message
+
+const textArr = parseText(msg?.text || '')
+
+const handleCopy = () => {
+  uni.setClipboardData({
+    data: msg.text,
+  })
+}
+
+const handleCollection = () => {
+  let itemList = [t('deleteCollectionText')]
+  if (msg.messageType === V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_TEXT) {
+    itemList = itemList.concat([
+      t('copyText'),
+      t('forwardToTeamText'),
+      t('forwardToFriendText'),
+    ])
+  } else if (
+    msg.messageType !== V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_AUDIO
+  ) {
+    itemList = itemList.concat([
+      t('forwardToTeamText'),
+      t('forwardToFriendText'),
+    ])
+  }
+  uni.showActionSheet({
+    itemList,
+    success(data) {
+      if (
+        msg.messageType === V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_TEXT
+      ) {
+        if (data.tapIndex === 0) {
+          props.handleRemoveCollection()
+        } else if (data.tapIndex === 1) {
+          handleCopy()
+        } else if (data.tapIndex === 2) {
+          customNavigateTo({
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM}&msgIdClient=${msg.messageClientId}&origin=collection`,
+          })
+        } else if (data.tapIndex === 3) {
+          customNavigateTo({
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P}&msgIdClient=${msg.messageClientId}&origin=collection`,
+          })
+        }
+      } else if (
+        msg.messageType !== V2NIMConst.V2NIMMessageType.V2NIM_MESSAGE_TYPE_AUDIO
+      ) {
+        if (data.tapIndex === 0) {
+          props.handleRemoveCollection()
+        } else if (data.tapIndex === 1) {
+          customNavigateTo({
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_TEAM}&msgIdClient=${msg.messageClientId}&origin=collection`,
+          })
+        } else if (data.tapIndex === 2) {
+          customNavigateTo({
+            url: `/pages/Chat/forward?forwardConversationType=${V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P}&msgIdClient=${msg.messageClientId}&origin=collection`,
+          })
+        }
+      } else {
+        if (data.tapIndex === 0) {
+          props.handleRemoveCollection()
+        }
+      }
+    },
+    complete() {},
+  })
+}
+
+const imageUrl = computed(() => {
+  return msg?.attachment?.url || msg.attachment?.file
+})
+
+// 获取视频首帧
+const videoFirstFrameDataUrl = computed(() => {
+  const url = msg.attachment?.url
+  return url ? `${url}${url.includes('?') ? '&' : '?'}vframe=1` : ''
+})
+// 点击图片预览
+const handleImageTouch = (url: string) => {
+  if (url) {
+    uni.previewImage({
+      urls: [url],
+    })
+  }
+}
+
+// 点击视频播放
+const handleVideoTouch = (msg: V2NIMMessageForUI) => {
+  stopAllAudio()
+  const url = msg.attachment?.url
+  if (url) {
+    customNavigateTo({
+      url: `/pages/Chat/video-play?videoUrl=${encodeURIComponent(url)}`,
+    })
+  }
+}
+
+const isToday = (time) => {
+  const createTime = new Date(time)
+  const now = new Date()
+  return (
+    createTime.getFullYear() === now.getFullYear() &&
+    createTime.getMonth() === now.getMonth() &&
+    createTime.getDate() === now.getDate()
+  )
+}
+const isThisYear = (time) => {
+  const createTime = new Date(time)
+  const now = new Date()
+  return createTime.getFullYear() === now.getFullYear()
+}
+const timeFormat = () => {
+  const updateTime = props.data.updateTime
+
+  if (isToday(updateTime)) {
+    return dayjs(updateTime).format('HH:mm')
+  } else if (isThisYear(updateTime)) {
+    return dayjs(updateTime).format('MM月DD日 HH:mm')
+  } else {
+    return dayjs(updateTime).format('YYYY年MM月DD日 HH:mm')
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '../../../pages/styles/common.scss';
+
+.collection-card-wrapper {
+  background-color: #fff;
+  margin: 0 20px;
+  margin-top: 12px;
+  overflow: hidden;
+  border-radius: 8px;
+  .info-wrapper {
+    display: flex;
+    margin: 0 16px;
+    padding: 16px 0 12px 0;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid #e4e9f2;
+    .info {
+      display: flex;
+      overflow: hidden;
+      .info-left {
+        margin-right: 8px;
+        .avatar-img {
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+        }
+      }
+      .info-right {
+        overflow: hidden;
+        font-size: 12px;
+        .conversation {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          color: #999999;
+        }
+      }
+    }
+    .info-icon {
+      width: 16px;
+    }
+  }
+  .updatetime {
+    padding: 0 16px 10px 16px;
+    color: #999999;
+    font-size: 12px;
+  }
+  .content-wrapper {
+    margin: 0 16px;
+    padding: 16px 0 12px 0;
+
+    word-wrap: break-word;
+    .file-wrapper {
+      position: relative;
+      width: 50%;
+
+      .msg-image {
+        width: 100%;
+      }
+      .video-msg-wrapper {
+        box-sizing: border-box;
+        max-width: 360rpx;
+      }
+      .video-play-button {
+        width: 50px;
+        height: 50px;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        background-color: rgba(0, 0, 0, 0.5);
+        border-radius: 50%;
+        z-index: 9;
+      }
+      .video-play-icon {
+        width: 0;
+        height: 0;
+        border-top: 10px solid transparent;
+        border-bottom: 10px solid transparent;
+        border-left: 18px solid #fff;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-40%, -50%);
+      }
+      .audio-wrapper {
+        opacity: 1;
+        width: fit-content;
+        background: #d6e5f6;
+        overflow: hidden;
+        padding: 10px 12px;
+        border-radius: 0 8px 8px 8px;
+        background-color: #e8eaed;
+      }
+    }
+    .extra {
+      width: 100%;
+      position: relative;
+      right: 8px;
+    }
+  }
+}
+</style>
diff --git a/im-uniapp-ui/src/pages/user-card/my/collection-list.vue b/im-uniapp-ui/src/pages/user-card/my/collection-list.vue
new file mode 100644
index 0000000..980733f
--- /dev/null
+++ b/im-uniapp-ui/src/pages/user-card/my/collection-list.vue
@@ -0,0 +1,140 @@
+<template>
+  <div :class="`wrapper ${collectionList.length === 0 ? 'bg-white' : ''}`">
+    <NavBar :title="t('collectionText')">
+      <template v-slot:left>
+        <div class="nav-bar-text" @tap="back">{{ t('collectionText') }}</div>
+      </template>
+    </NavBar>
+    <div class="collection-card-item-wrapper">
+      <Empty
+        v-if="collectionList.length === 0"
+        :text="t('noCollectionsText')"
+      />
+
+      <div
+        v-else
+        v-for="(item, index) in collectionList"
+        :key="item.collectionId"
+      >
+        <CollectionCard
+          :data="item"
+          :index="index"
+          :key="item.collectionId"
+          :handleRemoveCollection="handleRemoveCollection(item)"
+        >
+        </CollectionCard>
+      </div>
+      <div
+        v-show="collectionList.length !== 0 && !noMore"
+        @click="onLoadMore"
+        class="view-more-text"
+      >
+        {{ t('viewMoreText') }}
+      </div>
+      <view class="msg-tip" v-show="collectionList.length !== 0 && noMore">{{
+        t('noMoreText')
+      }}</view>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { onLoad } from '@dcloudio/uni-app'
+import { ref, onUnmounted } from '../../../utils/transformVue'
+import Icon from '../../../components/Icon.vue'
+import NavBar from '../../../components/NavBar.vue'
+import CollectionCard from '../my/collection-card.vue'
+import { t } from '../../../utils/i18n'
+
+import Empty from '../../../components/Empty.vue'
+
+let collectionList = ref([])
+let noMore = ref(false)
+
+onLoad(() => {
+  uni.$UIKitStore.msgStore.getCollectionListByOptionActive({}).then((data) => {
+    collectionList.value = data
+  })
+})
+
+const handleRemoveCollection = (collection) => {
+  return () => {
+    return uni.$UIKitStore.msgStore
+      .removeCollectionsActive([collection])
+      .then(() => {
+        const list = collectionList.value
+        const index = list.findIndex((item) => item === collection)
+        list.splice(index, 1)
+      })
+      .catch((err: any) => {
+        if (err?.code && typeof t(`${err.code}`) !== 'undefined') {
+          uni.showToast({
+            title: t(`${err.code}`),
+            icon: 'error',
+            duration: 1000,
+          })
+        } else {
+          uni.showToast({
+            title: t('deleteCollectionFailedText'),
+            icon: 'error',
+            duration: 1000,
+          })
+        }
+      })
+  }
+}
+
+const onLoadMore = () => {
+  let length = collectionList.value.length
+  const anchorCollection = collectionList.value[length - 1]
+
+  uni.$UIKitStore.msgStore
+    .getCollectionListByOptionActive({
+      anchorCollection, // 锚点
+      direction: 0, // 从大到小
+    })
+    .then((data) => {
+      if (!data.length) {
+        noMore.value = true
+        return
+      }
+      collectionList.value = collectionList.value.concat(data)
+    })
+}
+onUnmounted(() => {})
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/common.scss';
+
+page {
+  padding-top: var(--status-bar-height);
+  background-color: rgb(245, 246, 247);
+}
+
+.wrapper {
+  width: 100%;
+  box-sizing: border-box;
+  padding-bottom: 30px;
+  background-color: rgb(245, 246, 247);
+  min-height: 100vh;
+  .nav-bar-text {
+    color: rgb(20, 146, 209);
+  }
+  .view-more-text {
+    text-align: center;
+    color: #b3b7bc;
+    font-size: 15px;
+    margin-top: 20px;
+  }
+  .msg-tip {
+    text-align: center;
+    color: #b3b7bc;
+    font-size: 12px;
+    margin-top: 10px;
+  }
+}
+.bg-white {
+  background: #fff;
+}
+</style>
diff --git a/im-uniapp-ui/src/pages/user-card/my/index.vue b/im-uniapp-ui/src/pages/user-card/my/index.vue
index 2239865..ddc5387 100644
--- a/im-uniapp-ui/src/pages/user-card/my/index.vue
+++ b/im-uniapp-ui/src/pages/user-card/my/index.vue
@@ -9,18 +9,26 @@
     </div>
     <div class="box-shadow"></div>
     <div class="userInfo-item-wrapper">
-      <div class="userInfo-item" @click="gotoAbout">
+      <div class="userInfo-item" @click="gotoSetting">
         <div class="item-left">
-          <Icon iconClassName="guanyu" type="icon-guanyu"></Icon>
-          {{ t('commsEaseText') }}
+          <Icon iconClassName="guanyu" type="icon-shezhi1"></Icon>
+          {{ t('setText') }}
         </div>
         <Icon iconClassName="icon-arrow" type="icon-jiantou"></Icon>
       </div>
       <div class="shadow"></div>
-      <div class="userInfo-item" @click="gotoSetting">
+      <div class="userInfo-item" @click="gotoCollection">
         <div class="item-left">
-          <Icon iconClassName="guanyu" type="icon-shezhi1"></Icon>
-          {{ t('setText') }}
+          <Icon iconClassName="guanyu" type="blue-collection"></Icon>
+          {{ t('collectionText') }}
+        </div>
+        <Icon iconClassName="icon-arrow" type="icon-jiantou"></Icon>
+      </div>
+      <div class="shadow"></div>
+      <div class="userInfo-item" @click="gotoAbout">
+        <div class="item-left">
+          <Icon iconClassName="guanyu" type="icon-guanyu"></Icon>
+          {{ t('commsEaseText') }}
         </div>
         <Icon iconClassName="icon-arrow" type="icon-jiantou"></Icon>
       </div>
@@ -65,6 +73,11 @@ const gotoAbout = () => {
     url: '/pages/user-card/my/about',
   })
 }
+const gotoCollection = () => {
+  customNavigateTo({
+    url: '/pages/user-card/my/collection-list',
+  })
+}
 
 const navigatorToMyDetail = () => {
   customNavigateTo({
diff --git a/im-uniapp-ui/src/static/add-collection.png b/im-uniapp-ui/src/static/add-collection.png
new file mode 100644
index 0000000..2172087
Binary files /dev/null and b/im-uniapp-ui/src/static/add-collection.png differ
diff --git a/im-uniapp-ui/src/static/pin.png b/im-uniapp-ui/src/static/pin.png
new file mode 100644
index 0000000..f38d87b
Binary files /dev/null and b/im-uniapp-ui/src/static/pin.png differ
diff --git a/im-uniapp-ui/src/utils/constants.ts b/im-uniapp-ui/src/utils/constants.ts
index d6c203e..52ce773 100644
--- a/im-uniapp-ui/src/utils/constants.ts
+++ b/im-uniapp-ui/src/utils/constants.ts
@@ -1,4 +1,3 @@
-import { V2NIMMessageType } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK/V2NIMMessageService'
 import { t } from './i18n'
 import { V2NIMConst } from 'nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK'
 
@@ -87,3 +86,5 @@ export const g2StatusMap: any = {
   4: t('callTimeoutText'),
   5: t('callBusyText'),
 }
+
+export const msgRecallTime = 2 * 60 * 1000
diff --git a/im-uniapp-ui/yarn.lock b/im-uniapp-ui/yarn.lock
index 3ea6ad7..ffb304c 100644
--- a/im-uniapp-ui/yarn.lock
+++ b/im-uniapp-ui/yarn.lock
@@ -2809,10 +2809,10 @@
     "@webassemblyjs/ast" "1.11.6"
     "@xtuc/long" "4.2.2"
 
-"@xkit-yx/im-store-v2@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/@xkit-yx/im-store-v2/-/im-store-v2-0.3.0.tgz"
-  integrity sha512-y41wtbpApCQs8UnIDlyE8Zv7j0qhjfl+SVsqygt9sclHErXfLV4U3CUStySkURNh0gYyo4ZLYMEKRSZMptWxzw==
+"@xkit-yx/im-store-v2@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.npmjs.org/@xkit-yx/im-store-v2/-/im-store-v2-0.4.0.tgz"
+  integrity sha512-XWJfOZ3ECp6ixlck3CB+alICC4zT1oYrIl4R1saPYv0ou0g6VtlZY1NE7hMi/X/G/6aWR8VC/eBfAXjZBy8Z0g==
   dependencies:
     "@xkit-yx/utils" "^0.7.1"
     mobx "^6.6.1"
@@ -3766,7 +3766,7 @@ esbuild@^0.17.5:
     "@esbuild/win32-ia32" "0.17.19"
     "@esbuild/win32-x64" "0.17.19"
 
-esbuild@^0.20.1:
+esbuild@^0.20.1, esbuild@^0.20.2:
   version "0.20.2"
   resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz"
   integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 4ea6117..0000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "nim-uikit-uniapp",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}