diff --git a/common/baseStyle.scss b/common/baseStyle.scss
index 4dfbda40875255523262dd7eac90db1f444cdee6..4b770549e135530540cf1d8572b496d687395838 100644
--- a/common/baseStyle.scss
+++ b/common/baseStyle.scss
@@ -1,6 +1,7 @@
 /* #ifdef H5 */
 ::v-deep {
 /* #endif */
+  #app,
   page,
   view,
   label
@@ -34,7 +35,6 @@
   text,
   textarea,
   video {
-    position: relative;
     box-sizing: border-box;
   }
 
diff --git a/common/config.js b/common/config.js
index 0650fabec0167cab703c923f379c71b3c7c323c9..39243b12518b8dc87043fb596f688fe5d9600d18 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,4 +1,9 @@
 export default {
+  // 云存储服务商
+  cloudFile:{
+    // 云存储服务商，支持：aliyun、tencent、qiniu
+    provider: 'qiniu', 
+  },
   uniPush: {
     // 消息渠道设置，避免被限量推送、静默推送（静音且需下拉系统通知栏才可见通知内容）详情文档：https://doc.dcloud.net.cn/uniCloud/uni-cloud-push/api.html#channel
     channel:{
@@ -7,5 +12,7 @@ export default {
       // 消息渠道描述，会显示在手机系统关于当前应用的通知设置中
       desc: "客服消息"
     }
-  }
+  },
+  // web端绑定的域名，用于生成二维码等
+  domain: 'https://im.dcloud.net.cn',
 }
\ No newline at end of file
diff --git a/components/uni-im-chat-input/uni-im-chat-input.vue b/components/uni-im-chat-input/uni-im-chat-input.vue
index 3d4b5df044d1e9efeeed5c1e6c9b97b03f1cefee..a6dd13e102f5f6e818ee08180c41bb755fda1aa0 100644
--- a/components/uni-im-chat-input/uni-im-chat-input.vue
+++ b/components/uni-im-chat-input/uni-im-chat-input.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <view class="uni-im-chat-input" :style="{height:chatInputBoxHeight}">
     <view id="drag-line"></view>
     <view class="top-menu">
@@ -9,7 +9,9 @@
       ></uni-im-icons>
       <!-- #ifdef H5 -->
       <view v-for="(item,index) in extToolBar" :key="index" class="item">
-        <component :is="item.component" v-bind="item.props" @sendCodeMsg="sendCodeMsg" ></component>
+        <component :is="item.component" v-bind="item.props" @sendCodeMsg="sendCodeMsg" 
+          @showMenberList="showMenberList"
+        ></component>
       </view>
       <!-- #endif -->
     </view>
@@ -26,7 +28,7 @@
       <view class="editor-box-parent">
         <view class="editor-box">
           <uni-im-sound v-show="soundIsShow" @sendSoundMsg="sendSoundMsg" class="uni-im-sound"></uni-im-sound>
-          <uni-im-editor v-show="!soundIsShow" @input="oninput" @confirm="confirm" @change="updateModelValue" class="editor" ref="editor"></uni-im-editor>
+          <uni-im-editor @touchmove.stop v-show="!soundIsShow" @input="oninput" @confirm="confirm" @change="updateModelValue" class="editor" ref="editor"></uni-im-editor>
         </view>
         <slot name="about-msg"></slot>
       </view>
@@ -61,17 +63,17 @@
       <text class="send-btn-tip">↵ 发送 / shift + ↵ 换行</text>
       <button @click="confirm" :disabled="!canSend" class="send" type="primary">发送</button>
     </view>
-  </view>
-</template>
-
-<script>
+  </view>
+</template>
+
+<script>
   import uniIm from '@/uni_modules/uni-im/sdk/index.js';
-  import {markRaw} from "vue";
+  import {markRaw} from "vue";
   import emojiCodes from './emojiCodes.js';
-  let currentModelValue = '';
-  export default {
+  let currentModelValue = '';
+  export default {
     name: 'uni-im-chat-input',
-    emits: ["showAboutMenber","update:modelValue","confirm","input","sendSoundMsg","sendCodeMsg"],
+    emits: ["update:modelValue","confirm","input","sendSoundMsg","sendCodeMsg","showMenberList"],
     data() {
       return {
         bHeight:uniIm.systemInfo.safeAreaInsets.bottom/2,
@@ -105,18 +107,22 @@
       extToolBar(){
         // 调用扩展点，扩展程序可以在消息输入框新增一个工具类的项
         const currentConversationId = uniIm.currentConversationId
-        return uniIm.extensions
-          .invokeExts("input-msg-tool-bar",uniIm.conversation.getCached(currentConversationId))
-          .filter((result) => result && result.component)
-          .map((result) => {
-            return {
-              component: markRaw(result.component),
-              props: result.props||{}
-            };
-          });
+        if (currentConversationId) {
+          return uniIm.extensions
+            .invokeExts("input-msg-tool-bar",uniIm.conversation.find(currentConversationId))
+            .filter((result) => result && result.component)
+            .map((result) => {
+              return {
+                component: markRaw(result.component),
+                props: result.props||{}
+              };
+            });
+        }else{
+          return []
+        }
       }
       // #endif
-    },
+    },
     props: {
       modelValue: {
         type: [String, Object],
@@ -130,7 +136,7 @@
         type: Number,
         default: 0
       }
-    },
+    },
     mounted() {
       currentModelValue = this.modelValue;
       // #ifdef H5
@@ -169,21 +175,20 @@
         });
       }
       // #endif
-      
-      
-    },
+    },
     watch: {
       modelValue:{
         handler(modelValue,oldValue) {
           // console.log('###modelValue', modelValue,JSON.stringify(currentModelValue) != JSON.stringify(modelValue) );
           if(JSON.stringify(currentModelValue) != JSON.stringify(modelValue) ) {
-            this.setContent(modelValue?.html || modelValue)
+            const {html} = modelValue
+            this.setContent(html?{html}:modelValue)
           }
         },
         deep: true,
         immediate: true
       }
-    },
+    },
     methods: {
       sendSoundMsg(e) {
         this.$emit('sendSoundMsg',e)
@@ -191,11 +196,11 @@
       sendCodeMsg(e) {
         this.$emit('sendCodeMsg',e)
       },
+      showMenberList(e) {
+        this.$emit('showMenberList',e)
+      },
       oninput(e) {
         currentModelValue = e.value;
-        if(e.data == '@') {
-          this.$emit('showAboutMenber')
-        }
         this.$emit('update:modelValue', e.value)
         this.$emit('input',e)
       },
@@ -247,7 +252,7 @@
         this.$refs.editor.callRmd('$addHtmlToCursor',html,focus)
       },
       setContent(content) {
-        console.log('setContent', content);
+        // console.log('setContent', content);
         this.$refs.editor.callRmd('$setContent',content)
         // this.$emit('update:modelValue', content)
       },
@@ -280,10 +285,10 @@
         console.log('confirm');
         this.$emit('confirm');
       }
-    }
-  }
-</script>
-
+    }
+  }
+</script>
+
 <style lang="scss">
 .uni-im-chat-input {
   padding:0 5px;
@@ -414,7 +419,7 @@
     flex-direction: column;
     #drag-line {
       // 鼠标变上下拖动的光标
-      cursor: ns-resize;
+      cursor: row-resize;
       height: 5px;
       position: absolute;
       left: 0;
@@ -476,5 +481,5 @@
   }
   
 }
-/* #endif */
+/* #endif */
 </style>
\ No newline at end of file
diff --git a/components/uni-im-choose-user/uni-im-choose-user.vue b/components/uni-im-choose-user/uni-im-choose-user.vue
new file mode 100644
index 0000000000000000000000000000000000000000..17eea34cd930c3207406a8cb1215d7c3d6be6f18
--- /dev/null
+++ b/components/uni-im-choose-user/uni-im-choose-user.vue
@@ -0,0 +1,126 @@
+<template>
+  <view class="user-list">
+    <text class="title" v-if="title">{{title}}：</text>
+    <view class="item" v-for="(user,index) in userList" :key="index">
+      <uni-im-img class="avatar" width="20" height="20" borderRadius="100%"
+        :src="user?.avatar_file?.url || '/uni_modules/uni-im/static/avatarUrl.png'"></uni-im-img>
+      <text class="nickname">{{user.nickname}}</text>
+      <uni-im-icons class="delete" @click="deleteItem(index)" code="e61a" color="#888" size="10px"></uni-im-icons>
+    </view>
+    <view class="add-icon" v-if="multiple || userList.length === 0">
+      <uni-icons @click="showMemberList" color="#aaa" size="16px" type="plusempty"></uni-icons>
+    </view>
+    <uni-im-member-list ref="member-list" :conversationId="conversationId" :memberListData="memberListData"></uni-im-member-list>
+  </view>
+</template>
+
+<script>
+  import uniIm from '@/uni_modules/uni-im/sdk/index.js';
+  export default {
+    emits: ['update:modelValue'],
+    props: {
+      modelValue: {
+        type: Array,
+        default: []
+      },
+      filterUids: {
+        type: [Array,null],
+        default: null
+      },
+      conversationId: {
+        default: '',
+      },
+      memberListData: {
+        type: [Array,null],
+        default: null
+      },
+      title: {
+        type: [String,null],
+        default: null
+      },
+      multiple: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+        
+      }
+    },
+    computed: {
+      userList() {
+        return uniIm.users.find(this.modelValue)
+      }
+    },
+    methods: {
+      deleteItem(index) {
+        this.$emit('update:modelValue', this.modelValue.filter((_, i) => i !== index))
+      },
+      showMemberList() {
+        this.$refs['member-list'].show({
+          title: '添加话题成员',
+          forceShowSearch: true,
+          filter: member => !(this.filterUids || this.modelValue).includes(member.users._id),
+          confirm: (uid) => {
+            console.log('uid--showMenberList-*', uid)
+            this.$emit('update:modelValue', this.modelValue.concat(uid))
+          }
+        })
+      },
+    }
+  }
+</script>
+
+<style lang="scss">
+.user-list {
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+
+  .title {
+    font-size: 14px;
+    color: #555;
+    font-weight: unset;
+  }
+
+  .item {
+    font-size: 14px;
+    padding: 0 3px;
+    margin-left: 6px;
+    margin-top: 5px;
+    border: 1px solid #eee;
+    border-radius: 5px;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+
+    .avatar {
+      margin-right: 5px;
+    }
+
+    .nickname {
+      color: #333;
+    }
+
+    .delete {
+      margin: 0 5px;
+      opacity: 0.7;
+
+      &:hover {
+        opacity: 1;
+      }
+    }
+
+    height: 26px;
+  }
+  .add-icon {
+    cursor: pointer;
+    border: 1px #aaa dashed;
+    height: 26px;
+    width: 26px;
+    justify-content: center;
+    margin-left: 10px;
+  }
+}
+</style>
diff --git a/components/uni-im-conversation-list/changeMute.js b/components/uni-im-conversation-list/changeMute.js
deleted file mode 100644
index a9164894e544f295d1d5d91af4b04b2b5c6cebcc..0000000000000000000000000000000000000000
--- a/components/uni-im-conversation-list/changeMute.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export default function changeMute(conversation) {
-  conversation.mute = !conversation.mute
-  const db = uniCloud.database();
-  db.collection('uni-im-conversation')
-    .doc(conversation._id)
-    .update({
-      "mute": conversation.mute
-    })
-    .then((e) => {
-      console.log('updated 消息免打扰设置', e.result.updated, conversation._id)
-    })
-    .catch(() => {
-      uni.showToast({
-        title: '服务端错误，消息免打扰设置失败，请稍后重试',
-        icon: 'none'
-      });
-      conversation.mute = !conversation.mute
-    })
-}
diff --git a/components/uni-im-conversation-list/uni-im-conversation-list.vue b/components/uni-im-conversation-list/uni-im-conversation-list.vue
index a551dd45d78ea3f608cde3c0ba075f9433f5018c..15c31d5f03da83a742536430e1dea5e780645145 100644
--- a/components/uni-im-conversation-list/uni-im-conversation-list.vue
+++ b/components/uni-im-conversation-list/uni-im-conversation-list.vue
@@ -1,39 +1,45 @@
 <template>
 <view class="uni-im-conversation-list">
+  <view class="conversation-type">
+    <view class="item" v-for="item in conversation.typeList" :key="item.value" @click="changeType(item.value)" :class="{'active':activeTypeId === item.value}">
+      {{item.title}}
+    </view>
+  </view>
   <scroll-view
     ref="conversation-list"
     class="conversation-list"
     :class="{canCheck}"
-    :style="{'background-color': conversationList.length?'#FFF':''}"
     :scroll-top="listScrollTop"
     scroll-y="true"
-    @scrolltolower="loadMore()"
+    @scrolltolower="conversation.loading ? '' : loadMore()"
     @scroll="onScroll"
   >
-    <uni-im-conversation v-for="(item,index) in conversationList" :key="item.id"
+    <view v-for="(item,index) in conversationList" :key="item.id"
       class="conversation-list-item" :class="{'activeConversation':activeConversationId == item.id,'focus':focusConversationId === item.id}"
-      :conversation="item" :id="item.id"
-      @click="clickItem(item)" @contextmenu.prevent="openConversationMenu($event,index)"
-      @longpress="onScroll.isScrolling?'':openConversationMenu($event,index)"
     >
-      <template v-if="canCheck" #left>
-        <view style="justify-content: center;">
-          <view class="check-box" :class="{checked:isCheck(item)}">
-            <uni-icons
-              v-if="isCheck(item)"
-              color="#FFF"
-              type="checkmarkempty"
-            />
+      <uni-im-conversation
+        :conversation="item" :id="item.id"
+        @click="clickItem(item)" @contextmenu.prevent="openConversationMenu($event,index)"
+        @longpress="onScroll.isScrolling?'':openConversationMenu($event,index)"
+      >
+        <template v-if="canCheck" #left>
+          <view style="justify-content: center;">
+            <view class="check-box" :class="{checked:isCheck(item)}">
+              <uni-icons
+                v-if="isCheck(item)"
+                color="#FFF"
+                type="checkmarkempty"
+              />
+            </view>
           </view>
-        </view>
-      </template>
-    </uni-im-conversation>
-
+        </template>
+      </uni-im-conversation>
+    </view>
     <view style="margin-top: 5px;backgroundColor:'#f5f5f5'">
       <template v-if="!keyword">
         <uni-im-load-state
           :content-text="loadMoreContentText"
-          :status="conversationHasMore?'loading':'noMore'"
+          :status="conversation.hasMore?'loading':'noMore'"
         />
       </template>
       <text v-else-if="conversationList.length === 0"
@@ -52,7 +58,7 @@ import uniIm from '@/uni_modules/uni-im/sdk/index.js';
 const db = uniCloud.database();
 let currentScrollTop = 0;
 export default {
-  emits: ['change', 'clickItem', 'onScroll'],
+  emits: ['change', 'clickItem', 'onScroll', 'update:checkedList'],
   props: {
     keyword: {
       type: String,
@@ -74,13 +80,12 @@ export default {
   data() {
     return {
       listScrollTop: 0,
-      focusConversationId: ''
+      focusConversationId: '',
+      activeTypeId: 'all'
     }
   },
   computed: {
-    conversationHasMore() {
-      return uniIm.conversation.hasMore
-    },
+    conversation:()=>uniIm.conversation,
     loadMoreContentText() {
       return {
         contentrefresh: "正在加载...",
@@ -88,11 +93,31 @@ export default {
       }
     },
     conversationList() {
-      return uniIm.conversation.dataList
+      const conversationList = uniIm.conversation.dataList
         // #ifdef H5
         .filter(i => i.title.toLowerCase().includes(this.keyword.toLowerCase()))
         // #endif
         .filter(i => !i.hidden)
+        .filter(conversation=>{
+          if(typeof this.activeTypeId === 'object' && Object.keys(this.activeTypeId)[0] === 'group_type'){
+            return conversation.group?.type === this.activeTypeId.group_type
+          }else{
+            const action = {
+              all:()=>true,
+              unread:()=>conversation.unread_count > 0 || this.oldUnreadCid?.includes(conversation.id),
+              group:()=>conversation.group_id,
+              single:()=>!conversation.group_id,
+              is_star:()=>conversation.is_star
+            }
+            return action[this.activeTypeId]?.()
+          }
+        })
+        if(this.activeTypeId === 'unread'){
+          this.oldUnreadCid = conversationList?.map(i=>i.id)
+        }else{
+          this.oldUnreadCid = []
+        }
+        return conversationList
     }
   },
   watch: {
@@ -108,7 +133,7 @@ export default {
       // 重试次数
       let tryIndex = 0
       const scrollToCurrentConversation = () => {
-        if (tryIndex > 5) {
+        if (!activeConversationId || tryIndex > 5) {
           return
         }
         const query = uni.createSelectorQuery().in(this);
@@ -132,12 +157,38 @@ export default {
           })
         }).exec()
       }
-      scrollToCurrentConversation()
+      setTimeout(() => {
+        scrollToCurrentConversation()
+      },300)
       // #endif
     }
   },
-  mounted() {},
+  async mounted() {
+    // 监听鼠标移入conversation-type 后滚动事件，并设置滚动条位置
+    // #ifdef H5
+    const tagBox = this.$el.querySelector('.conversation-type')
+    function scrollFunc(e) {
+      tagBox.scrollLeft += e.deltaY/5
+    }
+    tagBox.addEventListener('mouseover', (e) => {
+      tagBox.addEventListener('wheel', scrollFunc)
+    })
+    tagBox.addEventListener('mouseout', (e) => {
+      tagBox.removeEventListener('wheel', scrollFunc)
+    })
+    // #endif
+  },
   methods: {
+    changeType(tagId){
+      this.activeTypeId = tagId
+      uniIm.conversation.hasMore = true
+      uniIm.conversation.loadMore.type = tagId
+      this.listScrollTop = ''
+      this.$nextTick(()=>{
+        this.listScrollTop = 0
+      })
+      this.loadMore()
+    },
     onScroll(e) {
       currentScrollTop = e.detail.scrollTop
       this.$emit('onScroll', e)
@@ -204,6 +255,12 @@ export default {
                           conversation.setUnreadCount(conversation.unread_count ? 0 : 1)
                         }
                       },
+                      {
+                        "title": (conversation.is_star ? "取消" : "设为") + "星标",
+                        "action": () => {
+                          conversation.changeIsStar()
+                        }
+                      },
                       {
                         "title": conversation.mute ? "允许消息通知" : "消息免打扰",
                         "action": () => {
@@ -245,8 +302,35 @@ export default {
 
 <style lang="scss">
   .uni-im-conversation-list{
-    &,.conversation-list{
-      height: 100%;
+    height: 0;
+    flex: 1;
+    overflow: hidden;
+    /* #ifdef MP-WEIXIN */
+    height: 100%;
+    /* #endif */
+    .conversation-type {
+      margin: 0 10px;
+      flex-direction: row;
+      overflow: scroll;
+      // 滚动条样式，高度设置
+      &::-webkit-scrollbar {
+        width: 0;
+        height: 0;
+      }
+      .item {
+        color: #333;
+        text-align: center;
+        padding: 5px 0;
+        margin:0 15px;
+        cursor: pointer;
+        &.active {
+          color: #1ab94e;
+          border-bottom: 2px solid #1ab94e;
+        }
+      }
+    }
+    .conversation-list{
+      height:0;
       flex: 1;
     }
     .tip {
@@ -264,16 +348,18 @@ export default {
       }
     }
     
-    .conversation-list .conversation-list-item.focus {
-      border: 2px solid #1ab94e;
-    }
-    
-    .conversation-list .conversation-list-item {
-      border-radius: 5px;
-    }
-    
-    .conversation-list .conversation-list-item.activeConversation {
-      background-color: #f1f1f1;
+    .conversation-list {
+      .conversation-list-item {
+        border-radius: 5px;
+        overflow: hidden;
+        &.focus 
+        {
+          border: 2px solid #1ab94e;
+        }
+        &.activeConversation {
+          background-color: #f1f1f1;
+        }
+      }
     }
     
     .check-box {
diff --git a/components/uni-im-conversation/uni-im-conversation.vue b/components/uni-im-conversation/uni-im-conversation.vue
index 18afcb35cbff7222a4a19a673b4225b18dec5938..b17f1c3c94e64a9b09c2ada3efb519c4da191c38 100644
--- a/components/uni-im-conversation/uni-im-conversation.vue
+++ b/components/uni-im-conversation/uni-im-conversation.vue
@@ -4,13 +4,14 @@
     @click="handleClick"
     :title="conversation.title"
     :note="conversation.note"
-    :red-note="conversation.hasDraft?'[草稿]&nbsp;':''"
+    :red-note="redNote"
     :tags="conversation.tags"
     :avatarUrl="avatarUrl"
     :time="friendlyTime"
     :badge="conversation.unread_count"
     :mute="conversation.mute"
     :pinned="conversation.pinned"
+    :is_star="conversation.is_star"
     link
   >
     <template #left>
@@ -39,6 +40,14 @@
     },
     emits: ['click'],
     computed: {
+      redNote() {
+        if (this.conversation.hasDraft){
+          return '[草稿]'
+        }else if (this.conversation.call_list.length){
+          return '[@我]'
+        }
+        return ''
+      },
       friendlyTime() {
         // 使得时间会随着心跳动态更新
         let timestamp = this.conversation.time + uniIm.heartbeat * 0
diff --git a/components/uni-im-editor/uni-im-editor.vue b/components/uni-im-editor/uni-im-editor.vue
index ba70e21f2a9fb449b48df91e7e364488e3e4e224..ec7037bba8f9ea4b040f079aa76c48c339c42004 100644
--- a/components/uni-im-editor/uni-im-editor.vue
+++ b/components/uni-im-editor/uni-im-editor.vue
@@ -20,8 +20,8 @@
   import uniIm from '@/uni_modules/uni-im/sdk/index.js';
   export default {
     emits: ["input", "confirm", "change"],
-    data() {
-      return {
+    data() {
+      return {
         callRmdParam: [],
         // #ifdef MP
         "textareaValue":this.modelValue,
@@ -139,116 +139,135 @@
         }
       });
 
-      uniImEditor.addEventListener('paste', async event => {
-        // console.log('粘贴', event);
-        if (event.clipboardData || event.originalEvent) {
-          //某些chrome版本使用的是event.originalEvent
-          let clipboardData = event.clipboardData || event.originalEvent.clipboardData;
-
-          // 获取粘贴的图片
-          let items = clipboardData.items;
-          for (const item of items) {
-            if (item.type.indexOf("image") !== -1) {
-              event.preventDefault();
+      uniImEditor.addEventListener('paste', async event => {
+        // 阻止默认行为
+        event.preventDefault();
+        
+        // 删除选中的文本
+        const selection = window.getSelection();
+        if (!selection.isCollapsed) {  // console.log('选中文本', selection.toString());
+          const range = selection.getRangeAt(0);
+          range.deleteContents();
+          selection.removeAllRanges();
+        }
+        
+        //某些chrome版本使用的是event.originalEvent
+        const clipboardData = event.clipboardData || event.originalEvent?.clipboardData;
+        let htmlString = clipboardData.getData('text/html');
+        console.log('paste',{htmlString});
+        if (htmlString) {
+          // 获取html字符串
+          htmlString = await filterHTML(htmlString);
+          console.log('htmlString222', htmlString);
+          const tmpDom = document.createElement('div');
+          tmpDom.innerHTML = htmlString;
+          if (tmpDom.innerText.length > 50000) {
+            uni.showModal({
+              content: '你粘贴的文本长度超过50000，将被截断。',
+              complete: e => {
+                if (e.confirm) {
+                  this.$addHtmlToCursor(htmlString.substring(0, 50000))
+                }
+              }
+            });
+          } else {
+            this.$addHtmlToCursor(htmlString)
+          }
+          // 检查图片加载失败，删除图片
+          const imgs = uniImEditor.querySelectorAll('img');
+          for (const img of imgs) {
+            img.onerror = () => {
+              img.remove();
+            }
+          }
+        } else {
+          // 获取文件
+          let items = clipboardData.items;
+          for (const item of items) {
+            if (item.type.indexOf("image") !== -1) {
               const file = item.getAsFile();
               const blobUrl = URL.createObjectURL(file)
               console.log('blobUrl',blobUrl)
               this.$addHtmlToCursor(`<img src="${blobUrl}" />`)
-            }
-          }
-
-          let htmlString = clipboardData.getData('text/html');
-          // console.log('htmlString111',htmlString);
-          if (htmlString) {
-            event.preventDefault();
-            htmlString = await filterHTML(htmlString);
-            // console.log('htmlString222', htmlString);
-
-            const tmpDom = document.createElement('div');
-            tmpDom.innerHTML = htmlString;
-            if (tmpDom.innerText.length > 50000) {
-              uni.showModal({
-                content: '你粘贴的文本长度超过50000，将被截断。',
-                complete: e => {
-                  if (e.confirm) {
-                    this.$addHtmlToCursor(htmlString.substring(0, 50000))
-                  }
-                }
-              });
-            } else {
-              this.$addHtmlToCursor(htmlString)
-            }
-            // 检查图片加载失败，删除图片
-            const imgs = uniImEditor.querySelectorAll('img');
-            for (const img of imgs) {
-              img.onerror = () => {
-                img.remove();
-              }
-            }
-          } else {
-            let text = clipboardData.getData('text');
-            try {
-              let obj = JSON.parse(text)
-              this.$addHtmlToCursor(this.$arrDomJsonToHtml(obj['uni-im-rich-text-data']))
-            } catch (e) {
-              this.$addHtmlToCursor(text)
-            }
-            event.preventDefault();
-          }
-        }
+            }
+          }
+          // 获取文本
+          const clipboardDataText = clipboardData.getData('text');
+          if (clipboardDataText) {
+            this.$addHtmlToCursor(clipboardDataText)
+          }
+        }
       })
 
       async function filterHTML(htmlString) {
         // 过滤html字符串，只保留：文字，图片，链接
         // html字符串转dom对象，并深度遍历
-        let div = document.createElement('div');
-        div.innerHTML = htmlString;
+        let tmpDiv = document.createElement('div');
+        tmpDiv.innerHTML = htmlString;
         let arr = [];
-        async function deep(node) {
-          if (node.nodeType === 1) {
-            if (node.tagName === 'IMG') {
-              // 只保留src属性
-              // 处理图片跨域问题
-              if (node.src.indexOf('blob:http') != 0 && !node.src.includes(
-                  'https://im-res.dcloud.net.cn')) {
-                const uniImCo = uniCloud.importObject("uni-im-co", {
-                  loadingOptions: { // loading相关配置
-                    title: '处理跨域图片...',
-                    mask: true
-                  }
-                })
-                let res = await uniImCo.getImgBase64(node.src)
-                function base64ToBlob(base64) {
-                  // 将Base64字符串分割为数据和应用信息
-                  const byteChars = atob(base64.split(',')[1]);
-                  // 创建一个长度为byteChars长度的数组
-                  const byteArrays = new Array(byteChars.length);
-                  // 将二进制字符串转换为Uint8Array
-                  for (let i = 0; i < byteChars.length; i++) {
-                    byteArrays[i] = byteChars.charCodeAt(i);
+        await deepTr(tmpDiv);
+        // 销毁tmpDiv
+        tmpDiv = null;
+        return arr.join('');
+        async function deepTr(node) {
+          // console.log('node', node);
+          if (node.nodeType === 1) {
+            const action = {
+              async IMG(){
+                // 只保留src属性
+                // 处理图片跨域问题
+                if (node.src.indexOf('blob:http') != 0 && !node.src.includes('https://im-res.dcloud.net.cn')) {
+                  const uniImCo = uniCloud.importObject("uni-im-co", {
+                    loadingOptions: { // loading相关配置
+                      title: '处理跨域图片...',
+                      mask: true
+                    }
+                  })
+                  let res = await uniImCo.getImgBase64(node.src)
+                  function base64ToBlob(base64) {
+                    // 将Base64字符串分割为数据和应用信息
+                    const byteChars = atob(base64.split(',')[1]);
+                    // 创建一个长度为byteChars长度的数组
+                    const byteArrays = new Array(byteChars.length);
+                    // 将二进制字符串转换为Uint8Array
+                    for (let i = 0; i < byteChars.length; i++) {
+                      byteArrays[i] = byteChars.charCodeAt(i);
+                    }
+                    // 返回一个Blob对象
+                    return new Blob([new Uint8Array(byteArrays)], {type: 'image/png'});
                   }
-                  // 返回一个Blob对象
-                  return new Blob([new Uint8Array(byteArrays)], {type: 'image/png'});
+                  node.src = URL.createObjectURL( base64ToBlob(res.data) )
                 }
-                node.src = URL.createObjectURL( base64ToBlob(res.data) )
-              }
-              arr.push(`<img src="${node.src}" />`);
-            } else if (node.tagName === 'A') {
-              // 只保留href属性
-              arr.push(`<a href="${node.href}">${node.innerText}</a>`);
-            }
-
-            if (node.childNodes.length > 0) {
-              for (let i = 0; i < node.childNodes.length; i++) {
-                await deep(node.childNodes[i]);
-              }
-            }
-          } else if (node.nodeType === 3) {
-            arr.push(node.nodeValue);
-          }
+                arr.push(`<img src="${node.src}" />`);
+              },
+              A(){
+                // 只保留href属性
+                arr.push(`<a href="${node.href}">${node.innerText}</a>`);
+              }
+            }
+            await action[node.tagName]?.();
+            for (let i = 0; i < node.childNodes.length; i++) {
+              await deepTr(node.childNodes[i]);
+            }
+          } else if (node.nodeType === 3) {
+            // 排除非内容的文本节点
+            const tagNameList = ['A','IMG','STYLE','SCRIPT'];
+            if (!tagNameList.includes(node.parentNode.tagName)) {
+              // 把node中的<、>、&转义
+              node.nodeValue = node.nodeValue.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+              arr.push(node.nodeValue.trim());
+              // 如果父节点是需要换行的标签，且当前节点是最后一个节点，则添加换行
+              const tagNameList2 = ['P','DIV','FONT','H1','H2','H3','H4','H5','H6','LI','UL','OL','BR'];
+              if (tagNameList2.includes(node.parentNode.tagName) && node.parentNode.lastChild === node) {
+                arr.push('\n');
+              }
+            }else{
+              // console.log('非内容文本节点', node.parentNode.tagName,node);
+            }
+          }else{
+            // console.log('其他节点', node);
+          }
         }
-        await deep(div);
-        return arr.join('');
       }
       // #endif
     },
@@ -266,7 +285,7 @@
           value
         }
         // #endif
-        // console.error('input',e)
+        // console.error('input',e)
         this.$emit('input', e)
       }
     }
@@ -274,7 +293,7 @@
 </script>
 <!-- #ifndef MP -->
 <script module="rdm" lang="renderjs">
-  let uniImEditor,lastFocusNode,lastCursor;
+  let lastFocusNode,lastCursor;
   // #ifdef APP
   function setSoftinputTemporary() {
       console.log('setSoftinputTemporary')
@@ -289,25 +308,27 @@
   export default {
     name: 'uni-im-editor',
     data() {
-      return {}
-    },
+      return {
+        uniImEditor: null,
+      }
+    },
     mounted() {
-      uniImEditor = document.querySelector('.uni-im-editor')
-      uniImEditor.addEventListener('input', e => {
+      this.uniImEditor = document.querySelector('.uni-im-editor')
+      this.uniImEditor.addEventListener('input', e => {
         setTimeout(()=>this.$oninput(e.data),0);
       });
-      uniImEditor.addEventListener('click', e => {
+      this.uniImEditor.addEventListener('click', e => {
         // console.log('click', e);
         // #ifdef APP
         setSoftinputTemporary()
         // #endif
         setTimeout(this.$refreshLastCursor, 0);
       });
-      uniImEditor.addEventListener('blur', e => {
+      this.uniImEditor.addEventListener('blur', e => {
         // console.error('###blur', e);
       });
       // 键盘敲左右
-      uniImEditor.addEventListener('keydown', e => {
+      this.uniImEditor.addEventListener('keydown', e => {
         setTimeout(this.$refreshLastCursor, 0);
       });
       
@@ -323,7 +344,7 @@
           }
         });
       })
-      .observe(uniImEditor, {
+      .observe(this.uniImEditor, {
         childList: true, // 监听子节点的变化
       });
     },
@@ -332,15 +353,15 @@
         this.$nextTick(() => {
           // console.log('modelValue', modelValue);
           if (modelValue.length === 0) {
-            uniImEditor.innerHTML = ''
+            this.uniImEditor.innerHTML = ''
           } else if (typeof modelValue === 'string' && modelValue != this.$inputText()) {
-            uniImEditor.innerHTML = modelValue
-          } else if (typeof modelValue === 'object' && modelValue.html != uniImEditor.innerHTML) {
-            uniImEditor.innerHTML = modelValue.html
+            this.uniImEditor.innerHTML = modelValue
+          } else if (typeof modelValue === 'object' && modelValue.html != this.uniImEditor.innerHTML) {
+            this.uniImEditor.innerHTML = modelValue.html
           }
         });
       },
-    },
+    },
     methods: {
       // 刷新光标信息
       $refreshLastCursor() {
@@ -352,24 +373,22 @@
         // });
       },
       $oninput(data){
-        
         this.$refreshLastCursor()
-        
         // 耗时计算
         let start = new Date().getTime();
         
         let param = '';
-        let val = uniImEditor.innerHTML;
+        let val = this.uniImEditor.innerHTML;
         
-        const hasImg = uniImEditor.querySelector('img');
-        const hasNickname = uniImEditor.querySelector('.nickname');
-        const hasA = uniImEditor.querySelector('a');
+        const hasImg = this.uniImEditor.querySelector('img');
+        const hasNickname = this.uniImEditor.querySelector('.nickname');
+        const hasA = this.uniImEditor.querySelector('a');
         if (hasImg || hasNickname || hasA) {
           param = {
             // "rich-text": //uniIm.utils.parseHtml( 执行比较消耗内存，改为chat页面 confirm时执行,
             "html": val,
-            "text": uniImEditor.innerText,
-            "aboutUserIds": Array.from(uniImEditor.querySelectorAll('.nickname')).map(i=>i.getAttribute('user_id'))
+            "text": this.uniImEditor.innerText,
+            "aboutUserIds": Array.from(this.uniImEditor.querySelectorAll('.nickname')).map(i=>i.getAttribute('user_id'))
           }
         } else {
           param = this.$inputText()
@@ -411,7 +430,7 @@
         try{
           const range = document.createRange();
           const sel = window.getSelection(); 
-          range.setStart(lastFocusNode || uniImEditor, lastCursor);
+          range.setStart(lastFocusNode || this.uniImEditor, lastCursor);
           range.collapse(true); 
           sel.removeAllRanges(); 
           sel.addRange(range);
@@ -468,12 +487,12 @@
             selection.addRange(range); // 将更新后的范围添加回选择区域
           }
         }else{
-          uniImEditor.innerHTML += html;
+          this.uniImEditor.innerHTML += html;
         }
         this.$oninput(html);
       },
-      $inputText() {
-        return uniImEditor.innerHTML.replace(/<br\s*\/?>/gi, "\n").replace(/<[^>]+>/g, "");
+      $inputText() {
+        return this.uniImEditor.innerText.trim();
       },
       $focus() {
         if(document.activeElement.className === 'uni-im-editor'){
@@ -483,12 +502,12 @@
         setSoftinputTemporary()
         // #endif
         // console.error('获取焦点',document.activeElement.className);
-        uniImEditor.focus();
+        this.uniImEditor.focus();
         // console.error('获取焦点',document.activeElement.className);
       },
       $blur(){
         // console.error('失去焦点1',document.activeElement.className);
-        uniImEditor.blur();
+        this.uniImEditor.blur();
         // console.error('失去焦点2',document.activeElement.className);
         setTimeout(()=>{
           // console.error('失去焦点3',document.activeElement.className);
@@ -505,12 +524,15 @@
         // this.$emit('update:focus', true);
       },
       $setContent(data) {
-        if (typeof data === 'string') {
-          uniImEditor.innerHTML = data
+        if (typeof data === 'string') {
+          // 为兼容旧版- s &gt; 转换为 > $lt; 转换为 < &amp; 转换为 &
+          data = data.replace(/&gt;/g, '>').replace(/&lt;/g, '<').replace(/&amp;/g, '&');
+          // 为兼容旧版- e
+          this.uniImEditor.innerText = data;
           this.$oninput(data);
-        } else {
-          uniImEditor.innerHTML = this.$arrDomJsonToHtml(data);
-          this.$oninput(uniImEditor.innerHTML);
+        } else if (typeof data === 'object') {
+          this.uniImEditor.innerHTML = data.html || this.$arrDomJsonToHtml(data);
+          this.$oninput(this.uniImEditor.innerHTML);
         }
       },
       $arrDomJsonToHtml(arr) {
@@ -541,7 +563,7 @@
           result += parseItem(item);
         }
         return result;
-      }
+      }
     }
   }
 </script>
diff --git a/components/uni-im-friendly-time/uni-im-friendly-time.vue b/components/uni-im-friendly-time/uni-im-friendly-time.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e69c2ef6d9e1a194379cced4d02c9f5488950da4
--- /dev/null
+++ b/components/uni-im-friendly-time/uni-im-friendly-time.vue
@@ -0,0 +1,68 @@
+<template>
+  <view class="format-time-text" @click="onclick">
+    <text class="text">{{friendlyTime}}</text>
+    <text class="text detail" v-if="showDetail">({{timeString}})</text>
+  </view>
+</template>
+
+<script>
+  import uniIm from '@/uni_modules/uni-im/sdk/index.js';
+  export default {
+    props: {
+      time: {
+        type: Number,
+        default: 0
+      },
+    },
+    computed: {
+      friendlyTime() {
+        let time = this.time
+        // 使得时间会随着心跳动态更新
+        time = time + uniIm.heartbeat * 0
+        return uniIm.utils.toFriendlyTime(time)
+      },
+    },
+    data() {
+      return {
+        timeString: new Date(this.time).toLocaleString(),
+        showDetail: false
+      }
+    },
+    mounted() {
+      // #ifdef H5
+      // 鼠标移入移出事件 设置显示时间
+      this.$el.addEventListener('mouseenter', () => {
+        this.showDetail = true
+      })
+      this.$el.addEventListener('mouseleave', () => {
+        this.showDetail = false
+      })
+      // #endif
+    },
+    methods: {
+      onclick() {
+        this.showDetail = true
+        setTimeout(() => {
+          this.showDetail = false
+        }, 2000)
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+.format-time-text {
+  flex-direction: row !important;
+  justify-content: center;
+  align-items: center;
+  .text {
+    font-size: 12px;
+    text-align: center;
+    color: #999999;
+    line-height: 22px;
+  }
+  .detail {
+    margin-left: 5px;
+  }
+}
+</style>
diff --git a/components/uni-im-group-notification/uni-im-group-notification.vue b/components/uni-im-group-notification/uni-im-group-notification.vue
index fbbb90127850df9bec12115041a2bf9c8410fd53..874a8938c51f1ce1fb305b02713231b8f68c28d3 100644
--- a/components/uni-im-group-notification/uni-im-group-notification.vue
+++ b/components/uni-im-group-notification/uni-im-group-notification.vue
@@ -50,7 +50,7 @@
 
 <style lang="scss">
   .system-msg-box{
-    margin: 0 150rpx;
+    margin: 0 30px;
   }
   .hidden {
     height: 0;
@@ -66,7 +66,6 @@
   .group-notification {
     padding:14px 0;
     background-color: #FFFFFF;
-    width: 600rpx;
     margin-top: 10px;
   }
   .group-notification .title-box{
diff --git a/components/uni-im-icons/uni-im-icons.vue b/components/uni-im-icons/uni-im-icons.vue
index cf695587b0189b4c9529a87ce4deef80812a9c91..9beb36c67b9e8cef51719cbaf37cee8dbe6d6f97 100644
--- a/components/uni-im-icons/uni-im-icons.vue
+++ b/components/uni-im-icons/uni-im-icons.vue
@@ -57,7 +57,7 @@
 }
 @font-face {
   font-family: "uni-im-icons"; /* Project id 3726059 */
-  src: url('https://at.alicdn.com/t/c/font_3726059_96d6x1ujhb.ttf?t=1712807858973') format('truetype');
+  src: url('https://at.alicdn.com/t/c/font_3726059_aoe3vlbh3os.ttf?t=1729588562823') format('truetype');
 }
 .uni-im-share:before {
   content: "\e6c4";
diff --git a/components/uni-im-img/uni-im-img.vue b/components/uni-im-img/uni-im-img.vue
index b3d8e1584cd204b77601ddae9a32c6941250dc82..0cbff7c13312289dec80d5bdb176d2b12a31c163 100644
--- a/components/uni-im-img/uni-im-img.vue
+++ b/components/uni-im-img/uni-im-img.vue
@@ -1,9 +1,10 @@
 <template>
-  <image @load="load" :src="url" :mode="mode" :style='{"width":viewWidth,"height":viewHeight}' @click="handleClick"></image>
+  <image @load="load" :src="url" :mode="mode" :style='{"width":viewWidth,"height":viewHeight,borderRadius}' @click="handleClick"></image>
 </template>
 
 <script>
 import uniIm from '@/uni_modules/uni-im/sdk/index.js';
+import config from '@/uni_modules/uni-im/common/config.js';
   export default {
     emits: ['click'],
     props: {
@@ -16,7 +17,7 @@ import uniIm from '@/uni_modules/uni-im/sdk/index.js';
         default: ''
       },
       maxWidth: {
-        type: [String,Number],
+        type: [String,Number,Boolean],
         default: false
       },
       maxHeight: {
@@ -30,6 +31,10 @@ import uniIm from '@/uni_modules/uni-im/sdk/index.js';
       height: {
         type: [String,Number],
         default: ''
+      },
+      borderRadius: {
+        type: [String,Number],
+        default: ''
       }
     },
     data() {
@@ -66,14 +71,27 @@ import uniIm from '@/uni_modules/uni-im/sdk/index.js';
        src:{
         async handler(src) {
           if(src){
+            // 判断是否为base64 blob ./ / @/开头的本地图片
+            if(src.indexOf('blob:') === 0 || src.indexOf('./') === 0 || src.indexOf('/') === 0 || src.indexOf('@/') === 0){
+              this.url = src
+              return
+            }
+            
             this.url = await uniIm.utils.getTempFileURL(src)
-            // src 是cloud://开头的云存储地址，是腾讯云，否则是阿里云
-            if(src.indexOf('cloud://') === 0){
-              this.url += '?imageMogr2/thumbnail/400x400>'
-            }else if(src.indexOf('http') === 0){
-              // 因为还可能是 base64 blob 的本地图片，所以这里判断是不是http开头的
-              this.url += '?x-oss-process=image/resize,w_200/quality,q_80'
+            // 文件存储的服务商
+            const {provider} = config.cloudFile
+            switch(provider){
+              case 'aliyun':
+                this.url += '?x-oss-process=image/resize,w_400/quality,q_80'
+                break
+              case 'tencent':
+                this.url += '?imageMogr2/thumbnail/400x400>'
+                break
+              case 'qiniu':
+                this.url += '?imageMogr2/thumbnail/400x400>'
+                break
             }
+            
           }
         },
         immediate: true
@@ -96,8 +114,8 @@ import uniIm from '@/uni_modules/uni-im/sdk/index.js';
           }
         }
       },
-      handleClick(){
-        this.$emit('click')
+      handleClick(event){
+        this.$emit('click',event)
       },
       // 如果是rpx单位，转换为px
       toPx(val){
diff --git a/components/uni-im-info-card/uni-im-info-card.vue b/components/uni-im-info-card/uni-im-info-card.vue
index f33ccfe00c7a9a8d3e793f393ba0ef160aa508c3..db4fc062a95ca327b67fca713d3d17acc4e4f0ea 100644
--- a/components/uni-im-info-card/uni-im-info-card.vue
+++ b/components/uni-im-info-card/uni-im-info-card.vue
@@ -18,11 +18,11 @@
           <text class="red-note">{{redNote}}</text>
           <text class="note">{{note}}</text>
         </view>
-        <view class="state">
-          <image v-if="mute" class="mute" mode="widthFix" src="@/uni_modules/uni-im/static/mute.png">
-          </image>
+        <view class="state">
+          <image v-if="mute" class="mute" mode="widthFix" src="@/uni_modules/uni-im/static/mute.png"/>
+          <image v-if="is_star" class="star" mode="widthFix" src="@/uni_modules/uni-im/static/star.png"/>
           <template v-if="badge">
-            <view v-if="mute" class="red-point"></view>
+            <view v-if="mute || badge == 'dot'" class="red-point"></view>
             <view v-else class="badge">{{badge > 99 ? '99+' : badge}}</view>
           </template>
         </view>
@@ -60,7 +60,7 @@
         default: ''
       },
       badge: {
-        type: Number,
+        type: [String,Number],
         default: 0
       },
       mute: {
@@ -78,6 +78,10 @@
       link: {
         type: Boolean,
         default: false
+      },
+      is_star: {
+        type: Boolean,
+        default: false
       }
     },
     computed: {
@@ -127,16 +131,18 @@
     /* #endif */
     .avatar-box{
       position: relative;
+      width: 40px;
+      height: 40px;
+      border-radius: 5px;
+      overflow: hidden;
       .avatar {
-        width: 40px;
-        height: 40px;
-        border-radius: 5px;
-        flex-shrink: 0;
+       width: 100%;
+       height: 100%;
       }
     }
     .main {
       flex-grow: 1;
-      justify-content: center;
+      justify-content: space-around;
       overflow: hidden;
       margin-left: 5px;
       flex-shrink: 1;
@@ -146,7 +152,7 @@
         // min-height: 20px;
 
         .title {
-          font-size: 16px;
+          font-size: 14px;
           color: #333;
           @include ellipsis;
         }
@@ -186,10 +192,10 @@
             margin-left: 2px;
           }
 
-          .mute {
-            width: 13px;
-            height: 13px;
-            opacity: 0.7;
+          .star,.mute {
+            width: 12px;
+            height: 12px;
+            opacity: 0.5;
           }
 
           .badge {
@@ -217,7 +223,8 @@
           .red-note {
             font-size: 12px;
             white-space: nowrap;
-            color: #f00;
+            color: #f00;
+            margin-right: 3px;
           }
 
           .note {
diff --git a/components/uni-im-member-list/uni-im-member-list.vue b/components/uni-im-member-list/uni-im-member-list.vue
new file mode 100644
index 0000000000000000000000000000000000000000..430f61af164f9802720fe06903a8cc4c697f5d62
--- /dev/null
+++ b/components/uni-im-member-list/uni-im-member-list.vue
@@ -0,0 +1,286 @@
+<template>
+  <view v-if="isShow && ((isWidescreen && !forceShowSearch) ? memberList.length != 0 : 1)" class="member-list-box">
+    <view class="member-list-mark" @click.stop="hide()"></view>
+    <view class="content">
+      <view class="head">
+        <view class="close">
+          <uni-icons @click="hide()" type="back" color="#000" size="12px"></uni-icons>
+        </view>
+        <text class="title">{{title}}</text>
+      </view>
+      <uni-search-bar v-if="!isWidescreen || forceShowSearch" v-model="keyword" :focus="true" placeholder="搜索" cancelButton="none" class="search" />
+      <scroll-view class="member-list" :scroll-y="true" :scroll-top="scrollTop" :show-scrollbar="true">
+        <view v-for="(item,index) in memberList" :key="item._id" class="member-list-item"
+          :class="{'member-list-item-active':activeUid == item.users._id}" @mouseover="activeUid = item.users._id"
+          @click="confirm(item.users._id)" :id="'a'+item.users._id">
+          <text class="nickname">{{item.users.nickname}}</text>
+          <text class="real_name">{{item.users.real_name}}</text>
+        </view>
+        <view class="null-about-menber-tip" v-if="memberList.length === 0">没有与"{{keyword}}"相关成员</view>
+      </scroll-view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import uniIm from '@/uni_modules/uni-im/sdk/index.js';
+  let confirmFunc = () => {}
+  export default {
+    props: {
+      conversationId: {
+        default: ''
+      },
+      memberListData: {
+        type: [Array,null],
+        default: null
+      }
+    },
+    computed: {
+      ...uniIm.mapState(['isWidescreen']),
+      memberList() {
+        let memberList = []
+        if(this.memberListData){
+          memberList = this.memberListData
+        }else{
+          memberList = uniIm.conversation.find(this.conversationId)?.group?.member.dataList || []
+        }
+        if (this.mapFn) {
+          memberList = memberList.map(this.mapFn)
+        }
+        if (this.filterFn) {
+          memberList = memberList.filter(this.filterFn)
+        }
+        if (this.keyword) {
+          memberList = memberList.filter(item => item.users.nickname.toLowerCase().includes(this.keyword.toLowerCase()))
+        }
+        // 按昵称排序
+        memberList.sort((a, b) => {
+          return a.users.nickname.localeCompare(b.users.nickname)
+        })
+        this.activeUid = memberList[0]?.users._id
+        return memberList
+      },
+    },
+    data() {
+      return {
+        isShow: false,
+        scrollTop: 0,
+        activeUid: '',
+        filterFn: null,
+        mapFn: null,
+        title: '',
+        keyword: '',
+        forceShowSearch: false
+      }
+    },
+    methods: {
+      confirm(uid) {
+        confirmFunc(uid)
+        this.hide()
+      },
+      onChatInput(e){
+        const enterText = e.data
+        if (!this.isShow) return
+        // console.log('enterText',enterText)
+        if(enterText == null){
+          // 敲了删除键
+          this.keyword = this.keyword.slice(0,-1)
+        }
+        else if(enterText == '@'){
+          this.keyword = ""
+        }else{
+          setTimeout(()=>{
+            // 输入法正在输入中
+            let isComposing = false
+            // #ifdef H5
+            isComposing = this.isWidescreen ? document.querySelector('.uni-im-editor').isComposing : e.isComposing
+            // #endif
+            if (isComposing) {
+              console.log('输入法正在输入中')
+            }else{
+              // console.log('enterText')
+              this.keyword += enterText
+            }
+          },0)
+        }
+      },
+      onChatInputKeydown(e) {
+        if (!this.isShow) return
+        if(e.key == 'Enter'){
+          if(this.memberList.length){
+            // console.log('选中要@的人')
+            this.confirm(this.activeUid)
+          }
+        }else if(["ArrowUp", "ArrowDown"].includes(e.key)){
+          // console.log('上下箭头选择@谁')
+          let index = this.memberList.findIndex(i => i.users._id == this.activeUid)
+          // console.log('index',index);
+          if (e.key == "ArrowUp") {
+            index--
+          } else {
+            index++
+          }
+          if (index < 0 || index > this.memberList.length - 1) {
+            index = 0
+          }
+          this.activeUid = this.memberList[index].users._id
+          // 防止选中的成员看不到，触发滚动
+          this.scrollTop = (index - 3) * 45
+          // console.log('this.scrollTop',this.scrollTop);
+          e.preventDefault();
+        }else if(["ArrowLeft", "ArrowRight"].includes(e.key)){
+          this.hide()
+        }else if(e.key == 'Backspace'){
+          setTimeout(() => {
+            // 获取e.target 元素内不包含在标签内的文字内容
+            let newValue = e.target.innerText
+            // console.log('删除键',newValue,this.oldChatInputValue);
+            // 拿到newValue 和 this.oldChatInputValue 中 包含的@字符的个数
+            let newAtN = newValue.replace(/[^@]/g, "").length
+            let oldAtN = this.oldChatInputValue?.replace(/[^@]/g, "")?.length || 0
+            if(newAtN === 0 || newAtN < oldAtN){
+              // console.log('删除了@成员的昵称');
+              this.hide()
+            }
+            this.oldChatInputValue = newValue
+          }, 0);
+        }
+      },
+      show({confirm,...param}) {
+        if(this.isShow){
+          return console.log('已经显示了')
+        }
+        // console.log('show',param, confirm)
+        // 默认选中第一个
+        // console.log('this.memberList[0]',this.memberList[0])
+        this.isShow = true
+        if (confirm) {
+          confirmFunc = confirm
+        }
+        this.keyword = ''
+        this.filterFn = param.filter
+        this.mapFn = param.map
+        this.title = param.title || '选择提醒的人'
+        this.forceShowSearch = param.forceShowSearch
+      },
+      hide() {
+        this.keyword = ''
+        this.isShow = false
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+.member-list-box {
+  .content {
+    position: fixed;
+    width: 750rpx;
+    height: 80vh;
+    bottom: 0;
+    z-index: 999;
+    background-color: #ffffff;
+    border-radius: 15px 15px 0 0;
+    box-shadow: 0 0 100px rgba(0, 0, 0, 0.2);
+    /* #ifdef H5 */
+    @media screen and (min-device-width:960px){
+      border-radius: 15px;
+      max-height: 300px;
+      width: unset;
+      min-width: 260px;
+      left: auto;
+      right: calc(50vw - 300px);
+      bottom: 300px;
+    }
+    /* #endif */
+    .head{
+      flex-direction: row;
+      position: relative;
+      .close {
+        position: absolute;
+        left: 5px;
+        background-color: #eee;
+        height: 18px;
+        width: 18px;
+        margin: 12px;
+        transform: rotate(270deg);
+        border-radius: 50%;
+        justify-content: center;
+        align-items: center;
+        /* #ifdef H5 */
+        cursor: pointer;
+        z-index: 1;
+        /* #endif */
+      }
+      .title {
+        flex: 1;
+        text-align: center;
+        margin-top: 10px;
+        font-size: 14px;
+        color: #000;
+      }
+    }
+    .search {
+       ::v-deep .uni-searchbar__box {
+        margin: 0;
+        height: 30px;
+        .uni-searchbar__box-icon-search {
+          padding: 0 5px;
+        }
+        .uni-searchbar__text-placeholder {
+          // font-size: 12px;
+        }
+      }
+    }
+    .member-list {
+      height: 0;
+      flex-grow: 1;
+      padding: 10px;
+      .member-list-item {
+        overflow: hidden;
+        height: 40px;
+        width: 100%;
+        font-size: 14px;
+        line-height: 40px;
+        padding:0 15px;
+        border-radius: 10px;
+        margin-bottom: 10px;
+        text-align: left;
+        flex-direction: row;
+        /* #ifdef H5 */
+        @media screen and (min-device-width:960px){
+          margin:0;
+          margin-bottom: 5px;
+          cursor: pointer;
+        }
+        /* #endif */
+        .real_name {
+          margin-left: 10px;
+          font-size: 12px;
+          color: #666;
+        }
+      }
+      .member-list-item-active {
+        background-color: #efefef;
+      }
+      .null-about-menber-tip {
+        color: #666;
+        font-size: 12px;
+        align-items: center;
+        justify-content: center;
+        height: 100px;
+      }
+    }
+  }
+  .member-list-mark {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 750rpx;
+    flex: 1;
+    width: 100vw;
+    height: 100vh;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/components/uni-im-msg-list/components/filter-contorl/filter-contorl.vue b/components/uni-im-msg-list/components/filter-contorl/filter-contorl.vue
new file mode 100644
index 0000000000000000000000000000000000000000..51cdabb57733be21d94b68680067e776c5fbdd18
--- /dev/null
+++ b/components/uni-im-msg-list/components/filter-contorl/filter-contorl.vue
@@ -0,0 +1,65 @@
+<template>
+  <view class="filter-contorl" v-if="userIdList.length">
+    <text class="title">已进入话题</text>
+    <uni-im-icons class="exit" @click="userIdList=[]" code="e61a" color="#999" size="12px"></uni-im-icons>
+    <uni-im-choose-user title="相关成员" :conversationId="conversationId" v-model="userIdList"></uni-im-choose-user>
+  </view>
+</template>
+
+<script>
+  export default {
+    emits: ['showMenberList', 'change'],
+    props: {
+      conversationId: {
+        default: ''
+      },
+    },
+    data() {
+      return {
+        userIdList: []
+      }
+    },
+    watch: {
+      userIdList(newVal) {
+        this.$emit('change', newVal)
+      }
+    },
+    methods: {
+      onchange(userIdList) {
+        this.userIdList = userIdList
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .filter-contorl {
+    justify-content: center;
+    border-bottom: 2px #bee1ff solid;
+    position: sticky;
+    top: 0;
+    background-color: #FFF;
+    font-size: 14px;
+    padding: 8px;
+    width: 100%;
+    z-index: 999;
+
+    .title {
+      font-size: 16px;
+      font-weight: bold;
+      color: #1399ff;
+      margin-bottom: 5px;
+    }
+
+    .exit {
+      position: absolute;
+      right: 10px;
+      top: 10px;
+      opacity: 0.7;
+
+      &:hover {
+        opacity: 1;
+      }
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/components/uni-im-msg-list/components/uni-im-list-item/uni-im-list-item.vue b/components/uni-im-msg-list/components/uni-im-list-item/uni-im-list-item.vue
deleted file mode 100644
index 9e78568c5fcebc2cb9482e86374841410f1bc425..0000000000000000000000000000000000000000
--- a/components/uni-im-msg-list/components/uni-im-list-item/uni-im-list-item.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<template>
-	<!-- #ifdef APP-NVUE -->
-	<cell :keep-scroll-position="true">
-		<slot></slot>
-	</cell>
-	<!-- #endif -->
-	<!-- #ifndef APP-NVUE -->
-	<view>
-		<slot></slot>
-	</view>
-	<!-- #endif -->
-</template>
-
-<script>
-	export default {
-		data() {
-			return {}
-		},
-		props: {
-		},
-		computed:{
-		},
-		methods:{
-		}
-	}
-</script>
-
-<style>
-</style>
diff --git a/components/uni-im-msg-list/uni-im-msg-list.vue b/components/uni-im-msg-list/uni-im-msg-list.vue
index a3bc9dacb2bdc856071cf585493b09c8abd60e6c..6fa0b3961e5c208b28761774ba693166d482c666 100644
--- a/components/uni-im-msg-list/uni-im-msg-list.vue
+++ b/components/uni-im-msg-list/uni-im-msg-list.vue
@@ -1,34 +1,35 @@
 <template>
-  <view class="uni-im-msg-list-root">
+  <view class="uni-im-msg-list-root" :class="{'in-topic':filterAsUid.length}">
+    <filter-contorl ref="filter-contorl" class="filter-contorl" @change="updateFilterUids" :conversationId="conversationId"></filter-contorl>
     <uni-im-list class="uni-im-list" :scrollTop="scrollTop"
       :scroll-into-view="scrollIntoView" ref="uni-im-list"
       @scroll="onScroll" @scrolltolower="onScrollToLower"
     >
      <template v-for="(msg,index) in visibleMsgList" :key="msg.unique_id || msg._id">
        <view class="uni-im-list-item" :ref="'item-'+index">
-         <view v-if="index === 0" class="data-state-tip-box">
-           <uni-im-load-state :status="hasMore?'loading':'noMore'" 
+         <view v-if="index === 0 && filterAsUid.length === 0" class="data-state-tip-box">
+           <uni-im-load-state :status="loadStatus" 
               :contentText='{"contentrefresh": "正在加载历史消息","contentnomore": "没有更多历史消息"}'></uni-im-load-state>
          </view>
          <view :class="['item',msg.type]" :id="'item-'+index" @click="clickItem">
            <view class="msg-box" :class="{'active-msg':msg._id === activeMsgId || msg.unique_id === activeMsgId,'pointer':chooseMore}" @click="checkMsg(msg)">
-             <template v-if="chooseMore">
+             <template v-if="chooseMore && !msg.is_revoke">
               <checkbox :checked="checkedMsgList.find(i=>i._id == msg._id) != undefined" class="checkbox" />
               <view class="mask"></view>
              </template>
              <!-- <text style="width: 750rpx;text-align: center;border: 1px solid #000;">{{'item-'+index}}</text> -->
-             <uni-im-msg :msg="msg" :id="msg._id" :self="current_uid() == msg.from_uid" :index="index"
+             <uni-im-msg :msg="msg" :id="msg._id" :self="currentUid == msg.from_uid" :index="index"
              @putChatInputContent="putChatInputContent" :equalPrevTime="equalPrevTime(index)" 
-             :avatar_file="conversation.avatar_file" @showMsgById="showMsgById" @showControl="showControl" 
-             @loadMore="loadMore" @longpressMsgAvatar="longpressMsgAvatar" @retriesSendMsg="retriesSendMsg" 
-             @viewMsg="viewMsg" :ref="'uni-im-msg'" class="uni-im-msg"
+             @showMsgById="showMsgById" @showControl="showControl" @intoTopic="intoTopic"
+             @longpressMsgAvatar="longpressMsgAvatar" @retriesSendMsg="retriesSendMsg" 
+             @viewMsg="viewMsg" ref="uni-im-msg" class="uni-im-msg"
              >
              </uni-im-msg>
            </view>
          </view>
        </view>
      </template>
-     <uni-im-load-state v-if="visibleMsgList.length === 0" :status="hasMore?'loading':'noMore'" class="uni-im-list-item" :contentText='{"contentrefresh": "加载中","contentnomore": "- 没有聊天记录 -"}'></uni-im-load-state>
+     <uni-im-load-state v-if="visibleMsgList.length === 0" :status="loadStatus" class="uni-im-list-item" :contentText='{"contentrefresh": "加载中","contentnomore": "- 没有聊天记录 -"}'></uni-im-load-state>
     </uni-im-list>
     
     <view v-if="hasNewMsg" class="new-msg-bar" @click="showLast">
@@ -65,14 +66,9 @@
  * @see module:uni-im-list
  */
   import uniIm from '@/uni_modules/uni-im/sdk/index.js';
-  import {
-    store as uniIdStore
-  } from '@/uni_modules/uni-id-pages/common/store';
-
   import uniImList from './components/uni-im-list/uni-im-list';
+  import filterContorl from './components/filter-contorl/filter-contorl';
 
-  // 一页多少条数据
-  let pageLimit = 30
   // 当前页面滚动条高度
   let currentScrollTop = 0
   
@@ -80,33 +76,40 @@
 
   export default {
     components: {
-      uniImList
+      uniImList,
+      filterContorl
     },
-    emits:['checkedMsgList','update:checkedMsgList','longpressMsgAvatar','showControl','clickItem','retriesSendMsg','putChatInputContent'],
+    emits:['checkedMsgList','update:checkedMsgList','longpressMsgAvatar','showControl','clickItem','retriesSendMsg','putChatInputContent','showMenberList'],
     computed: {
       ...uniIm.mapState(['systemInfo', 'isWidescreen']),
-      loadState() {
-        return this.hasMore ? '正在加载历史消息' : '没有更多历史消息'
-      },
-      hasMore() {
-        return this.conversation.hasMore
+      loadStatus() {
+        return this.conversation.msg.hasMore ? 'loading' : 'noMore'
       },
       visibleMsgList() {
-        const msgList = this.conversation.msgList || []
-        // 过滤掉，撤回消息的指令型消息 、 群头像更新（指令型）消息
-        const visibleMsgList = uniIm.utils.filterMsgList(msgList)
-        // 返回倒数 laterRenderIndex 条消息，实现懒渲染
-                                    .slice(-this.laterRenderIndex)
+        const visibleMsgList = this.conversation.msg.visibleDataList()
+        // console.log('visibleMsgList',visibleMsgList);
         this.$nextTick(() => {
-          uniIm.utils.throttle(this.setIntersectionObserver, 3000);
+          uniIm.utils.throttle(this.setIntersectionObserver, 1000);
         })
+        
+        if(this.filterAsUid.length > 0){
+          return visibleMsgList.filter(i=>this.filterAsUid.includes(i.from_uid))
+        }
+        // console.log('visibleMsgList.l',visibleMsgList.length);
         return visibleMsgList
+      },
+      //当前用户自己的uid
+      currentUid() {
+        return uniIm.currentUser._id;
       }
     },
     data() {
       return {
         conversation: {
-          hasMore: true,
+          msg: {
+            hasMore: true,
+            visibleDataList: () => []
+          },
           has_unread_group_notification: false,
           group_info: {
             notification: false
@@ -117,9 +120,7 @@
         hasNewMsg: false,
         call_list: [],
         activeMsgId: "",
-        loadMoreIng: false,
-        // 延迟渲染，避免页面卡顿
-        laterRenderIndex: pageLimit
+        filterAsUid:[]
       }
     },
     watch: {
@@ -128,7 +129,7 @@
       },
       'conversation.has_unread_group_notification': {
         async handler(hasUnreadGroupNotification) {
-          const group_notification = this.conversation?.group_info?.notification
+          const group_notification = this.conversation?.group?.notification
           const conversation_id = this.conversationId
           // 弹出群公告
           if (hasUnreadGroupNotification && group_notification && group_notification.content) {
@@ -147,13 +148,19 @@
               this.closeGroupNotification()
             } else {
               this.$refs["group-notification-popup"].open()
-              this.$nextTick(() => {
+              setTimeout(() => {
                 this.$refs["group-notification"].notification = group_notification
-              })
+              },0)
             }
           }
         },
         immediate: true
+      },
+      filterAsUid(filterAsUid,old){
+        this.$refs['filter-contorl'].userIdList = filterAsUid
+        if(filterAsUid.length === 0 || old.length === 0){
+          setTimeout(this.showLast,0)
+        }
       }
     },
     props: {
@@ -172,12 +179,6 @@
       }
     },
     async mounted() {
-      // for (var i = 0; i < 10; i++) {
-      // 	this.msgList.unshift({
-      // 		t:i
-      // 	})
-      // }
-      //
     },
     destroyed() {
       // console.log('destroyed')
@@ -190,53 +191,52 @@
         if (this.intersectionObserver){
           this.intersectionObserver.disconnect()
         }
-        this.conversation = await uniIm.conversation.get(this.conversationId)
+        this.conversation = uniIm.conversation.find(this.conversationId)
+        
         // init data --start
         this.scrollIntoView = ''
         this.scrollTop = 0
         currentScrollTop = 0
-        this.laterRenderIndex = pageLimit
 
-        if (!this.conversation.isInit) {
-          this.conversation.hasMore = true
-          await this.loadMore()
-          this.conversation.isInit = true
-          if (this.conversation.hasMore && this.visibleMsgList.length < pageLimit) {
-            console.log('不满一屏时，再loadMore一次');
-            await this.loadMore()
+        const showLast = ()=>{
+          // #ifdef H5
+          // 非web-pc端，list是颠倒的，所以默认显示最后一条。而web-pc端是正常的，所以需要滚动到底部
+          if(this.isWidescreen){
+            this.showLast()
           }
+          // #endif
         }
-
-        if(this.isWidescreen){
-          this.$nextTick(()=>{
-            this.showLast()
-            // TODO：未知原因，部分情况下 $nextTick时机执行不能定位到最后一条，需要用setTimeout 500再次定位
-            setTimeout(() => {
-              this.showLast()
-            },500)
-          })
+        
+        if(this.visibleMsgList.length === 0){
+          await this.loadMore(showLast)
+        } else {
+          showLast()
+          setTimeout(async()=>{
+            const msgIsOverFlow = await this.msgIsOverFlow()
+            if(this.visibleMsgList.length === 0 || !msgIsOverFlow){
+             await this.loadMore(showLast)
+            }
+          },0)
+        }
+      },
+      async msgIsOverFlow(){
+        if(this.visibleMsgList.length > 0){
+          // 计时
+          // console.time('getElInfo')
+          let firstMsgTop = (await this.getElInfo('#item-0')).top
+          let lastMsgBottom = (await this.getElInfo('#item-' + (this.visibleMsgList.length - 1) )).bottom
+          const listElInfo = await this.getElInfo('.uni-im-list')
+          // console.timeEnd('getElInfo')
+          return firstMsgTop < listElInfo.top || lastMsgBottom > listElInfo.bottom
+        }else{
+          return true
         }
       },
       async loadMore(callback) {
         let datas = []
-        if(this.laterRenderIndex < this.conversation.msgList.length){
-          let oldVisibleMsgList = JSON.parse(JSON.stringify(this.visibleMsgList))
-          await this.canHoldScrollDo(()=>{
-            this.laterRenderIndex += pageLimit
-          })
-          await this.$nextTick()
-          // 新加载到的数据为：oldVisibleMsgList和this.visibleMsgList的差集
-          datas = this.visibleMsgList.filter(i => !oldVisibleMsgList.some(j => j._id == i._id))
-          // console.log('beforeLoadMore 懒渲染=>',this.laterRenderIndex,this.conversation.msgList.length);
-        }else{
-          datas = await this.conversation.msgManager.getHistory()
-          // console.error(`加载到${datas.length}条，历史聊天数据`);
-          // console.log('加载到历史聊天数据：', datas);
-          if (datas.length === 0) {
-            this.conversation.hasMore = false
-          } else {
-            await this.insertMsg(datas)
-          }
+        datas = await this.conversation.msg.getMore()
+        if(datas.length){
+          await this.insertMsg(datas)
         }
         if (typeof callback === 'function') {
           // 为兼容 web pc端特殊场景 不能使用$nextTick
@@ -246,13 +246,6 @@
         }
         return datas
       },
-      async beforeLoadMore() {
-        if (!this.loadMoreIng && this.hasMore) {
-          this.loadMoreIng = true
-          await this.loadMore()
-          this.loadMoreIng = false
-        }
-      },
       msgOnAppear(msgId){
         uniIm.utils.throttle(()=>{
           let index = this.visibleMsgList.findIndex(i => i._id == msgId)
@@ -267,10 +260,9 @@
         if (this.intersectionObserver) {
           // console.log('this.intersectionObserver存在','执行销毁');
           this.intersectionObserver.disconnect()
+          await uniIm.utils.sleep(1000)
         }
         
-        await uniIm.utils.sleep(1000)
-        
         this.intersectionObserver = uni.createIntersectionObserver(this, { observeAll: true })
           .relativeTo('.uni-im-list', {})
           .observe('.uni-im-msg', (res) => {
@@ -306,22 +298,16 @@
               // 是否为第一个消息
               if (isFirstMsg) {
                 // console.log('第一个消息出现在视窗内，加载更多',this.visibleMsgList[0]?._id , msgId);
-                this.beforeLoadMore()
+                this.loadMore()
               }
               // 调用扩展点，通知消息列表某条消息进入显示区。
-              uniIm.extensions.invokeExts('msg-appear', msgRef.msg, {
-                user_id: uniCloud.getCurrentUserInfo().uid,
-                isInternalUser: this.uniIDHasRole('staff'),
-              })
+              uniIm.extensions.invokeExts('msg-appear', msgRef.msg)
             } else if (!res.intersectionRatio > 0 && hasBeenDisplayed) {
               appearObj[msgId] = false;
               msgRef.onDisappear()
               // console.error('消失了',msgRef.msg.body)
               // 调用扩展点，通知消息列表某条消息离开显示区。
-              uniIm.extensions.invokeExts('msg-disappear', msgRef.msg, {
-                user_id: uniCloud.getCurrentUserInfo().uid,
-                isInternalUser: this.uniIDHasRole('staff'),
-              })
+              uniIm.extensions.invokeExts('msg-disappear', msgRef.msg)
             }
           })
       },
@@ -350,24 +336,26 @@
          */
         // #ifdef H5
         if(this.isWidescreen){
-          if(this.systemInfo.browserName === "chrome"){
+          if(window.chrome){
             // console.error('currentScrollTop',currentScrollTop)
-            if(currentScrollTop === 0 && this.visibleMsgList.length != 0){
+            // console.error('this.visibleMsgList.length',this.visibleMsgList.length)
+            const msgIsOverFlow = await this.msgIsOverFlow()
+            if(msgIsOverFlow && currentScrollTop === 0 && this.visibleMsgList.length != 0){
               this.scrollTop = currentScrollTop
-              currentScrollTop += 1
-              await this.$nextTick(()=>this.scrollTop = currentScrollTop)
-              
+              await this.$nextTick(()=> this.scrollTop = (currentScrollTop + 1) )
               if(!this.canHoldScrollDo.tryIndex){
                 this.canHoldScrollDo.tryIndex = 1
               }else{
                 this.canHoldScrollDo.tryIndex ++
               }
-              
-              if(this.canHoldScrollDo.tryIndex > 100){
-                console.error('canHoldScrollDo tryIndex > 100')
+              if(this.canHoldScrollDo.tryIndex > 10){
+                console.warn('canHoldScrollDo tryIndex > 10',this.canHoldScrollDo.tryIndex,currentScrollTop,this.visibleMsgList.length)
+                this.canHoldScrollDo.tryIndex = 0
                 fn()
               }else{
-                this.$nextTick(()=>this.canHoldScrollDo(fn))
+                setTimeout(()=>{
+                  this.canHoldScrollDo(fn)
+                },300)
               }
             }else{
               fn()
@@ -376,13 +364,13 @@
             const getScrollContentHeight = ()=>document.querySelector('.scroll-content').offsetHeight
             let scrollContent = getScrollContentHeight()
             fn()
-            this.$nextTick(()=>{
+            // 下一个事件循环中，重新计算滚动条的高度
+            setTimeout(()=>{
               const diff = getScrollContentHeight() - scrollContent
-              console.error( diff, diff)
+              // console.error( 'diff', diff)
               this.scrollTop = currentScrollTop
-              currentScrollTop += diff
-              this.$nextTick(()=> this.scrollTop = currentScrollTop)
-            })
+              this.$nextTick(()=> this.scrollTop = currentScrollTop + diff)
+            },0)
           }
           return
         }
@@ -390,12 +378,13 @@
         fn()
       },
       async insertMsg(data) {
-        // 重新获取会话对象，防止web pc端 切换太快引起的会话对象指向错误
-        const conversation = await uniIm.conversation.get(data[0].conversation_id)
-        this.canHoldScrollDo(()=>{
-          conversation.msgList.unshift(...data)
-          // 有新消息插入laterRenderIndex的值重新设置
-          this.laterRenderIndex += data.length
+        return await new Promise((resolve) => {
+          this.canHoldScrollDo(async ()=>{
+            // 重新获取会话对象，防止web pc端 切换太快引起的会话对象指向错误
+            const conversation = await uniIm.conversation.get(data[0].conversation_id)
+            conversation.msg.add(data,{unshift:true})
+            resolve()
+          })
         })
       },
       equalPrevTime(index) {
@@ -432,7 +421,7 @@
           const query = uni.createSelectorQuery().in(this);
           query.select(select).boundingClientRect(data => {
             if (!data) {
-              console.log('找不到 showMsgByIndex' + select);
+              console.log('找不到 showMsgByIndex：' + select);
               return rejece(false)
             }
             resolve(data)
@@ -465,32 +454,55 @@
         // 设置一个新值触发视图更新 -> 滚动
         this.$nextTick(async () => {
           this.scrollTop = val
-          currentScrollTop = val
           // console.error('currentScrollTop',currentScrollTop)
         })
       },
+      // 进入话题
+      intoTopic(msgId) {
+        let currentMsg = this.conversation.msg.find(msgId)
+        const getAboutUser = msg => {
+          const aboutUid = [msg.from_uid];
+          const about_msg_id = msg.about_msg_id
+          if(!about_msg_id){
+            return aboutUid
+          }
+          const aboutMsg = this.conversation.msg.find(about_msg_id)
+          if(aboutMsg){
+            aboutUid.push(...getAboutUser(aboutMsg))
+          }
+          // 去重
+          return [...new Set(aboutUid)]
+        }
+        
+        this.filterAsUid = getAboutUser(currentMsg)
+      },
+      showMenberList(){
+        this.$emit('showMenberList',arguments[0])
+      },
       async showMsgById(msgId) {
         // 找到消息的索引
         let index = this.visibleMsgList.findIndex(i => i._id == msgId)
+        // 如果找不到，先加载更多，再找
         if (index === -1) {
-          // 如果找不到，先加载更多，再找
-          uni.showLoading();
           const {_findIndex} = this.showMsgById
           if (!_findIndex) {
+            uni.showLoading();
             this.showMsgById._findIndex = 0
-          } else if (_findIndex > 30) {
+          } else if (_findIndex > 9) {
             uni.hideLoading()
             this.showMsgById._findIndex = false
-            return console.error('防止特殊情况下死循环，不加载30屏以外的引用数据');
+            console.error('防止特殊情况下死循环，不加载10屏以外的引用数据');
+            return uni.showToast({
+              title: '暂不支持，定向10屏以外的引用消息',
+              icon: 'none'
+            });
           }
           this.showMsgById._findIndex++
+          console.log('this.showMsgById._findIndex', this.showMsgById._findIndex);
           await this.loadMore()
-          this.showMsgById._findIndex = false
-          await uniIm.utils.sleep(300)
-          uni.hideLoading()
           return await this.showMsgById(msgId)
         }
-        
+        uni.hideLoading()
         this.activeMsgId = msgId
         if(this.showMsgActiveColorActionT){
           clearTimeout(this.showMsgActiveColorActionT)
@@ -514,7 +526,7 @@
         db.collection('uni-im-conversation')
         .where({
           id:this.conversationId,
-          user_id: uniCloud.getCurrentUserInfo().uid
+          user_id: this.currentUid
         })
         .update({
           has_unread_group_notification: false
@@ -540,12 +552,12 @@
         }
         this.$emit('update:checkedMsgList', checkedMsgList)
       },
-      //当前用户自己的uid
-      current_uid() {
-        return uniCloud.getCurrentUserInfo().uid;
-      },
       showControl(e) {
-        this.$emit('showControl', e)
+        if (this.isWidescreen || this.onScroll.end !== false){
+          this.$emit('showControl', e)
+        }else{
+          // console.log('滚动中，不响应长按弹出菜单')
+        }
       },
       longpressMsgAvatar(e) {
         this.$emit('longpressMsgAvatar', e)
@@ -558,6 +570,9 @@
       },
       putChatInputContent(msgBody) {
         this.$emit('putChatInputContent', msgBody)
+      },
+      updateFilterUids(uids){
+        this.filterAsUid = uids
       }
     }
   }
@@ -566,11 +581,14 @@
 
 <style lang="scss">
 .uni-im-msg-list-root{
+  &.in-topic {
+    // 显示滚动条时，最外层增加描边
+    border: 2px #bee1ff solid;
+  }
   &,.uni-im-list {
     background-color: transparent;
     height: 100%;
   }
-  
   .uni-im-list-item {
     transform: scale(1, -1);
     .uni-im-msg {
diff --git a/components/uni-im-msg/popup-control.vue b/components/uni-im-msg/popup-control.vue
index 84f48f96ef14bda5daf4585a4a94ea897237f0c7..87f9a77ed29484b3efb1eb0e6a7fcbec9f6493fb 100644
--- a/components/uni-im-msg/popup-control.vue
+++ b/components/uni-im-msg/popup-control.vue
@@ -81,7 +81,7 @@
           {
             title:'复制',
             action:()=>this.copyContent(),
-            canDisplay: ["userinfo-card","rich-text","text","image"].includes(msg.type) && (msg.type != 'image' || uniIm.systemInfo.uniPlatform === "web"),
+            canDisplay: (uniIm.systemInfo.uniPlatform === "web" && ["userinfo-card","rich-text","image"].includes(msg.type) || msg.type == 'text' ),
           },
           {
             title:'撤回',
@@ -105,6 +105,14 @@
           }
         ]
         
+        if(msg.about_msg_id){
+          this.controlList.push({
+            title:'进入会话',
+            action:()=> this.$emit('intoTopic', msg._id),
+            canDisplay:true,
+          })
+        }
+        
         // 拿到扩展点的数据
         let extensionsControlList = uniIm.extensions.invokeExts('msg-popup-controls',msg)
         this.controlList = this.controlList.concat(...extensionsControlList)
@@ -199,63 +207,74 @@
         })
 			},
 			async copyContent(){
-				// console.log('setClipboardData');
-				// console.log('this.controlData',this.controlData);
-        // #ifdef H5
-        if (this.controlData.msg.type === 'image') {
-          let { name, url } = this.controlData.msg.body
-          fetch(url).then(response => response.blob()).then(blob => {
-            let mime = blob.type
-            let file = new File([blob], mime.replace('/', '.'), { type: mime })
-            let clipboardItem = new ClipboardItem({ [mime]: file })
-            navigator.clipboard.write([clipboardItem])
-          })
-          return
-        }
-        // #endif
-        
-        let data = this.controlData.msg.body
-        switch (this.controlData.msg.type){
-          case 'userinfo-card':
-            data = location.origin + '/#/?user_id='+this.controlData.msg.body.user_id
-            break;
-          case 'rich-text':
-            /*
-              let html = data.map(i=>i.name == 'img' ? `<img src="${i.attrs.src}">` : i.text).join(' ')
-              // 把data写到剪切板
-              // 将HTML字符串转换为ArrayBuffer，确保UTF-8编码
-              const encoder = new TextEncoder();
-              const htmlArrayBuffer = encoder.encode(html);
-              // 创建一个包含HTML内容的ClipboardItem
-              const clipboardItem = new ClipboardItem({
-                'text/html': new Blob([htmlArrayBuffer], { type: 'text/html' }),
-              });
-              // 尝试将ClipboardItem写入剪切板
-              try {
-                await navigator.clipboard.write([clipboardItem]);
-                console.log('HTML内容已写入剪切板');
-              } catch (err) {
-                console.error('写入剪切板失败: ', err);
+        let data = ''// 需要复制的数据
+        const msgBody = this.controlData.msg.body
+        const action = {
+          text(){
+            data = msgBody
+          },
+          'userinfo-card'(){
+            data = location.origin + '/#/?user_id='+msgBody.user_id
+          },
+          // #ifdef H5
+          async image(){
+            let url = msgBody.url
+            url = await uniIm.utils.getTempFileURL(url)
+            fetch(url).then(response => response.blob()).then(blob => {
+              let mime = blob.type
+              let file = new File([blob], mime.replace('/', '.'), { type: mime })
+              let clipboardItem = new ClipboardItem({ [mime]: file })
+              navigator.clipboard.write([clipboardItem])
+            })
+          },
+          async 'rich-text'(){
+            let html = ""
+            for(let i of msgBody){
+              if(i.name == 'img'){
+                const url = await uniIm.utils.getTempFileURL(i.attrs.src)
+                html += `<img src="${url}">`
+              }else if(i.name == 'a'){
+                html += `<a href="${i.attrs.href}">${i.children[0].text}</a>`
+              }else{
+                html += i.text
               }
-              return
-            */
-           console.log('data',data)
-            data = data.map(i=>i.children?i.children[0]:i).map(i=>i.name == 'img' ? '[图片]' : i.text).join(' ')
-            break;
-          default:
-            break;
+            }
+            data = html
+            // 把data写到剪切板
+            // 将HTML字符串转换为ArrayBuffer，确保UTF-8编码
+            const encoder = new TextEncoder();
+            const htmlArrayBuffer = encoder.encode(html);
+            // 创建一个包含HTML内容的ClipboardItem
+            const clipboardItem = new ClipboardItem({
+              'text/html': new Blob([htmlArrayBuffer], { type: 'text/html' }),
+            });
+            data = clipboardItem
+            // 尝试将ClipboardItem写入剪切板
+            try {
+              await navigator.clipboard.write([clipboardItem]);
+              // console.log('HTML内容已写入剪切板');
+            } catch (err) {
+              console.error('写入剪切板失败: ', err);
+            }
+          }
+          // #endif
         }
+        await action[this.controlData.msg.type]?.()
 
-				uni.setClipboardData({
-					data,
-					complete:(e)=> {
-						uni.hideToast()
-						// console.log(e);
-					}
-				})
+				if(typeof data === 'string'){
+          uni.setClipboardData({
+          	data,
+          	complete:(e)=> {
+          		uni.hideToast()
+          		// console.log(e);
+          	}
+          })
+        }else{
+          // console.log('非字符串',data);
+        }
 			},
 			canRevoke() {
-				let current_uid = uniCloud.getCurrentUserInfo().uid
+				let current_uid = uniIm.currentUser._id
 				let {group_id,from_uid,conversation_id,create_time} = this.controlData.msg || {}
 				// console.log('create_time',create_time,'group_id',group_id);
 				// console.log('from_uid current_uid',this.controlData.msg,from_uid,current_uid);
@@ -273,8 +292,8 @@
         
 				let isGroupAdmin = false
 				if(group_id){
-					let conversation = uniIm.conversation.getCached(conversation_id)
-					isGroupAdmin = conversation.group_info.user_id == current_uid
+					let conversation = uniIm.conversation.find(conversation_id)
+					isGroupAdmin = conversation.group.user_id == current_uid
 				}
 				// console.log('isGroupAdmin',isGroupAdmin);
 				// 如果是群主
@@ -286,14 +305,10 @@
         return from_uid == current_uid && ( Date.now() - create_time < 1000*60*2 )
 			},
 			async revokeMsg(){
-        // 点击后直接关闭，异步提示撤回情况
-        
-        
 				// 再判断一遍防止，分钟在2分钟的时候右键了，然后到了第3分钟才点下的情况
 				if(this.canRevoke()){
 					const {conversation_id,_id:msg_id} = this.controlData.msg
-          const conversation = await uniIm.conversation.get(conversation_id)
-					conversation.revokeMsg(msg_id)
+          uniIm.conversation.find(conversation_id).revokeMsg(msg_id)
 				}else{
 					uni.showToast({
 						title: '已超过2分钟，不能撤回',
@@ -314,7 +329,7 @@
 				this.controlData.msg.is_delete = true
 				// 存到本地
 				let conversation = await uniIm.conversation.get(this.controlData.msg.conversation_id)
-				conversation.msgManager.localMsg.update(this.controlData.msg.unique_id,this.controlData.msg)
+				// conversation.msgManager.localMsg.update(this.controlData.msg.unique_id,this.controlData.msg)
 				
 			},
 			other(){
diff --git a/components/uni-im-msg/types/encryption.vue b/components/uni-im-msg/types/encryption.vue
new file mode 100644
index 0000000000000000000000000000000000000000..88a2e05c753b853c75d9621785f6bd9296fab626
--- /dev/null
+++ b/components/uni-im-msg/types/encryption.vue
@@ -0,0 +1,38 @@
+<template>
+  <view class="encryption-tip">
+    此消息为加密消息{{hasKey?'，与配置的密钥不匹配':'，当前未配置密钥'}}，无法查看
+  </view>
+</template>
+
+<script>
+/**
+ * 只有未被成功解密的消息才会显示在这个组件
+*/
+  import uniIm from '@/uni_modules/uni-im/sdk/index.js';
+  export default {
+    props: {
+      msg: {
+        type: Object,
+        default: () => {}
+      }
+    },
+    computed: {
+      hasKey() {
+        uniIm.ext.encryptionKey?.[uniIm.currentConversationId]
+      }
+    },
+    methods: {
+    }
+  }
+</script>
+
+<style>
+  .encryption-tip {
+    padding:8px 15px;
+    margin-top:5px;
+    background-color: #FFF;
+    border-radius: 10px;
+    color: #999;
+    border: 1px dashed #eee;
+  }
+</style>
\ No newline at end of file
diff --git a/components/uni-im-msg/types/file.vue b/components/uni-im-msg/types/file.vue
index 37fa8307a93dbfd1465300a83289d36484ea85fd..abd2c724a844024fa8a4dc04a39158dda0fef7cd 100644
--- a/components/uni-im-msg/types/file.vue
+++ b/components/uni-im-msg/types/file.vue
@@ -1,14 +1,10 @@
 <template>
   <view class="msg-content file-msg-box" @click="downLoadFile" ref="msg-content">
     <view class="file-msg-info">
-      <text class="file-msg-info-name">
-        {{ fileName }}
-      </text>
-      <text class="file-msg-info-size">
-        {{ fileSize }}
-      </text>
+      <text class="name">{{fileName}}</text>
+      <text class="size">{{fileSize}}</text>
     </view>
-    <uni-im-icons code="e858" size="50" color="#EEEEEE" class="file-icon" />
+    <uni-im-icons code="e7d0" size="50" color="#EEEEEE" class="file-icon" />
   </view>
 </template>
 
@@ -90,29 +86,27 @@
   }
 </script>
 
-<style>
-  .file-msg-box {
+<style lang="scss">
+  .file-msg-box.msg-content {
     background-color: #FFFFFF;
-    width: 500rpx;
-    padding: 10px;
+    width: 500rpx;
+    padding: 10px;
     border-radius: 8px;
-    flex-direction: row;
-    justify-content: space-between;
-  }
-
-  .file-msg-info {
-    width: 300rpx;
-    flex-direction: column;
-    justify-content: space-around;
-  }
-
-  .file-msg-info-name {
-    word-wrap: break-word;
-    font-size: 16px;
-  }
-
-  .file-msg-info-size {
-    font-size: 12px;
-    color: #666;
+    flex-direction: row;
+    justify-content: space-between;
+    .file-msg-info {
+      flex-direction: column;
+      justify-content: space-around;
+      .name {
+        word-wrap: break-word;
+        font-size: 16px;
+      }
+      .size {
+        font-size: 12px;
+        color: #666;
+      }
+    }
+    .file-icon {
+    }
   }
 </style>
\ No newline at end of file
diff --git a/components/uni-im-msg/types/history.vue b/components/uni-im-msg/types/history.vue
index 38f52bba0f551d547b9659788300486e07acb13f..0e4b6af15f8d5c9f3cacf42c75990c0a185721ca 100644
--- a/components/uni-im-msg/types/history.vue
+++ b/components/uni-im-msg/types/history.vue
@@ -36,9 +36,8 @@
         msg.content = typeof(msg.body) === 'string' ? msg.body.replace(/<[^>]+>/g, "") : '[多媒体类型]'
       }
       if(!this.msgList[0].group_id){
-        let currentUid = uniCloud.getCurrentUserInfo().uid;
-        let currentUidInfo = uniIm.users[currentUid];
-        let currentNickname = currentUidInfo?currentUidInfo.nickname:'';
+        let currentUid = uniIm.currentUser._id;
+        let currentNickname = uniIm.users.getNickname(currentUid);
         // 找到不是自己的nickname去重
         let nickname = this.msgList.map(item=>item.nickname).filter(nickname=>nickname!==currentNickname)[0]
         this.title = currentNickname + (nickname?'与'+nickname:'')+'的聊天记录';
@@ -66,7 +65,7 @@
   }
 </script>
 
-<style>
+<style lang="scss">
   /* #ifdef H5 */
   .history-msg,.history-msg * {
     cursor: pointer;
@@ -74,27 +73,24 @@
   /* #endif */
   .history-msg {
     padding: 10px;
+    border-radius: 5px;
     background-color: #fff;
     width: 600rpx;
-    max-height:200px !important;
-    overflow: hidden;
-  }
-  .item-text-list{
-    max-height: 150px !important;
-    overflow: hidden;
-  }
-
-  .title {
-    text-align: left;
-    font-size: 16px;
-    height: 36px;
-    color: #333;
-    padding: 5px;
-    border-bottom: 1px solid #eee;
-  }
-
-  .item-text {
-    color: #888;
-    margin-top: 5px;
+    .title {
+      text-align: left;
+      font-size: 16px;
+      color: #333;
+      border-bottom: 1px solid #eee;
+      padding-bottom: 5px;
+      margin-bottom: 5px;
+    }
+    .item-text-list{
+      max-height: 150px !important;
+      overflow: hidden;
+      .item-text {
+        color: #999;
+        font-size: 14px;
+      }
+    }
   }
 </style>
\ No newline at end of file
diff --git a/components/uni-im-msg/types/order.vue b/components/uni-im-msg/types/order.vue
new file mode 100644
index 0000000000000000000000000000000000000000..eaba2d5f2295fda5ca3e0489866acf6451f69324
--- /dev/null
+++ b/components/uni-im-msg/types/order.vue
@@ -0,0 +1,159 @@
+<template>
+  <view class="msg-order">
+    <text class="title">订单信息</text>
+    <view class="item">
+      <text class="title">订单编号：</text>
+      <text :selectable="true" class="value">{{orderInfo.order_id}}</text>
+    </view>
+    <view class="item">
+      <text class="title">产品/服务名称：</text>
+      <text class="value">{{orderInfo.product.name}}</text>
+    </view>
+    <view class="item">
+      <text class="title">订单价格：</text>
+      <text class="value">{{orderInfo.product.price}}元</text>
+    </view>
+    <view class="item">
+      <text class="title">所属用户：</text>
+      <text class="value">{{nickName}}</text>
+    </view>
+    
+    <view class="item">
+      <text class="title">订单状态：</text>
+      <text class="value">{{status}}</text>
+    </view>
+    <template v-if="orderInfo.status === 1">
+      <view class="item">
+        <text class="title">支付时间：</text>
+        <text class="value">{{new Date(orderInfo.pay_time).toLocaleString()}}</text>
+      </view>
+      <view class="item">
+        <text class="title">支付渠道：</text>
+        <text class="value">{{orderInfo.pay_channel}}</text>
+      </view>
+    </template>
+    <template v-else-if="isMineOrder && !isExpired">
+      <button class="btn" type="primary" @click="toPay" :disabled="isExpired">前往支付</button>
+      <view class="tip">请在 {{new Date(orderInfo.expire_time).toLocaleString()}} 前完成支付 </view>
+    </template>
+  </view>
+</template>
+
+<script>
+  import uniIm from '@/uni_modules/uni-im/sdk/index.js';
+  export default {
+    props: {
+      msg: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    computed: {
+      orderInfo() {
+        return this.msg.body
+      },
+      nickName() {
+        return uniIm.users.find(this.orderInfo.user_id)[0]?.nickname || '未知'
+      },
+      isExpired() {
+        let now = Date.now() + uniIm.heartbeat * 0
+        return now > this.orderInfo.expire_time
+      },
+      isMineOrder() {
+        // console.log('isMineOrder',this.orderInfo.user_id,uniIm.currentUser._id)
+        return this.orderInfo.user_id == uniIm.currentUser._id
+      },
+      status() {
+        if(this.orderInfo.status == 1) {
+          return '已支付'
+        }
+        if(this.isExpired) {
+          return '已过期'
+        }
+        if(this.orderInfo.status == 0) {
+          return '待支付'
+        }
+        return '待支付'
+      }
+    },
+    data() {
+      return {
+        
+      }
+    },
+    methods: {
+      async toPay() {
+        const uniIdSpaceConfig = {
+          provider: 'private',
+          spaceName: 'uni-id-server',
+          spaceId: 'uni-id-server',
+          clientSecret: 'ba461799-fde8-429f-8cc4-4b6d306e2339',
+          endpoint: 'https://account.dcloud.net.cn'
+        }
+        const uniIdCenterEnv = uniCloud.init(uniIdSpaceConfig)
+        const uniIdCenterObj = uniIdCenterEnv.importObject('uni-id-co')
+        
+        let oauthToken;
+        try {
+          let res = await uniIdCenterObj.getOauthToken()
+          console.log('getOauthToken',res)
+          oauthToken = res.data.access_token
+        } catch (e) {
+          return uni.showModal({
+            content: JSON.stringify(e),
+            showCancel: false
+          });
+        }
+          
+        const url = `https://dev.dcloud.net.cn/pages/common/pay?return_url=`
+        + encodeURIComponent('/uni_modules/uni-trade/pages/order-payment/order-payment?order_id='+this.orderInfo.order_id)
+        + '&oauthToken=' + oauthToken
+        console.log('url',url)
+        window.open(url, '_blank')
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+.msg-order {
+  background-color: #FFF;
+  border-radius: 10px;
+  padding: 25px;
+  max-width:100%;
+  & > .title {
+    font-size: 18px;
+    font-weight: bold;
+  }
+  .item {
+    flex-direction: row;
+    justify-content: start;
+    margin-top: 10px;
+    .title {
+      color: #666;
+      // 不换行
+      white-space: nowrap;
+    }
+    .value {
+      color: #333;
+      font-size: 14px;
+      // 换行
+      white-space: pre-wrap;
+      word-break: break-all;
+    }
+  }
+  .tip {
+    font-size: 14px;
+    color: #666;
+    margin-top: 10px;
+  }
+  .btn {
+    margin-top: 20px;
+    height: 36px;
+    line-height: 36px;
+    padding: 0;
+  }
+}
+</style>
diff --git a/components/uni-im-msg/types/pay-notify.vue b/components/uni-im-msg/types/pay-notify.vue
new file mode 100644
index 0000000000000000000000000000000000000000..09a6ac9c3287014d4a663ecbfb24deaf88419fd9
--- /dev/null
+++ b/components/uni-im-msg/types/pay-notify.vue
@@ -0,0 +1,84 @@
+<template>
+  <view class="pay-notify">
+    <text class="title">支付成功通知</text>
+    <view class="item">
+      <text class="title">订单编号：</text>
+      <text :selectable="true" class="value">{{msg.body.order_id}}</text>
+    </view>
+    <view class="item">
+      <text class="title">支付时间：</text>
+      <text :selectable="true" class="value">{{new Date(msg.create_time).toLocaleString()}}</text>
+    </view>
+    <view class="item">
+      <text class="title">支付金额：</text>
+      <text :selectable="true" class="value">{{msg.body.price / 100}}元</text>
+    </view>
+    <view class="item">
+      <text class="title">支付渠道：</text>
+      <text :selectable="true" class="value">{{msg.body.pay_channel}}</text>
+    </view>
+    
+  </view>
+</template>
+
+<script>
+  export default {
+    props: {
+      msg: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    data() {
+      return {
+        
+      }
+    },
+    methods: {
+      
+    }
+  }
+</script>
+
+<style lang="scss">
+.pay-notify {
+  background-color: #FFF;
+  border-radius: 10px;
+  padding: 25px;
+  max-width: 100%;
+  & > .title {
+    font-size: 18px;
+    font-weight: bold;
+  }
+  .item {
+    flex-direction: row;
+    justify-content: start;
+    margin-top: 10px;
+    .title {
+      color: #666;
+      // 不换行
+      white-space: nowrap;
+    }
+    .value {
+      color: #333;
+      font-size: 14px;
+      // 换行
+      white-space: pre-wrap;
+      word-break: break-all;
+    }
+  }
+  .tip {
+    font-size: 14px;
+    color: #666;
+    margin-top: 10px;
+  }
+  .btn {
+    margin-top: 20px;
+    height: 36px;
+    line-height: 36px;
+    padding: 0;
+  }
+}
+</style>
diff --git a/components/uni-im-msg/types/rich-text.vue b/components/uni-im-msg/types/rich-text.vue
index 861390594fd1b4ec9029c4e5bc612afc2ec16b23..db804f84866a7065d65f429e627b4f20d2a6f102 100644
--- a/components/uni-im-msg/types/rich-text.vue
+++ b/components/uni-im-msg/types/rich-text.vue
@@ -1,163 +1,179 @@
-<template>
-  <view class="uni-im-rich-text"
+<template>
+  <view class="uni-im-rich-text"
     :class="{'isFromSelf':isFromSelf, 'only1u': trBody.length === 0 &&webInfoList.length === 1 , isSingeImg}">
     <template v-for="(item,index) in trBody" :key="index">
       <template v-if="item.name == 'span'">
         <text v-if="item.attrs && item.attrs.class == 'nickname'" class="text nickname"
-          :class="{pointer:canPrivateChat}"
+          :class="{'pointer':canPrivateChat,'isCallMe':item.attrs.user_id == currentUid}"
           @click="privateChat(item.attrs.user_id)"
         >
           {{item.children[0].text}}
         </text>
         <text v-else class="text">
           {{item.children[0].text}}
-        </text>
-        <uni-im-icons class="text isRead" v-if="isFromSelf && 'isRead' in item" :code="item.isRead?'e609':'e741'"
-          size="14px" :color="item.isRead?'#25882a':'#bbb'"></uni-im-icons>
+        </text>
+        <uni-im-icons class="text read-state" v-if="isFromSelf && 'isRead' in item" 
+          :class="{isRead:item.isRead}" :code="item.isRead?'e609':'e741'"
+          :size="item.isRead?'12px':'10px'" :color="item.isRead?'#25882a':'#bbb'"></uni-im-icons>
       </template>
-      <text class="text" v-else-if="item.type == 'text'" :decode="true" space="ensp">{{item.text}}</text>
-      <uni-im-img v-else-if="item.name == 'img'" max-width="200px" @click="previewImage(item.attrs.src)"
+      <text class="text" v-else-if="item.type == 'text'" :decode="true" space="ensp">{{trText(item.text)}}</text>
+      <uni-im-img v-else-if="item.name == 'img'" max-width="200px" @click="previewImage(item.attrs.src)"
         :src="item.attrs.src" :width="item.attrs.width" :height="item.attrs.height" mode="widthFix" class="img" />
-      <uni-link class="link" v-else-if="item.name == 'a' && item.children && typeof(item.children[0]) === 'object'" :href="item.attrs.href" color="#007fff"
-        :text="item.children[0].text"></uni-link>
-    </template>
-
-
-    <!-- <view class="web-info" v-for="(item,index) in webInfoList" :key="index">
-        <view class="title-box">
-          <image v-if="item.icon" :src="item.icon" mode="widthFix" class="web-icon" @error="item.icon = false" />
-          <view v-if="item.title" class="title">{{item.title}}</view>
-        </view>
-        <view class="content">
-          <view v-if="item.description" class="description">{{item.description}}</view>
-          <image v-if="item.thumbnail" class="web-thumbnail" :src="item.thumbnail" mode="widthFix"
-            @error="item.thumbnail = false" />
-        </view>
-        <view class="link-box" v-if="item.url">
-          <uni-link class="link" :href="item.url" color="#007fff" :text="item.url"></uni-link>
-          <uni-im-icons @click="copy(item.url)" class="copy" code="e67e"></uni-im-icons>
-        </view>
-      </view> -->
-  </view>
-</template>
-
-<script>
-  import uniIm from '@/uni_modules/uni-im/sdk/index.js';
-  export default {
-    props: {
-      msg: {
-        type: Object,
-        default: () => {
-          return {
-            reader_list: [],
-            body: []
-          }
-        }
-      }
-    },
-    data() {
-      return {
-        webInfoList: []
-      }
-    },
-    async mounted() {
-      // let aList = this.msg.body.filter(item => item.name == 'a')
-      //                           // .filter(item => {
-      //                           //   return item.attrs && item.attrs.href &&
-      //                           //    item.attrs.href.includes('dcloud.net.cn') ||
-      //                           //    item.attrs.href.includes('dcloud.io')
-      //                           // })
-      // // console.log('aList',aList)
-      // for(let i = 0; i < aList.length; i++){
-      //   const uniImCo = uniCloud.importObject("uni-im-co",{customUI:true})
-      //   let res = await uniImCo.getWebInfo(aList[i].attrs.href)
-      //   // console.log('getWebInfo',res.data)
-      //   res.data.url = aList[i].attrs.href
-      //   if(res.data.title){
-      //     res.data.title = getStr(res.data.title, 60)
-      //     res.data.description = getStr(res.data.description, 60)
-      //   // // 取字符串的前20个字符，如果超出加...
-      //    function getStr(str='', len) {
-      //      if (str.length > len) {
-      //        return str.substring(0, len) + "...";
-      //      } else {
-      //        return str;
-      //      }
-      //    }
-      //     this.webInfoList.push(res.data)
-      //   }
-      // }
-    },
+      <uni-link class="link" v-else-if="item.name == 'a' && item.children && typeof(item.children[0]) === 'object'" :href="item.attrs.href" color="#007fff"
+        :text="item.children[0].text"></uni-link>
+    </template>
+
+
+    <!-- <view class="web-info" v-for="(item,index) in webInfoList" :key="index">
+        <view class="title-box">
+          <image v-if="item.icon" :src="item.icon" mode="widthFix" class="web-icon" @error="item.icon = false" />
+          <view v-if="item.title" class="title">{{item.title}}</view>
+        </view>
+        <view class="content">
+          <view v-if="item.description" class="description">{{item.description}}</view>
+          <image v-if="item.thumbnail" class="web-thumbnail" :src="item.thumbnail" mode="widthFix"
+            @error="item.thumbnail = false" />
+        </view>
+        <view class="link-box" v-if="item.url">
+          <uni-link class="link" :href="item.url" color="#007fff" :text="item.url"></uni-link>
+          <uni-im-icons @click="copy(item.url)" class="copy" code="e67e"></uni-im-icons>
+        </view>
+      </view> -->
+  </view>
+</template>
+
+<script>
+  import uniIm from '@/uni_modules/uni-im/sdk/index.js';
+  export default {
+    props: {
+      msg: {
+        type: Object,
+        default: () => {
+          return {
+            reader_list: [],
+            body: []
+          }
+        }
+      }
+    },
+    data() {
+      return {
+        webInfoList: []
+      }
+    },
+    async mounted() {
+      // let aList = this.msg.body.filter(item => item.name == 'a')
+      //                           // .filter(item => {
+      //                           //   return item.attrs && item.attrs.href &&
+      //                           //    item.attrs.href.includes('dcloud.net.cn') ||
+      //                           //    item.attrs.href.includes('dcloud.io')
+      //                           // })
+      // // console.log('aList',aList)
+      // for(let i = 0; i < aList.length; i++){
+      //   const uniImCo = uniCloud.importObject("uni-im-co",{customUI:true})
+      //   let res = await uniImCo.getWebInfo(aList[i].attrs.href)
+      //   // console.log('getWebInfo',res.data)
+      //   res.data.url = aList[i].attrs.href
+      //   if(res.data.title){
+      //     res.data.title = getStr(res.data.title, 60)
+      //     res.data.description = getStr(res.data.description, 60)
+      //   // // 取字符串的前20个字符，如果超出加...
+      //    function getStr(str='', len) {
+      //      if (str.length > len) {
+      //        return str.substring(0, len) + "...";
+      //      } else {
+      //        return str;
+      //      }
+      //    }
+      //     this.webInfoList.push(res.data)
+      //   }
+      // }
+    },
     computed: {
+      currentUid() {
+        return uniIm.currentUser._id
+      },
       isSingeImg() {
         return this.msg.body.filter(item => item.name != 'img' && item.text || item?.attrs?.class === "nickname" ).length === 0
-      },
-      imgList() {
-        return this.msg.body.filter(item => item.name == 'img').map(item => item.attrs.src)
-      },
-      isFromSelf() {
-        return this.msg.from_uid === uniCloud.getCurrentUserInfo().uid
-      },
-      trBody() {
-        if (
-          this.webInfoList.length === 1 &&
-          this.msg.body.filter(i => !(i.type === 'text' && i.text === ' ')).length === 1 &&
-          this.webInfoList[0].url === this.msg.body[0].attrs.href
-        ) {
-          // 只有一个链接，且链接的地址和消息体的地址一样，则不显示消息体
-          return []
-        } else {
-          return this.msg.body.map(node => {
-            if (node.name == 'span' && node.attrs && node.attrs.class == 'nickname' && node.attrs.user_id) {
-              // 改写/设置 nickname
-              node.children = [{
-                type: 'text',
-                text: '@' + this.getNicknameByUid(node.attrs.user_id)
-              }]
-              // 设置是否已读
-              node.isRead = this.msg.reader_list ? this.msg.reader_list.find(item => item.user_id == node.attrs.user_id) : false
-            }
-            return node
-          })
-        }
+      },
+      imgList() {
+        return this.msg.body.filter(item => item.name == 'img').map(item => item.attrs.src)
+      },
+      isFromSelf() {
+        return this.msg.from_uid === this.currentUid
+      },
+      trBody() {
+        if (
+          this.webInfoList.length === 1 &&
+          this.msg.body.filter(i => !(i.type === 'text' && i.text === ' ')).length === 1 &&
+          this.webInfoList[0].url === this.msg.body[0].attrs.href
+        ) {
+          // 只有一个链接，且链接的地址和消息体的地址一样，则不显示消息体
+          return []
+        } else {
+          return this.msg.body.map(node => {
+            if (node.name == 'span' && node.attrs && node.attrs.class == 'nickname' && node.attrs.user_id) {
+              // 改写/设置 nickname
+              node.children = [{
+                type: 'text',
+                text: '@' + this.getNicknameByUid(node.attrs.user_id)
+              }]
+              if(node.attrs.user_id == '__ALL'){
+                delete node.isRead
+              }else{
+                // 设置是否已读
+                node.isRead = this.msg.reader_list ? this.msg.reader_list.find(item => item.user_id == node.attrs.user_id) : false
+              }
+            }
+            return node
+          })
+        }
       },
       canPrivateChat() {
         if(this.uniIDHasRole('staff')){
           return true
         }
         const {conversation_id,from_uid} = this.msg
-        const {group_member} = uniIm.conversation.getCached(conversation_id)
-        return group_member ? group_member[from_uid]?.role.includes('admin') : false
-      }
-    },
-    methods: {
-      getNicknameByUid(uid) {
-        let users = uniIm.users[uid]
-        if (users) {
-          return users.nickname
-        } else {
-          return ''
-        }
-      },
-      previewImage(src) {
-        uni.previewImage({
-          urls: this.imgList,
-          current: src
-        })
-      },
-      copy(text) {
-        uni.setClipboardData({
-          data: text,
-          success: () => {
-            uni.showToast({
-              title: '复制成功',
-              icon: 'none'
-            })
-          }
-        })
+        const {group_member} = uniIm.conversation.find(conversation_id)
+        return group_member ? group_member.find(from_uid)?.role.includes('admin') : false
+      }
+    },
+    methods: {
+      trText(str) {
+        // TODO：临时方案，解决 \n 被转义的问题
+        return str.replace(/\\n/g, "\\\\n")
+      },
+      getNicknameByUid(uid) {
+        if(uid === "__ALL"){
+          return "所有人"
+        }
+        return uniIm.users.getNickname(uid);
+      },
+      async previewImage(src) {
+        const urls = []
+        for (let i = 0; i < this.imgList.length; i++) {
+          const url = await uniIm.utils.getTempFileURL(this.imgList[i])
+          urls.push(url)
+        }
+        src = await uniIm.utils.getTempFileURL(src)
+        uni.previewImage({
+          urls,
+          current: src
+        })
+      },
+      copy(text) {
+        uni.setClipboardData({
+          data: text,
+          success: () => {
+            uni.showToast({
+              title: '复制成功',
+              icon: 'none'
+            })
+          }
+        })
       },
       privateChat(user_id) {
-        if (this.canPrivateChat) {
+        if (this.canPrivateChat &&  user_id != '__ALL') {
           uniIm.toChat({
             user_id,
             source:{
@@ -165,18 +181,22 @@
             }
           })
         }
-      }
-    }
-  }
-</script>
-
+      }
+    }
+  }
+</script>
+
 <style lang="scss">
 .uni-im-rich-text {
-  display: inline-block;
+  // todo: 由于web端首页引入的sass热更新不能影响组件样式，导致baseStyle.scss的样式使用了 deep，导致这里需要加 !important
+  display: inline-block!important;
   background-color: #fff;
   padding: 10px;
   border-radius: 10px;
   max-width: 100%;
+  &.isFromSelf {
+    background-color: #c9e7ff;
+  }
   /* #ifdef H5 */
   @media screen and (min-device-width:960px) {
     .img {
@@ -205,10 +225,6 @@
     word-break: break-all;
   }
   
-  .isFromSelf {
-    background-color: #c9e7ff !important;
-  }
-  
   .only1u {
     padding: 0;
     .web-info {
@@ -228,14 +244,20 @@
   
    .nickname {
     color: #0b65ff;
-    margin: 0 2px;
-    font-size: 15px;
+    padding: 1px 4px;
+    font-size: 14px;
+  }
+  .isCallMe {
+    color: #FFF;
+    background-color: #0080ff;
+    border-radius: 5px;
+    margin-right: 4px;
   }
   
-   .isRead {
+   .read-state {
     position: relative;
-    top: -3px;
-    margin-right: 3px;
+    top: -5px;
+    
   }
   
   .isSingeImg {
diff --git a/components/uni-im-msg/types/sound.vue b/components/uni-im-msg/types/sound.vue
index 6ab549ab98ed661c6b93d93be1551bb87deb9e0d..3ca043c95714b5311761832c098484c6c62e9867 100644
--- a/components/uni-im-msg/types/sound.vue
+++ b/components/uni-im-msg/types/sound.vue
@@ -1,98 +1,98 @@
-<template>
-  <view class="text selfText sound-box" :class="{reverse:!self}" :style="{width:soundBoxWidth}" @click="playSound">
-    <text class="sound-time">
-      {{ msg.body.time }}''
-    </text>
-    <view class="sound-icon-box" :class="{rotate:!self}">
-      <image v-if="soundPlayState" src="@/uni_modules/uni-im/static/sound-ing.gif" style="width: 18px;height: 18px;"
-        mode="widthFix" />
-      <uni-im-icons v-else :class="{'sound-icon-active':soundPlayState}" code="e6f5" size="18px" color="#000000" />
-    </view>
-  </view>
-</template>
-
-<script>
+<template>
+  <view class="text selfText sound-box" :class="{reverse:!self}" :style="{width:soundBoxWidth}" @click="playSound">
+    <text class="sound-time">
+      {{ msg.body.time }}''
+    </text>
+    <view class="sound-icon-box" :class="{rotate:!self}">
+      <image v-if="soundPlayState" src="@/uni_modules/uni-im/static/sound-ing.gif" style="width: 18px;height: 18px;"
+        mode="widthFix" />
+      <uni-im-icons v-else :class="{'sound-icon-active':soundPlayState}" code="e6f5" size="18px" color="#000000" />
+    </view>
+  </view>
+</template>
+
+<script>
   import uniIm from '@/uni_modules/uni-im/sdk/index.js';
-  let audioContext = uniIm.audioContext;
+  let audioContext = uniIm.audioContext;
   export default {
     data() {
       return {
         soundPlayState: 0
       }
-    },
-    props: {
-      msg: {
-        type: Object,
-        default () {
-          return {
-            from_uid: '',
-            body: {
-              time: 0
-            }
-          }
-        }
-      },
-      soundBoxWidth: {
-        type: String,
-        default: '100px'
-      }
-    },
-    computed: {
-      self() {
-        return this.msg.from_uid === uniCloud.getCurrentUserInfo().uid
-      }
+    },
+    props: {
+      msg: {
+        type: Object,
+        default () {
+          return {
+            from_uid: '',
+            body: {
+              time: 0
+            }
+          }
+        }
+      },
+      soundBoxWidth: {
+        type: String,
+        default: '100px'
+      }
+    },
+    computed: {
+      self() {
+        return this.msg.from_uid === uniIm.currentUser._id
+      }
     },
     beforeCreate() {
       audioContext = uniIm.audioContext;
-    },
-    mounted() {
-      this.onPlay = async () => {
-        console.log('soundPlayStart------------------',this.msg.body);
-        let currentAudioUrl = await uniIm.utils.getTempFileURL(this.msg.body.url)
-        let src = audioContext.src
-        if (src == currentAudioUrl) {
-          this.soundPlayState = 1
-        } else {
-          this.soundPlayState = 0
-        }
+    },
+    mounted() {
+      this.onPlay = async () => {
+        console.log('soundPlayStart------------------',this.msg.body);
+        let currentAudioUrl = await uniIm.utils.getTempFileURL(this.msg.body.url)
+        let src = audioContext.src
+        if (src == currentAudioUrl) {
+          this.soundPlayState = 1
+        } else {
+          this.soundPlayState = 0
+        }
+      }
+      audioContext.onPlay(this.onPlay);
+      this.soundPlayEnd = () => {
+        // console.log('soundPlayEnd------------------');
+        this.soundPlayState = 0
       }
-      audioContext.onPlay(this.onPlay);
-      this.soundPlayEnd = () => {
-        // console.log('soundPlayEnd------------------');
-        this.soundPlayState = 0
-      }
-      audioContext.onPause(this.soundPlayEnd);
-      audioContext.onStop(this.soundPlayEnd);
-      audioContext.onEnded(this.soundPlayEnd);
-      audioContext.onError(this.soundPlayEnd);
+      audioContext.onPause(this.soundPlayEnd);
+      audioContext.onStop(this.soundPlayEnd);
+      audioContext.onEnded(this.soundPlayEnd);
+      audioContext.onError(this.soundPlayEnd);
     },
     destroyed() {
-      console.log('unmounted');
-      audioContext.offPlay(this.onPlay);
-      audioContext.offPause(this.soundPlayEnd);
-      audioContext.offStop(this.soundPlayEnd);
-      audioContext.offEnded(this.soundPlayEnd);
-      audioContext.offError(this.soundPlayEnd);
-    },
-    methods: {
-      async playSound() {
-        audioContext.src = await uniIm.utils.getTempFileURL(this.msg.body.url)
-        // 下一个事件循环执行
-        setTimeout(() => {
-          // console.log(78998797,audioContext);
-          if (this.soundPlayState === 1) {
-            // console.log('播放中，执行关闭');
-            audioContext.stop()
-          } else {
-            audioContext.stop()
-            audioContext.play();
-          }
-        }, 0)
+      console.log('unmounted');
+      audioContext.offPlay(this.onPlay);
+      audioContext.offPause(this.soundPlayEnd);
+      audioContext.offStop(this.soundPlayEnd);
+      audioContext.offEnded(this.soundPlayEnd);
+      audioContext.offError(this.soundPlayEnd);
+    },
+    methods: {
+      async playSound() {
+        audioContext.src = await uniIm.utils.getTempFileURL(this.msg.body.url)
+        // 下一个事件循环执行
+        setTimeout(() => {
+          // console.log(78998797,audioContext);
+          if (this.soundPlayState === 1) {
+            // console.log('播放中，执行关闭');
+            audioContext.stop()
+          } else {
+            audioContext.stop()
+            audioContext.play();
+          }
+        }, 0)
       }
-    }
-  }
-</script>
-
+    }
+  }
+</script>
+
 <style lang="scss">
 .sound-box {
   /* #ifdef H5 */
@@ -133,5 +133,5 @@
     transition-delay: 0.1s;
     transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
   }
-}
+}
 </style>
\ No newline at end of file
diff --git a/components/uni-im-msg/types/system.vue b/components/uni-im-msg/types/system.vue
index 780ca90f1762482f2b19f167a1241ff5b494c15a..25967cffae645f21d7a10293fb07a35538a1e911 100644
--- a/components/uni-im-msg/types/system.vue
+++ b/components/uni-im-msg/types/system.vue
@@ -12,8 +12,7 @@
   export default {
     data() {
       return {
-        content: false,
-        create_time:false
+        create_time:0
       }
     },
     props: {
@@ -27,49 +26,50 @@
     computed: {
       friendlyTime() {
         return uniIm.utils.toFriendlyTime(this.create_time || this.msg.create_time || this.msg.client_create_time)
-      }
-    },
-    watch: {
-      msg: {
-        handler: async function (msg, oldMsg) {
-          if(msg.action.indexOf("update-group-info-") === 0){
-            const key = Object.keys(msg.body.updateData)[0]
-            const value = msg.body.updateData[key];
-            if (key ==  "notification"){
-              this.content = value.content
-              this.create_time = value.create_time
-            }else if(key ==  "avatar_file"){
-              this.content = "群聊头像已更新"// 已在 msg-list 组件隐藏此类型消息
-            }
-            // mute_all_members 
-            else if(key ==  "mute_all_members"){
-              this.content = value ? "已开启“全员禁言”" : "已关闭“全员禁言”"
-            } else{
-              this.content = {
-                "name":" 群聊名称",
-                "introduction":"群简介"
-              }[key] + "已更新为：" + value
-            }
-          }else if( ["join-group","group-exit","group-expel"].includes(msg.action) ){
-            let nicknameList = (await uniIm.users.get(msg.body.user_id_list)).map(item => item.nickname)
-            let actionName = {
-              "join-group":"加入群聊",
-              "group-exit":"退出群聊",
-              "group-expel":"被踢出群聊"
-            }[msg.action];
-            this.content = nicknameList.join(' , ') + actionName
-          }else if(msg.action === "group-dissolved"){
-            this.content = '此群聊已被解散'
-          }else if(msg.action === "set-group-admin"){
-            const {user_id,addRole,delRole} = msg.body
-            const nickname = (await uniIm.users.get(user_id)).nickname
-            this.content = `已将"${nickname}"${addRole.includes("admin") ? "添加为群管理员" : "从群管理员中移除"}`
-          }else{
-            this.content = msg.body
+      },
+      content(){
+        const msg = this.msg
+        if(msg.action.indexOf("update-group-info-") === 0){
+          const key = Object.keys(msg.body.updateData)[0]
+          const value = msg.body.updateData[key];
+          if (key ==  "notification"){
+            this.create_time = value.create_time
+            return value.content
+          }else if(key ==  "avatar_file"){
+            return "群聊头像已更新"// 已在 msg-list 组件隐藏此类型消息
+          }
+          // mute_all_members 
+          else if(key ==  "mute_all_members"){
+            return value ? "已开启“全员禁言”" : "已关闭“全员禁言”"
+          } else{
+            return {
+              "name":" 群聊名称",
+              "introduction":"群简介"
+            }[key] + "已更新为：" + value
           }
-        },
-        deep: true,
-        immediate: true
+        }else if( ["join-group","group-exit","group-expel"].includes(msg.action) ){
+          const nicknameList = []
+          msg.body.user_id_list.forEach(async (user_id) => {
+            const nickname = uniIm.users.getNickname(user_id)
+            // console.log(nickname)
+            nicknameList.push(nickname)
+          })
+          let actionName = {
+            "join-group":"加入群聊",
+            "group-exit":"退出群聊",
+            "group-expel":"被踢出群聊"
+          }[msg.action];
+          return nicknameList.join(' , ') + actionName
+        }else if(msg.action === "group-dissolved"){
+          return '此群聊已被解散'
+        }else if(msg.action === "set-group-admin"){
+          const {user_id,addRole,delRole} = msg.body
+          const nickname = uniIm.users.getNickname(user_id)
+          // console.log(nickname)
+          return `已将"${nickname}"${addRole.includes("admin") ? "添加为群管理员" : "从群管理员中移除"}`
+        }else{
+          return msg.body
+        }
       }
     },
     async mounted() {}
diff --git a/components/uni-im-msg/types/text.vue b/components/uni-im-msg/types/text.vue
index 8be6ba4d9ac67383e9d979bbe957ad7ed8581b6d..2705606d7755547cad87c689c8d6bef98b1ccad2 100644
--- a/components/uni-im-msg/types/text.vue
+++ b/components/uni-im-msg/types/text.vue
@@ -1,54 +1,60 @@
 <template>
   <view class="msg-text-box" :class="{self}">
-    <msgRichText v-if="htmlNodes.length" :msg="{...msg,...{'body':htmlNodes}}" />
-    <text v-else class="msg-text" :decode="true" space="ensp">{{ msg.body }}</text>
-  </view>
-</template>
-
-<script>
+    <msgRichText v-if="htmlNodes.length" :msg="{...msg,...{'body':htmlNodes}}" />
+    <text v-else class="msg-text" :decode="true" space="ensp">{{ trText(msg.body) }}</text>
+  </view>
+</template>
+
+<script>
   import uniIm from '@/uni_modules/uni-im/sdk/index.js';
-  import msgRichText from './rich-text.vue'
-  export default {
-    components: {
-      msgRichText,
-    },
-    props: {
-      msg: {
-        type: Object,
-        default () {
-          return {
-            body: ""
-          }
-        }
-      }
-    },
-    data() {
+  import msgRichText from './rich-text.vue'
+  export default {
+    components: {
+      msgRichText,
+    },
+    props: {
+      msg: {
+        type: Object,
+        default () {
+          return {
+            body: ""
+          }
+        }
+      }
+    },
+    data() {
       return {
         htmlNodes: []
-      }
-    },
-    computed: {
-      self() {
-        return this.msg.from_uid === uniCloud.getCurrentUserInfo().uid
-      },
+      }
+    },
+    computed: {
+      self() {
+        return this.msg.from_uid === uniIm.currentUser._id
+      },
+    },
+    methods: {
+      trText(str) {
+        // TODO：临时方案，解决 \n 被转义的问题
+        return str.replace(/\\n/g, "\\\\n")
+      },
     },
     watch: {
       "msg.body": {
         handler() {
-          let htmlString = this.msg.body.replace(/</g, "&lt;").replace(/>/g, "&gt;")
-          // 将字符串的url转换为链接
+          let htmlString = this.msg.body.replace(/</g, "&lt;").replace(/>/g, "&gt;")
+          // 将字符串的url转换为链接
           htmlString = uniIm.utils.replaceUrlToLink(htmlString)
           
-          /* 如需要自己补：
-          // 手机号正则
-          const regPhone = /(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}/g;
-          htmlString = htmlString.replace(regPhone, " <a href='tel:$&'>$&</a>")
-          // 固定电话正则
-          const regTel = /(([0\+]\d{2,3}-)?(0\d{2,3})-)(\d{7,8})(-(\d{3,}))?/g;
-          htmlString = htmlString.replace(regTel, " <a href='tel:$&'>$&</a>")
-          // 邮箱正则
-          const regMail = /([a-z0-9._-]+@[a-z0-9.-]+\.[a-z]{2,4})/ig;
-          htmlString = htmlString.replace(regMail, " <a href='mailto:$&'>$&</a>")
+          /* 如需要自己补：
+          // 手机号正则
+          const regPhone = /(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}/g;
+          htmlString = htmlString.replace(regPhone, " <a href='tel:$&'>$&</a>")
+          // 固定电话正则
+          const regTel = /(([0\+]\d{2,3}-)?(0\d{2,3})-)(\d{7,8})(-(\d{3,}))?/g;
+          htmlString = htmlString.replace(regTel, " <a href='tel:$&'>$&</a>")
+          // 邮箱正则
+          const regMail = /([a-z0-9._-]+@[a-z0-9.-]+\.[a-z]{2,4})/ig;
+          htmlString = htmlString.replace(regMail, " <a href='mailto:$&'>$&</a>")
           */
           
           if (this.msg.body != htmlString) {
@@ -74,14 +80,14 @@
         },
         immediate: true
       }
-    },
-    mounted() {},
-  }
-</script>
-
-<style lang="scss">
-  .msg-text-box {
-    border-radius: 10px;
+    },
+    mounted() {},
+  }
+</script>
+
+<style lang="scss">
+  .msg-text-box {
+    border-radius: 10px;
     background-color: #FFFFFF;
     min-width: 30px;
     flex-shrink: 1;
@@ -100,5 +106,5 @@
       /* #endif */
     }
   }
-  
+  
 </style>
\ No newline at end of file
diff --git a/components/uni-im-msg/types/userinfo-card.vue b/components/uni-im-msg/types/userinfo-card.vue
index bdbbdc8b6b5bd033cd83161669afc00ab3434257..38ea285c7abb15fe0fd6b1d1dfc7d5e8984053cf 100644
--- a/components/uni-im-msg/types/userinfo-card.vue
+++ b/components/uni-im-msg/types/userinfo-card.vue
@@ -1,11 +1,11 @@
 <template>
 <view class="msg-userinfo-card" @click="onClick">
-  <cloud-image
+  <uni-im-img
     class="avatar"
     width="40px"
     height="40px"
     border-radius="5px"
-    :src="avatarUrl||'/uni_modules/uni-im/static/avatarUrl.png'"
+    :src="avatarUrl"
     mode="widthFix"
   />
   <text
@@ -35,14 +35,14 @@ export default {
 
   data() {
     return {
-      avatarUrl:{},
+      avatarUrl:'',
       nickname:'[...加载中]',
     };
   },
   async mounted() {
     let user = await uniIm.users.get(this.msg.body.user_id) || {}
     this.avatarUrl = user.avatar_file?.url ?? '/uni_modules/uni-im/static/avatarUrl.png'
-    this.nickname = this.msg.nickname || user.nickname
+    this.nickname = user.nickname
   },
   methods: {
     onClick() {
diff --git a/components/uni-im-msg/types/video.vue b/components/uni-im-msg/types/video.vue
index c1f835eb8003103ba1cdd97e4b838243bc35257e..c339c0d4e5e83c828d9f1045f4fea8a9893fdede 100644
--- a/components/uni-im-msg/types/video.vue
+++ b/components/uni-im-msg/types/video.vue
@@ -8,6 +8,7 @@
 
 <script>
   import uniIm from '@/uni_modules/uni-im/sdk/index.js';
+  import config from '@/uni_modules/uni-im/common/config.js';
   export default {
     props: {
       msg: {
@@ -58,8 +59,20 @@
             // #endif
           }else{
             // 文件存储的服务商
-            let storageProvider = this.msg.body.url.substring(0, 8) == "cloud://" ? 'tencent' : 'aliyun'
-            this.videoPoster = this.videoUrl + (storageProvider == 'aliyun' ? '?x-oss-process=video/snapshot,t_1000,f_jpg,w_200,m_fast,ar_auto':'?imageView2/0/w/200')
+            const {provider} = config.cloudFile
+            switch (provider){
+              case 'aliyun':
+                this.videoPoster = this.videoUrl + '?x-oss-process=video/snapshot,t_1000,f_jpg,w_200,m_fast,ar_auto'
+                break;
+              case 'tencent':
+                this.videoPoster = this.videoUrl + '?imageView2/0/w/200'
+                break;
+              case 'qiniu':
+                this.videoPoster = this.videoUrl + '?vframe/jpg/offset/1/w/200'
+                break;
+              default:
+                break;
+            }
           }
         },
         deep: true,
@@ -85,39 +98,37 @@
   }
 </script>
 
-<style>
+<style lang="scss">
   .video-box {
     /* #ifdef H5 */
     cursor: pointer;
     /* #endif */
     width: 200rpx;
     height: 200rpx;
-    position: relative;
-  }
-  
-  .video-img {
-    width: 200rpx;
-    height: 200rpx;
-  }
-  
-  .play-video-icon {
-    position: absolute;
-    width: 35px;
-    height: 35px;
-    top: 35px;
-    left: 35px;
-    border-radius: 50%;
-    border: 2px solid #FFF;
-    justify-content: center;
-    align-items: center;
-    background-color: rgba(0, 0, 0, 0.2);
-    box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
+    position: relative;
+    .video-img {
+      width: 200rpx;
+      height: 200rpx;
+    }
+    .video-box-mark {
+      position: absolute;
+      top: 0;
+      left: 0;
+      background-color: rgba(0, 0, 0, 0.1);
+    }
+    .play-video-icon {
+      position: absolute;
+      top: calc(50% - 17.5px);
+      left: calc(50% - 17.5px);
+      width: 35px;
+      height: 35px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-radius: 50%;
+      border: 2px solid #FFF;
+      background-color: rgba(0, 0, 0, 0.2);
+      box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
+    }
   }
-  
-  .video-box-mark {
-    position: absolute;
-    top: 0;
-    left: 0;
-    background-color: rgba(0, 0, 0, 0.1);
-  }
 </style>
\ No newline at end of file
diff --git a/components/uni-im-msg/uni-im-msg.vue b/components/uni-im-msg/uni-im-msg.vue
index cf7de00d464793434a7060c2a7b023712878a3bf..a448bdc90c02694b3b805d14ee5344b1f9a7cf0e 100644
--- a/components/uni-im-msg/uni-im-msg.vue
+++ b/components/uni-im-msg/uni-im-msg.vue
@@ -2,10 +2,8 @@
   <view v-if="!msg.is_delete" class="uni-im-msg" :class="{self}">
     <msg-system v-if="msg.type === 'system'" class="system-msg-box" :msg="msg" />
     <template v-else>
-      <view v-if="!noTime" class="friendlyTime">
-        <text class="format-time-text" :class="{'dup-format-time-text':equalPrevTime}">
-          {{ friendlyTime }}
-        </text>
+      <view v-if="!noTime" class="friendlyTime" :class="{'hide':equalPrevTime}">
+        <uni-im-friendly-time :time="msg.create_time || msg.client_create_time"></uni-im-friendly-time>
       </view>
       <view class="msg-box">
         <view v-if="msg.is_revoke" class="revoke-text-box">
@@ -22,30 +20,34 @@
           </text>
         </view>
         <template v-else>
-          <cloud-image ref="avatar" width="40px" height="40px" border-radius="5px"
-            :src="avatarUrl||'/uni_modules/uni-im/static/avatarUrl.png'" mode="widthFix"
+          <uni-im-img class="avatar" ref="avatar" width="40px" height="40px" border-radius="5px"
+            :src="avatarUrl" mode="widthFix"
             :class="{'pointer':canPrivateChat}"
             @click.stop="toChat" @longpress.stop="longpressMsgAvatar" />
           <view class="msg-main">
             <view v-if="!self" class="nickname-box">
-              <text :selectable="true" class="nickname" @click="longpressMsgAvatar">{{ msg.nickname || users.nickname }}</text>
-              <text class="isFromAdmin" v-if="isFromAdmin">管理员</text>
+              <text :selectable="true" class="nickname" :class="{noPreview:!preview}" @click="longpressMsgAvatar">{{nickname}}</text>
+              <text :selectable="true" class="real_name" v-if="real_name" @click="showRealName">{{real_name}}</text>
+              <text class="badge" v-if="isFromAdmin">管理员</text>
+              <template v-for="(item,index) in extMsgBadge" :key="index">
+                <component :is="item.component" v-bind="item.props"></component>
+              </template>
             </view>
             
-            <view v-if="msg.about_msg_id" class="cite-box">
+            <view v-if="msg.about_msg_id && !preview" class="cite-box">
               <template v-if="aboutMsg.body">
                 <text v-if="aboutMsg.is_revoke" class="cite-box-text">
                   回复的消息已被撤回
                 </text>
                 <text v-else class="cite-box-text" :class="{'pointer':!noJump}" @click="showAboutMsg">
-                  {{ getNicknameByUid(aboutMsg.from_uid) }}：{{ aboutMsg.body }}
+                  {{ getNickname(aboutMsg.from_uid) }}：{{aboutMsgNote}}
                 </text>
               </template>
               <text v-else class="cite-box-text">
                 [加载中]
               </text>
             </view>
-            <view class="msg-content-box" @longpress="showControl">
+            <view class="msg-content-box" @longpress.prevent="showControl">
               <uni-icons v-if="self && msg.state != 100 && msgStateIcon" :color="msg.state===0?'#999':'#d22'"
                 :type="msgStateIcon" class="msgStateIcon" @click="retriesSendMsg" />
               <component :is="'msg-'+msg.type" :class="'msg-'+msg.type" class="msg-content" ref="msg-content" :msg="msg"
@@ -74,9 +76,6 @@
 </template>
 
 <script>
-  import {
-    store as uniIdStore,
-  } from '@/uni_modules/uni-id-pages/common/store'
   import uniIm from '@/uni_modules/uni-im/sdk/index.js';
   // 导入各类型的消息组件
   import msgSystem from './types/system.vue'
@@ -89,8 +88,11 @@
   import msgText from './types/text.vue'
   import msgSound from './types/sound.vue'
   import msgImage from './types/image.vue'
+  import msgOrder from './types/order.vue'
+  import msgPayNotify from './types/pay-notify.vue'
+  import msgEncryption from './types/encryption.vue'
 
-  import { markRaw } from 'vue'
+  import { markRaw,computed } from 'vue'
 
 /**
  * uni-im-msg 组件，渲染一条消息。
@@ -120,7 +122,10 @@
       msgCode,
       msgText,
       msgSound,
-      msgImage
+      msgImage,
+      msgOrder,
+      msgPayNotify,
+      msgEncryption
     },
     props: {
       msg: {
@@ -137,14 +142,6 @@
           return false
         }
       },
-      avatar_file: {
-        type: [Object, String, Boolean],
-        default () {
-          return {
-            url: "/uni_modules/uni-im/static/avatarUrl.png"
-          }
-        }
-      },
       index: {
         type: Number
       },
@@ -162,15 +159,15 @@
         type: Boolean,
         default: false
       },
+      preview: { // 是否预览模式
+        type: Boolean,
+        default: false,
+      }
     },
-    emits: ['viewMsg', 'showControl', 'showMsgById','loadMore','longpressMsgAvatar','putChatInputContent'],
+    emits: ['viewMsg', 'showControl', 'showMsgById','longpressMsgAvatar','putChatInputContent','intoTopic','retriesSendMsg'],
     data() {
-      let currentUser = {
-        user_id: uniCloud.getCurrentUserInfo().uid,
-        isInternalUser: this.uniIDHasRole('staff'),
-      }
       // 调用扩展点，正在渲染一条消息，扩展程序可以返回扩展组件，为该消息增加一些显示元素。
-      let extraComponents = uniIm.extensions.invokeExts('msg-extra', this.msg, currentUser)
+      const extraComponents = this.preview ? {} : uniIm.extensions.invokeExts('msg-extra', this.msg)
         .filter(result => result && result.component)
         .map(result => {
           return {
@@ -179,9 +176,7 @@
             handlers: result.handlers || {},
           }
         })
-
       return {
-        nickname: "用户名",
         videoUrl: '',
         soundPlayState: 0,
         aboutMsg: {},
@@ -189,61 +184,66 @@
       };
     },
     computed: {
+      extMsgBadge(){
+        return uniIm.extensions.invokeExts('msg-badge', this)
+          .filter(result => result && result.component)
+          .map(result => {
+            return {
+              component: markRaw(result.component),
+              props: result.props || {},
+              handlers: result.handlers || {},
+            }
+          })
+      },
       currentConversation() {
-        return uniIm.conversation.getCached(this.msg.conversation_id)
+        if(this.preview) return false
+        return uniIm.conversation.find(this.msg.conversation_id)
       },
-      friendlyTime() {
-        let time = this.msg.create_time || this.msg.client_create_time
-        // 使得时间会随着心跳动态更新
-        time = time + uniIm.heartbeat * 0
-        return uniIm.utils.toFriendlyTime(time)
+      currentUid() {
+        return uniIm.currentUser._id
       },
       users() {
-        return uniIm.users[this.msg.from_uid] || {}
+        const users = uniIm.users[this.msg.from_uid]
+        return users?.__loading ? null : users
       },
       msgStateIcon() {
-        switch (this.msg.state) {
-          case 0:
-            // 发送中
-            return 'spinner-cycle'
-            break;
-          case -100:
-            // 发送失败
-            return 'refresh-filled'
-            break;
-          case -200:
-            // 禁止发送（内容不合法）
-            return 'info-filled'
-            break;
-          default:
-            return false
-            break;
+        return {
+          "0": 'spinner-cycle',
+          "-100": 'refresh-filled',
+          "-200": 'info-filled',
+        }[this.msg.state]
+      },
+      aboutMsgNote() {
+        if(this.aboutMsg.from_uid){
+          return uniIm.utils.getMsgNote(this.aboutMsg)
+        }else{
+          return '加载中...'
         }
       },
       isFromAdmin() {
-        const conversation = uniIm.conversation.getCached(this.msg.conversation_id)
-        return conversation?.group_id && conversation.group_member[this.msg.from_uid]?.role?.includes('admin')
+        if(this.preview) return false
+        const conversation = uniIm.conversation.find(this.msg.conversation_id)
+        return conversation?.group_id && conversation.group.member.find(this.msg.from_uid)?.role?.includes('admin')
+      },
+      nickname() {
+        return this.users?.nickname || this.msg.nickname || uniIm.users.getNickname(this.msg.from_uid)
       },
-      mineId() {
-        return uniCloud.getCurrentUserInfo().uid
+      real_name() {
+        return uniIm.users[this.msg.from_uid]?.realname_auth?.real_name
       },
       avatarUrl() {
-        if (this.self) {
-          // console.error('uniIdStore.userInfo',uniIdStore.userInfo)
-          return uniIdStore.userInfo.avatar_file?.url
-        } else {
-          return this.users.avatar_file?.url
-        }
+        return (this.self ? uniIm.currentUser.avatar_file?.url : this.users?.avatar_file?.url || this.msg?.avatar_file?.url) || '/uni_modules/uni-im/static/avatarUrl.png'
       },
       soundBoxWidth() {
         return uni.upx2px(750 / 60 * this.msg.body.time) + 50 + 'px'
       },
       canPrivateChat(){
-        const conversation = uniIm.conversation.getCached(this.msg.conversation_id)
-        const currentUserId = uniCloud.getCurrentUserInfo().uid;
+        if(this.preview) return false
+        const conversation = uniIm.conversation.find(this.msg.conversation_id)
+        const currentMember = conversation.group?.member?.find(this.currentUid)
         // 当前登录的账号是管理员，或者是群管理员，或者当前消息是群管理员发的
         return this.uniIDHasRole('staff') || 
-               conversation.group_member?.[currentUserId]?.role?.includes('admin') || 
+               currentMember?.role?.includes('admin') || 
                this.isFromAdmin
       }
     },
@@ -273,13 +273,8 @@
       // #endif
     },
     methods: {
-      getNicknameByUid(uid) {
-        let users = uniIm.users[uid]
-        if (users) {
-          return users.nickname
-        } else {
-          return ''
-        }
+      getNickname(uid) {
+        return uniIm.users.getNickname(uid)
       },
       showAboutMsg() {
         this.$emit('showMsgById', this.aboutMsg._id)
@@ -341,13 +336,13 @@
         }
       },
       async initAboutMsg() {
+        if (this.preview) return
         // 处理引用消息
         const {
           about_msg_id
         } = this.msg
         if (about_msg_id) {
-          const _aboutMsg = this.currentConversation.msgList.find(i => i._id == about_msg_id) || false
-          let aboutMsg = JSON.parse(JSON.stringify(_aboutMsg))
+          let aboutMsg = this.currentConversation.msg.find(about_msg_id) || false
           // 本地不存在联网查找
           if (!aboutMsg) {
             const db = uniCloud.database();
@@ -371,13 +366,46 @@
               return
             }
           }
-          aboutMsg.body = uniIm.utils.getMsgNote(aboutMsg)
           this.aboutMsg = aboutMsg
         }
       },
-      putChatInputContent() {
-        this.$emit('putChatInputContent', JSON.parse(JSON.stringify(this.msg.before_revoke_body)))
-      }
+      async putChatInputContent() {
+        const msgBody = JSON.parse(JSON.stringify(this.msg.before_revoke_body))
+        if(msgBody.url){
+          msgBody.url = await uniIm.utils.getTempFileURL(msgBody.url)
+        }else if(Array.isArray(msgBody)){
+          for (let i = 0; i < msgBody.length; i++) {
+            if (msgBody[i].name === 'img') {
+              msgBody[i].attrs.src = await uniIm.utils.getTempFileURL(msgBody[i].attrs.src)
+            }
+          }
+        }
+        this.$emit('putChatInputContent', msgBody)
+      },
+      showRealName() {
+        if(!uniIm.isWidescreen){
+          uni.showModal({
+            title: '企业名称',
+            content: this.real_name,
+            showCancel: true,
+            confirmText: '复制',
+            cancelText: '关闭',
+            success: (res) => {
+              if (res.confirm) {
+                uni.setClipboardData({
+                  data: this.real_name,
+                  success: () => {
+                    uni.showToast({
+                      title: '复制成功',
+                      icon: 'none'
+                    })
+                  }
+                })
+              }
+            }
+          });
+        }
+      },
     }
   }
 </script>
@@ -394,10 +422,6 @@
     &,& > * {
       cursor: default;
     }
-    .file-msg-box,
-    .cloud-image {
-      cursor: pointer;
-    }
     /* #endif */
     .msg-main {
       margin: 0 8px;
@@ -448,35 +472,65 @@
   .nickname-box {
     flex-direction: row;
     align-items: center;
-  }
-  
-  .nickname {
-    font-size: 13px;
-    color: #666666;
-    padding-left: 2px;
+    width: 100%;
+    .nickname {
+      font-size: 14px;
+      color: #666666;
+      padding-left: 2px;
+    }
+    .real_name {
+      font-size: 12px;
+      color: #999;
+      padding:0 4px;
+      background-color: #FFF;
+      border-radius: 2px;
+      box-shadow: 0 0 2px #ddd;
+      margin-left: 3px;
+      position: relative;
+      bottom: 2px;
+      // 溢出隐藏，且显示省略号
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      &::before {
+        content: "\eab8";
+        color: #fd7e08;
+        font-size: 10px;
+        margin-right: 2px;
+        font-family: uni-im-icons;
+      }
+    }
+    .badge {
+      position: relative;
+      bottom: 2px;
+      font-size: 12px;
+      color: #FFFFFF;
+      background-color: #1ab94d;
+      padding: 1px 3px;
+      border-radius: 2px;
+      // 缩小字体
+      transform: scale(0.8);
+      &.grey {
+        background-color: #bbb;
+      }
+    }
   }
   
   /* #ifdef H5 */
-  .nickname-box .nickname:hover {
-    color: #0b65ff;
-    cursor: pointer;
-  }
-  .nickname-box .nickname:hover::after {
-    content: '@';
-    margin-left: 3px;
+  .nickname-box {
+    .nickname.noPreview{
+      &:hover {
+        color: #0b65ff;
+        cursor: pointer;
+        &::after {
+          content: '@';
+          margin-left: 3px;
+        }
+      }
+    }
   }
   /* #endif */
   
-  .isFromAdmin {
-    font-size: 14px;
-    color: #FFFFFF;
-    background-color: #1ab94d;
-    padding: 2px 3px;
-    border-radius: 2px;
-    transform: scale(0.7);
-    margin-left: -4px;
-  }
-  
   .rich-text {
     background-color: transparent;
     width: 500rpx;
@@ -518,20 +572,14 @@
     height: 22px;
   }
   
-  .format-time-text {
-    font-size: 12px;
-    text-align: center;
-    color: #999999;
-    line-height: 22px;
-  }
-  
   /* #ifdef H5 */
-  .dup-format-time-text {
+  .hide .format-time-text {
     display: none;
   }
-  &:hover .dup-format-time-text {
-    display: unset;
+  &:hover .hide .format-time-text {
+    display: flex;
   }
+  
   .pointer {
     cursor: pointer;
   }
diff --git a/components/uni-im-share-msg/uni-im-share-msg.vue b/components/uni-im-share-msg/uni-im-share-msg.vue
index 534ac9c64bb0e4cfa90ea7974bb6a1990a9aeb38..f82c246410b2e363b276c34a7d01bf311950c460 100644
--- a/components/uni-im-share-msg/uni-im-share-msg.vue
+++ b/components/uni-im-share-msg/uni-im-share-msg.vue
@@ -125,8 +125,8 @@ export default {
       this.merge = merge;
 
       this.msgList = msgList.map(msg => {
-        let {body,from_uid,type,conversation_id,create_time,group_id} = msg;
-        let data = {body,from_uid,type,conversation_id,create_time,group_id};
+        let data = Object.assign({},msg);
+        delete data._id
         if (!merge) {
           // 如果不是合并转发，则删除会话id和群id
           data.conversation_id = '';
@@ -170,7 +170,7 @@ export default {
           "to_uid": friend_uid,
           conversation_id,
           group_id,
-          "from_uid": uniCloud.getCurrentUserInfo().uid,
+          "from_uid": uniIm.currentUser._id,
           "state": 0,
           "client_create_time": Date.now(),
           "is_read": false,
@@ -207,9 +207,9 @@ export default {
       this.close();
       async function sendMsgToConversation(conversation, msg) {
         // 插到消息列表
-        conversation.msgList.push(msg);
+        msg = conversation.msg.add(msg);
         // 保存到本地数据库
-        await conversation.msgManager.localMsg.add(msg);
+        // await conversation.msgManager.localMsg.add(msg);
         const uniImCo = uniCloud.importObject("uni-im-co");
         await uniImCo.sendMsg(msg)
           .then(async e => {
@@ -217,7 +217,6 @@ export default {
             msg.state = e.errCode === 0 ? 100 : -100;
             msg.create_time = e.data.create_time;
             msg._id = e.data._id;
-            await updateMsg(msg)
           })
           .catch(async e => {
             uni.showModal({
@@ -229,19 +228,8 @@ export default {
             // 必须要有create_time的值，否则indexDB通过创建时间索引找不到数据
             msg.create_time = Date.now();
             msg.state = -200;
-            await updateMsg(msg)
           });
       }
-      async function updateMsg(msg) {
-        const conversation = await uniIm.conversation.get(msg.conversation_id);
-        // console.log('conversation', conversation);
-        let index = conversation.msgList.findIndex(_msg => _msg.unique_id == msg.unique_id)
-        if (index === -1) {
-          throw 'updateMsg msg 不存在'
-        }
-        conversation.msgList.splice(index, 1, Object.assign({}, msg))
-        conversation.msgManager.localMsg.update(msg.unique_id, msg)
-      }
     }
   }
 }
@@ -288,11 +276,6 @@ export default {
     border-right: 1px solid #eee;
   }
 
-  .conversation-list-box ::v-deep .conversation-list {
-    max-height: calc(70vh - 60px) !important;
-    height: calc(70vh - 60px) !important;
-  }
-
   .conversation-list-box ::v-deep .conversation-list .refresh-box {
     background-color: #fff;
   }
diff --git a/components/uni-im-sound/uni-im-sound.vue b/components/uni-im-sound/uni-im-sound.vue
index 90fb7337487eab6a70c9bce3bc251aaef4709b33..5a5b9f282f39a1f5d8f2dd0400405308043ba04d 100644
--- a/components/uni-im-sound/uni-im-sound.vue
+++ b/components/uni-im-sound/uni-im-sound.vue
@@ -61,7 +61,7 @@
 					});
 					uniCloud.uploadFile({
 						filePath:res.tempFilePath,
-						cloudPath:'uni-im/' + uniCloud.getCurrentUserInfo().uid + '/sound/' + Date.now() + '.mp3',
+						cloudPath:'uni-im/' + uniIm.currentUser._id + '/sound/' + Date.now() + '.mp3',
 						// fileType:"audio",
 						success: (e) => {
 							// console.log('uniCloud.uploadFile-sendSoundMsg',e,'sendSoundMsg',{"url":e.fileID,time:this.time});
diff --git a/components/uni-im-view-msg/uni-im-view-msg.vue b/components/uni-im-view-msg/uni-im-view-msg.vue
index 7172cf52ad0c9fd3362a34585adb5629bb35c1c2..e9cc72a9f34b871f17d2421ce5e41e8d6f343101 100644
--- a/components/uni-im-view-msg/uni-im-view-msg.vue
+++ b/components/uni-im-view-msg/uni-im-view-msg.vue
@@ -12,17 +12,20 @@
       <view class="close" @click="close">
         <uni-icons
           type="clear"
-          size="25px"
+          size="20px"
           color="#ccc"
         />
       </view>
     </view>
-    <scroll-view :scroll-y="true" class="content">
-      <uni-im-msg
-        v-for="(msg,index) in msgList"
-        :key="index"
-        :msg="msg"
-      />
+    <scroll-view :scroll-y="true" class="scroll-view">
+      <view class="scroll-content">
+        <uni-im-msg
+          v-for="(msg,index) in msgList"
+          :key="index"
+          :msg="msg"
+          :preview="true"
+        />
+      </view>
     </scroll-view>
   </view>
 </view>
@@ -41,11 +44,9 @@ export default {
     open(msgList) {
       this.showMsgList = true;
       this.msgList = msgList;
-      // document.getElementById('dialog').showModal();
     },
     close() {
       this.showMsgList = false;
-      // document.getElementById('dialog').close();
       this.msgList = [];
     }
   }
@@ -54,68 +55,50 @@ export default {
 
 <style lang="scss">
 .uni-im-view-msg {
-  position: absolute;
+  position: fixed !important;
   top: 0;
   left: 0;
-  z-index: 20;
-  width: 100vw;
-  height: 100vh;
-  max-width: 100vw !important;
-  max-height: 100vh !important;
+  z-index: 10;
+  width: 100%;
+  height: 100%;
   background-color: rgba(0, 0, 0, .5);
   .msg-list {
-    background-color: #fff;
-    top: 25%;
-  }
-  /* #ifdef H5 */
-  @media screen and (min-device-width:960px) {
-    .msg-list {
-      position: fixed;
-      width: 600px;
-      left: calc(50% - 300px);
-    }
-  }
-  /* #endif */
-  
-  .msg-list .header {
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-    border-bottom: 1px solid #eee;
-    background-color: rgba(250, 250, 250, 1);
-    padding: 10px;
-  }
-  
-  .msg-list .header .close {
-    cursor: pointer;
-  }
-  
-  .msg-list .title {
-    font-size: 20px;
-    color: #333;
-  }
-  
-  .msg-list .content {
-    padding: 10px;
-    height: 400px;
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    overflow: hidden;
+    border-radius: 10px;
     background-color: rgba(245, 245, 245, 1);
-  }
-  /* #ifdef H5 */
-  @media screen and (min-device-width:960px) {
-    .msg-list .content ::v-deep * {
-      max-height: none !important;
+    height: unset !important;
+    padding-bottom: 10px;
+    .header {
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
+      border-bottom: 1px solid #eee;
+      padding: 10px;
+      .close {
+        cursor: pointer;
+      }
     }
-    #dialog {
-      border-radius: 10px;
-      border: none;
-      padding: 0;
+    .title {
+      font-size: 16px;
+      color: #333;
     }
-    //  关闭 #dialog选中时的蓝色边框
-    #dialog:focus {
-      display: none;
+    .scroll-view {
+      height: 400px;
+      .scroll-content {
+        margin: 10px;
+      }
     }
-    #dialog::backdrop {
-      background: rgba(0, 0, 0, .5);
+  }
+  /* #ifdef H5 */
+  @media screen and (min-device-width:960px) {
+    .msg-list {
+      position: relative;
+      width: 60%;
+      top: 25%;
+      left: 20%;
     }
   }
   /* #endif */
diff --git a/package.json b/package.json
index 8d1301c17434b3e87f7722eb27d9cd771ec00cc8..56b87821a4522a1863fc1b5d720e97abca345a11 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-im",
 	"displayName": "uni-im",
-	"version": "3.1.6",
+	"version": "3.0.4",
 	"description": "uni-im是云端一体的、全平台的、免费的、开源即时通讯系统",
 	"keywords": [
         "im,即时通讯,客服,聊天"
diff --git a/pages/chat/chat-filtered.vue b/pages/chat/chat-filtered.vue
index 3c56ab970c1cf396d9780f62019e860867dd0f0d..650b999c0c0545f2ec606806146cd7aa38d91b10 100644
--- a/pages/chat/chat-filtered.vue
+++ b/pages/chat/chat-filtered.vue
@@ -1,14 +1,15 @@
-<template>
-  <!-- 设置导航栏标题，如与谁对话，群人数为几人等 -->
-  <page-meta v-if="!isWidescreen">
-     <navigation-bar :title="navTitle" background-color="#f8f8f8" front-color="#000000" />
-  </page-meta>
-  <text v-else style="position: absolute;top: 25px;left: 15px;" :selectable="true">{{ navTitle }}</text>
-
+  <template>
   <view class="chat-filtered">
+    <!-- #ifdef H5 -->
+    <!-- web-pc端会话标题 设置导航栏标题，如与谁对话，群人数为几人等 -->
+    <text v-if="isWidescreen" id="web-pc-chat-title" :selectable="true">{{navTitle}}</text>
+    <!-- #endif -->
+    
     <view class="head">
-      <view v-if="count == 0 && loading" class="hint">正在加载……</view>
-      <view v-else class="hint">{{ count }} 条与“{{ keyword }}”相关的聊天记录</view>
+      <view class="hint">
+        <template v-if="count == 0 && loading">正在加载……</template>
+        <template v-else>{{ count }} 条与“{{ keyword }}”相关的聊天记录</template>
+      </view>
       <view
         v-if="conversation_id"
         class="enter-chat"
@@ -18,35 +19,38 @@
         进入会话
       </view>
     </view>
+    
     <scroll-view
       class="message-list"
       scroll-y
       :scroll-into-view="autoScrollToEl"
       @scrolltoupper="onScrollToUpper"
     >
-      <uni-im-msg
-        v-for="msg in msgList"
-        :key="msg._id"
-        :id="`msg-${msg._id}`"
-        :msg="msg"
-        no-time
-        no-jump
-        @loadMore="cb => cb()"
-      >
-        <view class="float-info">
-          <view>{{ toFriendlyTime(msg) }}</view>
-          <view class="enter-fragment" @click="onOpenFragment(msg)">查看上下文</view>
-        </view>
-      </uni-im-msg>
-      <view id="bottom-el" style="height: 1px;"></view>
+      <view>
+        <uni-im-msg
+          v-for="msg in msgList"
+          :key="msg._id"
+          :id="`msg-${msg._id}`"
+          :msg="msg"
+          no-time
+          no-jump
+          @loadMore="cb => cb()"
+        >
+          <view class="float-info">
+            <view>{{ toFriendlyTime(msg) }}</view>
+            <view class="enter-fragment" @click="onOpenFragment(msg)">查看上下文</view>
+          </view>
+        </uni-im-msg>
+        <view id="bottom-el" style="height: 1px;"></view>
+      </view>
     </scroll-view>
-
+    
     <chat-fragment
       v-if="fragment"
       :entry="fragment"
       @close="onCloseFragment"
     />
-  </view>
+</view>
 </template>
 
 <script>
@@ -61,7 +65,7 @@
     customUI: true
   })
   import uniIm from '@/uni_modules/uni-im/sdk/index.js'
-  import ChatFragment from './cmp/chat-fragment'
+  import ChatFragment from './components/chat-fragment'
 
   export default {
     components: {
@@ -89,7 +93,7 @@
       navTitle() {
         let title = this.conversation.title
         if (this.conversation.group_id) {
-          title += `(${Object.keys(this.conversation.group_member).length})`;
+          title += `(${this.conversation.group.member.count()})`;
         }
         return title
       }
@@ -166,16 +170,10 @@
 <style lang="scss">
 @import "@/uni_modules/uni-im/common/baseStyle.scss";
 .chat-filtered {
+  height: 0;
   flex: 1;
-  height: 100%;
+  flex-grow: 1 !important;
   background-color: #efefef;
-  /* #ifdef H5 */
-  .pc {
-    // .pc内的元素只有pc端打开才显示，样式在index页面
-    display: none;
-  }
-  /* #endif */
-  
   .head {
     flex-direction: row;
     justify-content: space-between;
@@ -184,28 +182,24 @@
     padding: 0px 15px;
     font-size: 12px;
     border-bottom: 1px solid #ddd;
+    .hint {
+      color: #999;
+    }
+    .enter-chat {
+      flex-direction: row;
+      padding: 0 5px;
+      /* #ifdef H5 */
+      cursor: pointer;
+      &:hover {
+        background-color: #ddd;
+      }
+      /* #endif */
+    }
   }
   
-  .hint {
-    color: #999;
-  }
-  
-  .enter-chat {
-    /* #ifdef H5 */
-    cursor: pointer;
-    /* #endif */
-    flex-direction: row;
-    padding: 0 5px;
-  }
-  
-  /* #ifdef H5 */
-  .enter-chat:hover {
-    background-color: #ddd;
-  }
-  /* #endif */
-  
   .message-list {
-    height: calc(100% - 30px);
+    height: 1px;
+    flex: 1;
   }
   
   .uni-im-msg ::v-deep .msg-content {
diff --git a/pages/chat/chat.vue b/pages/chat/chat.vue
index e321ba84e0e79b4379bad800363ae2d6d7d52650..7ffedb2a2c54cce29130ecaf37f23f57a1ab2372 100644
--- a/pages/chat/chat.vue
+++ b/pages/chat/chat.vue
@@ -2,7 +2,12 @@
   <view id="uni-im-chat" class="uni-im-chat" :class="{'pc':isWidescreen}">
     <!-- #ifdef H5 -->
     <!-- web-pc端会话标题 -->
-    <text v-if="isWidescreen" id="web-pc-chat-title" :selectable="true">{{navTitle}}</text>
+    <view v-if="isWidescreen" id="web-pc-chat-title">
+      <text :selectable="true">{{navTitle}}</text>
+      <template v-for="(item,index) in extChatTitle" :key="index">
+        <component :is="item.component" v-bind="item.props"></component>
+      </template>
+    </view>
     <!-- H5端 左上角显示未读消息数 ，app端使用setTitleNViewButtonBadge设置，小程序端暂未支持-->
     <view @click="tapUnreadCount" class="unread_count" v-if="unread_count != 0">
       {{ unread_count > 99 ? '99+' : unread_count }}
@@ -15,26 +20,27 @@
       @retriesSendMsg="retriesSendMsg" class="msg-list"
       @clickItem="onclickMsgList" @putChatInputContent="putChatInputContent" :chooseMore="chooseMoreMsg"
       :checkedMsgList.sync="checkedMsgList"
+      @showMenberList="showMenberList"
     ></uni-im-msg-list>
     
     <!-- 聊天数据输入框 键盘弹出后要抬高底部内边距 全面屏的安全距离 -->
     <text v-if="conversation.leave" class="disable-chat-foot">- 你不是此群成员 -</text>
     <text v-else-if="conversation.isMuteAllMembers" class="disable-chat-foot">-  全群禁言禁止输入 -</text>
-    <view v-else class="chat-foot">
+    <view v-else class="chat-foot" @touchmove.prevent>
       <uni-im-chat-input
         ref="chat-input"
         v-model="chatInputContent"
         :keyboardMaxHeight="keyboardMaxHeight"
         :keyboardHeight="keyboardHeight"
-        @showAboutMenber="showAboutMenber"
         @confirm="chatInputConfirm"
         @input="onInput"
         @sendSoundMsg="sendSoundMsg"
         @sendCodeMsg="beforeSendMsg"
+        @showMenberList="showMenberList"
       >
         <template #about-msg>
           <view class="answer-msg" v-if="answerMsg !== false">
-            <text class="answer-msg-text">{{getNicknameByUid(answerMsg.from_uid)}}：{{answerMsgNote(answerMsg)}}</text>
+            <text class="answer-msg-text">{{answerMsgNickname}}：{{answerMsgNote}}</text>
             <uni-icons class="close-icon" @click="answerMsg = false" type="clear" color="#ccc" size="18px"></uni-icons>
           </view>
         </template>
@@ -75,29 +81,10 @@
       </view>
     </view>
 
-    <msg-popup-control ref="msg-popup-control" @answer="setAnswerMsg" @share="shareMsg" @chooseMore="chooseMoreMsg = true;checkedMsgList = $event"></msg-popup-control>
-
-    <template v-if="aboutMenberIsShow && (isWidescreen ? memberList.length != 0 : 1 )">
-      <view class="member-list-mark" @click.stop="aboutMenberIsShow = false"></view>
-      <view class="member-list-box">
-        <view class="head">
-          <view class="close">
-            <uni-icons @click="aboutMenberIsShow = false" type="back" color="#000" size="12px"></uni-icons>
-          </view>
-          <text class="title">选择提醒的人</text>
-        </view>
-        <uni-search-bar v-if="!isWidescreen" v-model="aboutUserKeyword" placeholder="搜索" cancelButton="none" class="search" />
-        <scroll-view class="member-list" :scroll-y="true" :scroll-top="memberListScrollTop" :show-scrollbar="true">
-          <view v-for="(item,index) in memberList" :key="item._id" class="member-list-item"
-            :class="{'member-list-item-active':callAboutUid == item.users._id}" @mouseover="callAboutUid = item.users._id"
-            @click="setCallAboutUid(item.users._id)" :id="'a'+item.users._id">
-            {{item.users.nickname}}
-          </view>
-          <view class="null-about-menber-tip" v-if="memberList.length === 0">没有与"{{aboutUserKeyword}}"相关成员</view>
-        </scroll-view>
-      </view>
-    </template>
+    <msg-popup-control ref="msg-popup-control" @answer="setAnswerMsg" @intoTopic="intoTopic" @share="shareMsg" @chooseMore="chooseMoreMsg = true;checkedMsgList = $event"></msg-popup-control>
 
+    
+    <uni-im-member-list ref="member-list" :conversationId="conversation.id"></uni-im-member-list>
 
     <!-- #ifdef H5 -->
     <uni-im-share-msg id="uni-im-share-msg" ref="share-msg"></uni-im-share-msg>
@@ -105,9 +92,7 @@
     
     
     <view style="position: fixed;top: 200px;left: 0;background-color: #FFFFFF;z-index: 9999;">
-      <!-- aboutMenberIsShow：{{aboutMenberIsShow}}-
-      keyboardMaxHeight:{{keyboardMaxHeight}}
-      aboutUserKeyword:{{aboutUserKeyword}}-
+      <!-- keyboardMaxHeight:{{keyboardMaxHeight}}
 			conversation.leave:{{conversation.leave}}
       chatInputContent:{{chatInputContent}}
 			keyboardHeight:{{keyboardHeight}}
@@ -123,15 +108,6 @@
   import msgPopupControl from '@/uni_modules/uni-im/components/uni-im-msg/popup-control.vue';
   import {markRaw} from "vue";
 
-  import {
-    store as uniIdStore
-  } from '@/uni_modules/uni-id-pages/common/store';
-  
-
-  let shiftKeyPressed = false;
-  let lastKeyDown = ""
-  let currentCursor = ''
-
 /**
  * chat 组件，渲染一个完整的会话，包括头部、消息列表、输入区。
  * 
@@ -141,7 +117,7 @@
  */
   export default {
     components: {
-      msgPopupControl
+      msgPopupControl,
     },
     data() {
       return {
@@ -155,12 +131,6 @@
         keyboardHeight: 0,
         keyboardMaxHeight: 0,
         answerMsg: false,
-        callAboutUid: false,
-        aboutMenberIsShow: false,
-        inputCursor: '',
-        // @用户时的搜索词
-        aboutUserKeyword: '',
-        memberListScrollTop: 0,
         chooseMoreMsg: false,
         checkedMsgList: [],
         // 聊天输入框内容
@@ -175,7 +145,7 @@
       // #endif
     },
     computed: {
-      ...uniIm.mapState(['currentConversationId', 'conversationDatas', 'isWidescreen', 'systemInfo']),
+      ...uniIm.mapState(['currentConversationId', 'isWidescreen', 'systemInfo']),
       unread_count() {
         // 所有会话的未读消息数
         const unreadCount = uniIm.conversation.unreadCount()
@@ -190,43 +160,31 @@
 
         return unreadCount
       },
-      group_member() {
-        let group_member = this.conversation.group_member
-        if (!this.callAboutUid && typeof group_member == 'object') {
-          this.callAboutUid = Object.keys(this.conversation.group_member)[0]
-        }
-        return group_member
+      //当前用户自己的uid
+      current_uid() {
+        return uniIm.currentUser._id;
       },
-      memberList() {
-        // 当前输入框已经@了的用户id 要过滤掉 
-        let callUidList = this.getCallUid()
-        
-        let group_member = this.group_member || {}
-        let memberList = []
-        for (let key in group_member) {
-          let member = group_member[key]
-          if(member.users.nickname){
-            let nickname = member.users.nickname.toLowerCase()
-            if (nickname.indexOf(this.aboutUserKeyword.toLowerCase()) != -1 && !callUidList.includes(member.users._id)) {
-              memberList.push(member)
-            }
-          }
-        }
-        if (memberList.length) {
-          // 按昵称排序
-          memberList.sort((a, b) => {
-            return a.users.nickname.localeCompare(b.users.nickname)
-          })
-          this.callAboutUid = memberList[0].users._id
-          return memberList
-        } else {
-          // 注意：没有数据时也不需要隐藏aboutMenberIsShow，因为用户可能回删@用户的关键词
+      extChatTitle(){
+        if(this.conversation){
+          return uniIm.extensions
+            .invokeExts("chat-title",this.conversation)
+            .filter((result) => result && result.component)
+            .map((result) => {
+              return {
+                component: markRaw(result.component),
+                props: result.props||{}
+              };
+            });
+        }else{
           return []
         }
       },
-      //当前用户自己的uid
-      current_uid() {
-        return uniIdStore.userInfo._id;
+      answerMsgNote() {
+        return uniIm.utils.getMsgNote(this.answerMsg)
+      },
+      answerMsgNickname() {
+        // 兼容旧版本，消息中未包含用户最新的昵称，需要通过用户id获取
+        return this.answerMsg.nickname || uniIm.users.getNickname(this.answerMsg.from_uid)
       }
     },
     created() {
@@ -237,14 +195,10 @@
           return console.log('uniIm isDisabled')
         }
         //获取透传内容
-        const {
-          type,
-          data
-        } = res.data.payload;
+        const { data } = res.data.payload;
         //判断消息类型是否为im，且为当前页面对应会话消息
         if (
-          type == "uni-im" 
-          && data.conversation_id == this.currentConversationId 
+          data.conversation_id == this.currentConversationId 
           && data.from_uid != this.current_uid 
           && uniIm.utils.isReadableMsg(data)
         ) {
@@ -264,16 +218,6 @@
       
       // 优化 提前拿到键盘高度，防止第一次在会话点击输入框时，输入框抬起慢。（缺省值300，是为了解决模拟器调试没有键盘高度而设置）
       this.keyboardMaxHeight = uniIm.keyboardMaxHeight || 300
-
-      // #ifdef H5
-      //通过监听窗口变化 获取键盘弹出或收起事件
-      window.addEventListener('resize', () => {
-        if (this.currentConversationId) {
-          this.showLast(0);
-        }
-      })
-      // #endif
-
       this.onKeyboardHeightChange = ({
         height
       }) => {
@@ -286,129 +230,88 @@
           this.showLast();
         });
       }
-      // #ifndef H5
-      // 监听键盘高度变化显示最后一条消息
-      uni.onKeyboardHeightChange(this.onKeyboardHeightChange);
-      // #endif
-      
       // #ifdef H5
       const oldWindowHeight = window.innerHeight;
       window.onresize = ()=>{
         this.onKeyboardHeightChange({"height": oldWindowHeight - window.innerHeight})
       }
       // #endif
+      // #ifndef H5
+      // 监听键盘高度变化显示最后一条消息
+      uni.onKeyboardHeightChange(this.onKeyboardHeightChange);
+      // #endif
     },
     mounted() {
       // #ifdef H5
-      // 以下为实现拖拽或粘贴图片至聊天页面，直接发送的逻辑
-      const chatBodyDom = document.getElementById("uni-im-chat")
-      // 阻止默认事件
-      chatBodyDom.addEventListener(
-        'dragover',
-        function(event) {
-          event.preventDefault();
-        },
-        false
-      );
-      // 拖拽结束时触发
-      chatBodyDom.addEventListener(
-        'drop',
-        e => {
-          //取消默认浏览器拖拽效果
-          e.preventDefault();
-          //获取文件对象
-          let fileList = e.dataTransfer.files;
-          if (fileList.length == 0) {
-            return false;
-          }
-          const [file] = fileList
-          let fileType = file.type.split('/')[0] || 'file'
-          if (fileType === 'image') {
-            let blobUrl = window.URL.createObjectURL(file);
-            if(this.chatInputContent === ''){
-              this.$refs["chat-input"].setContent(`<img src="${blobUrl}" />`)
-            }else{
-              this.$refs["chat-input"].addHtmlToCursor(`<img src="${blobUrl}" />`)
+      if(this.isWidescreen){
+        // 以下为实现拖拽或粘贴图片至聊天页面，直接发送的逻辑
+        const chatBodyDom = document.getElementById("uni-im-chat")
+        // 阻止默认事件
+        chatBodyDom.addEventListener(
+          'dragover',
+          function(event) {
+            event.preventDefault();
+          },
+          false
+        );
+        // 拖拽结束时触发
+        chatBodyDom.addEventListener(
+          'drop',
+          e => {
+            //取消默认浏览器拖拽效果
+            e.preventDefault();
+            //获取文件对象
+            let fileList = e.dataTransfer.files;
+            if (fileList.length == 0) {
+              return false;
             }
-            return false; // 拖拽图片内容进入输入框先不发送
-          }
-          // 其他文件类型，直接发送
-          let {
-            name,
-            size
-          } = file
-          // console.log(78979798,fileList);
-          const blobUrl = window.URL.createObjectURL(file);
-          this.uploadFileAndSendMsg({
-              tempFiles:[{
-                size,
-                name,
-                path:blobUrl,
-                fileType
-              }]
-          })
-        },
-        false
-      );
-
-      const chatInput = document.querySelector('.pc .uni-im-editor');
-      if (chatInput) {
-        //键盘按下时
-        let oldValue = ''
-        chatInput.addEventListener('keydown',async e => {
-          if (this.aboutMenberIsShow) {
-            if(e.key == 'Enter'){
-              if(this.memberList.length){
-                console.log('选中要@的人')
-                this.setCallAboutUid(this.callAboutUid)
-              }
-            }else if(["ArrowUp", "ArrowDown"].includes(e.key)){
-              console.log('上下箭头选择@谁')
-              let index = this.memberList.findIndex(i => i.users._id == this.callAboutUid)
-              // console.log('index',index);
-              if (e.key == "ArrowUp") {
-                index--
-              } else {
-                index++
-              }
-              if (index < 0 || index > this.memberList.length - 1) {
-                index = 0
+            const [file] = fileList
+            let fileType = file.type.split('/')[0] || 'file'
+            if (fileType === 'image') {
+              let blobUrl = window.URL.createObjectURL(file);
+              if(this.chatInputContent === ''){
+                this.$refs["chat-input"].setContent({html:`<img src="${blobUrl}" />`})
+              }else{
+                this.$refs["chat-input"].addHtmlToCursor(`<img src="${blobUrl}" />`)
               }
-              this.callAboutUid = this.memberList[index].users._id
-              // 防止选中的成员看不到，触发滚动
-              this.memberListScrollTop = (index - 3) * 50
-              // console.log('this.memberListScrollTop',this.memberListScrollTop);
-              e.preventDefault();
-            }else if(["ArrowLeft", "ArrowRight"].includes(e.key)){
-              this.aboutMenberIsShow = false
-            }else if(e.key == 'Backspace'){
-              setTimeout(() => {
-                // 获取e.target 元素内不包含在标签内的文字内容
-                let newValue = e.target.innerText
-                console.log('删除键',newValue,oldValue);
-                // 拿到newValue 和 oldValue 中 包含的@字符的个数
-                let newAtN = newValue.replace(/[^@]/g, "").length
-                let oldAtN = oldValue.replace(/[^@]/g, "").length
-                if(newAtN === 0 || newAtN < oldAtN){
-                  console.log('删除了@成员的昵称');
-                  this.aboutMenberIsShow = false
-                }
-                oldValue = newValue
-              }, 0);
+              return false; // 拖拽图片内容进入输入框先不发送
             }
-          }
+            // 其他文件类型，直接发送
+            let {
+              name,
+              size
+            } = file
+            // console.log(78979798,fileList);
+            const blobUrl = window.URL.createObjectURL(file);
+            this.uploadFileAndSendMsg({
+                tempFiles:[{
+                  size,
+                  name,
+                  path:blobUrl,
+                  fileType
+                }]
+            })
+          },
+          false
+        );
+        const chatInput = document.querySelector('.pc .uni-im-editor');
+        chatInput.addEventListener('keydown',async e => {
+          this.$refs['member-list'].onChatInputKeydown(e)
         })
       }
-      
       // #endif
     },
     onShow() {
+      // TODO:解决 previewImage 误触发onShow的问题
+      if(uniIm.ext._previewImageIsOpen){
+        return
+      }
       if (this.conversation.id) {
         // 用于打开会话窗口后，切换到后台，再切回时设置当前会话id。
         uniIm.currentConversationId = this.conversation.id
-
         // 用于从后台切到前台时，设置当前会话为已读
-        this.clearConversationUnreadCount()
+        this.clearUnreadCount();
+        this.updateNavTitle()
       }
     },
     onUnload() {
@@ -422,67 +325,62 @@
       // #endif
       
       //页面销毁之前销毁 全局变量 正在聊天的用户的id
-      uniIm.currentConversationId = false
+      uniIm.currentConversationId = ''
       // console.log('beforeDestroy');
       // 关闭sound播放
       uniIm.audioContext.stop()
     },
     beforeDestroy() {
       //页面销毁之前销毁 全局变量 正在聊天的用户的id
-      uniIm.currentConversationId = false
+      uniIm.currentConversationId = ''
       // console.log('beforeDestroy');
       // 关闭sound播放
       uniIm.audioContext.stop()
     },
     onHide() {
-      uniIm.currentConversationId = false
+      // TODO:解决 previewImage 误触发onHide的问题
+      if(uniIm.ext._previewImageIsOpen){
+        return
+      }
+      uniIm.currentConversationId = ''
       // 关闭sound播放
       uniIm.audioContext.stop()
     },
-    async onLoad(param) {
+    onLoad(param) {
       for (const key in param) {
         try{
           param[key] = JSON.parse(param[key])
         }catch(_){}
       }
       //调用load方法，因为pc宽屏时本页面是以组件形式展示。如$refs.chatView.loadconversation_id()执行
-      await this.load(param);
+      this.load(param)
     },
     onBackPress(e) {
-      console.log('onBackPress',e);
-      if(this.aboutMenberIsShow){
-        this.aboutMenberIsShow = false
+      // console.log('onBackPress',e);
+      const memberListRef = this.$refs['member-list']
+      if(memberListRef.isShow){
+        memberListRef.hide()
         return true
       }
     },
     watch: {
       // 监听群昵称变化
-      'conversation.title':{
-        handler(){
-          this.updateNavTitle()
-        },
-        deep:true,
-        immediate:true
+      'conversation.title'(){
+        this.updateNavTitle()
       },
       // 监听群成员数变化
-      'conversation.group_member':{
-        handler(){
-          this.updateNavTitle()
-        },
-        deep:true,
-        immediate:true
+      'conversation.group.member_count'(){
+        this.updateNavTitle()
       }
     },
     methods: {
       async load(param) {
         this.answerMsg = false
-        // conversation_id = "single_eff0518ad35e16a8a025cc8af03e0388"
         if(this.conversation.id){
-          // 设置（含清空）上一个会话的chatInputContent 实现多个会话之间的草稿功能
+          // 设置上一个会话的chatInputContent 实现多个会话之间的草稿功能
           this.conversation.chatInputContent = this.chatInputContent
         }
 
-        // console.log('conversation_id',conversation_id);
         this.conversation = await uniIm.conversation.get(param)
         // 初始化会话的chatInputContent
         this.chatInputContent = this.conversation.chatInputContent
@@ -492,9 +390,9 @@
 
         //设置全局的app当前正在聊天的会话id（注：本页面可能是直达页）
         uniIm.currentConversationId = this.conversation.id
-        this.$nextTick(() => {
+        setTimeout(() => {
           this.$refs['msg-list'].init()
-        })
+        }, 0);
 
         // console.log('this.conversation',this.conversation);
         
@@ -505,7 +403,7 @@
         // }*/
         
         // 清除当前会话未读数
-        this.clearConversationUnreadCount()
+        this.clearUnreadCount();
         
         // #ifdef H5
         if(this.isWidescreen){
@@ -516,11 +414,6 @@
         }
         // #endif
       },
-      clearConversationUnreadCount(){
-        if(this.conversation.unread_count){
-          this.conversation.clearUnreadCount();
-        }
-      },
       onclickMsgList(){
         this.$refs["chat-input"]?.setShowMore(false)
         uni.hideKeyboard()
@@ -528,21 +421,6 @@
       putChatInputContent(value){
         this.$refs["chat-input"]?.setContent(value)
       },
-      getNicknameByUid(uid) {
-        let users = uniIm.users[uid]
-        if (users) {
-          return users.nickname
-        } else {
-          return ''
-        }
-      },
-      answerMsgNote(answerMsg) {
-        return uniIm.utils.getMsgNote(answerMsg)
-      },
-      onChatInputFocus() {
-        // console.log('onChatInputFocus');
-        this.$refs["chat-input"]?.focus()
-      },
       uploadFileAndSendMsg({tempFiles}){
         // console.log(res, 'image');
         // console.log('this.uploadFileAndSendMsg res',res);
@@ -589,11 +467,10 @@
           try{
             const result = await uniCloud.uploadFile({
               filePath: tempFile.path,
-              cloudPath: Date.now() + uniCloud.getCurrentUserInfo().uid + '.' + name.split('.').pop(),
+              cloudPath: Date.now() + this.current_uid + '.' + name.split('.').pop(),
             });
             // console.log('result.fileID',result.fileID);
             msg.body.url = result.fileID
-            await this.updateMsg(msg)
             this.sendMsg(msg)
           }catch(e){
             console.error('uploadFile error:',e)
@@ -608,11 +485,6 @@
           'image':()=>{
             uni.chooseImage({
             	// count:9,
-              crop:{
-                "quality":100,
-                "width":800,
-                "height":800
-              },
             	// sourceType,
             	// extension,
             	success:res=> beforeUploadFileAndSendMsg(res,'image'),
@@ -684,53 +556,74 @@
       },
       onInput(e) {
         // console.log('onInput',e.data);
-        // 记录按下@之后的内容
-        const enterText = e.data
-        if(this.aboutMenberIsShow && enterText && enterText != '@'){
-          setTimeout(()=>{
-            // 输入法正在输入中
-            let isComposing = false
-            // #ifdef H5
-            // isComposing = this.isWidescreen ? document.querySelector('#uni-im-chat-input').isComposing : e.isComposing
-            // #endif
-            if (isComposing) {
-              console.log('输入法正在输入中')
-            }else{
-              this.aboutUserKeyword += enterText
-            }
-          },0)
-        }else{
-          this.aboutUserKeyword = ""
+        // #ifndef MP
+        if(this.conversation.group_id && e.data == "@"){
+          // 非小程序的群聊才支持@功能
+          uni.hideKeyboard()
+          this.showMenberList({
+            confirm:userId=> {
+              this.setCallAboutUid(userId)
+            },
+            filter:member=>!this.getCallUid().includes(member.users._id)
+          })
         }
-        
+        // #endif
+        // 成员列表内实现：在被显示时，监听输入框的输入，以实现搜索功能等
+        this.$refs['member-list'].onChatInput(e)
+      },
+      intoTopic(msgId){
+        this.$refs['msg-list'].intoTopic(msgId)
       },
       async setAnswerMsg(msgId) {
-        this.answerMsg = this.conversation.msgList.find(msg => msg._id == msgId)
+        this.answerMsg = this.conversation.msg.find(msgId)
         this.$refs["chat-input"]?.focus()
+        const {from_uid} = this.answerMsg
+        if (this.conversation.group && from_uid != this.current_uid) {
+          this.setCallAboutUid(from_uid,false)
+        }
       },
       async chatInputConfirm() {
-        if(this.aboutMenberIsShow && this.memberList.length){
+        const $mr = this.$refs['member-list']
+        if($mr.isShow && $mr.memberList.length){
           console.log('正在执行选中要@的人，不发送数据')
           return
         }
         if (typeof this.chatInputContent == 'object'){
           // 富文本（图文混排、@某人）消息
-          // 把字符串中带url的链接转为html的a标签的形式。1.将字符串，按是否为标签，切割为数组
-          const htmlStr = this.chatInputContent.html.split(/(<[^>]+>)/)
-                  // 2.找到不以<开头的字符串内的url并替换为 html的a
-                  .map(str=>str.startsWith('<') ? str : uniIm.utils.replaceUrlToLink(str))
-                  .join('')
+          const htmlStr = this.chatInputContent.html
+          const HtmlArr = uniIm.utils.parseHtml(htmlStr)
+          // 把用户手敲的http链接转为a标签包裹，再转为富文本数组
+          HtmlArr.forEach((item,index)=>{
+            // 如果文字中有http链接，需要把链接的地址提取出来
+            if(item.type === "text"){
+              if(item.text.includes('http')){
+                const newStr = uniIm.utils.replaceUrlToLink(item.text)
+                const newItems = uniIm.utils.parseHtml(newStr)
+                // 删除原来的text，替换成新的
+                HtmlArr.splice(index,1,...newItems)
+              }
+              //转义：&gt; 转换为 > $lt; 转换为 < &amp; 转换为 & &quot; 转换为 " &nbsp; 转换为空格 &ensp; 转换为空格 &emsp; 转换为空格
+              item.text = item.text.replace(/&gt;/g,'>').replace(/&lt;/g,'<').replace(/&amp;/g,'&').replace(/&nbsp;/g,' ').replace(/&ensp;/g,' ').replace(/&emsp;/g,' ')
+            }
+          })
+          // 如果最后一项是text
+          const lastItem = HtmlArr[HtmlArr.length - 1]
+          if(lastItem.type === 'text'){
+            // 删除末尾的空格或者换行
+            lastItem.text = lastItem.text.replace(/[\s\n]*$/,'')
+            if(lastItem.text === ''){
+              HtmlArr.pop()
+            }  
+          }
           // 先插到消息列表
           let msg = await this.beforeSendMsg({
-            "rich-text":uniIm.utils.parseHtml(htmlStr)
+            "rich-text":HtmlArr
           },false)
           
           // 上传消息中的图片
           let promiseArr = []
           msg.body.forEach(async item=>{
-            if(item.type === 'text'){
-              item.text = item.text.trim();
-            }else if(item.name === 'img'){
+            if(item.name === 'img'){
               promiseArr.push(new Promise((resolve,reject)=>{
                 uni.getImageInfo({
                   src:item.attrs.src,
@@ -747,7 +640,7 @@
                 promiseArr.push(new Promise((resolve,reject)=>{
                   uniCloud.uploadFile({
                     filePath: item.attrs.src,
-                    cloudPath: Date.now() + uniCloud.getCurrentUserInfo().uid + '.' + name.split('.').pop(),
+                    cloudPath: Date.now() + this.current_uid + '.' + name.split('.').pop(),
                   }).then(res=>{
                     item.attrs.src = res.fileID
                     // console.log('上传成功',res);
@@ -760,8 +653,6 @@
             }
           })
           await Promise.all(promiseArr)
-          // 传完更新
-          await this.updateMsg(msg)
           // 执行发送
           this.sendMsg(msg)
         }else{
@@ -771,19 +662,8 @@
           await this.beforeSendMsg()
         }
       },
-      showAboutMenber(){
-        if(!this.conversation.group_id){
-          return // 非群聊会话无需@用户的功能
-        }
-        // #ifdef MP
-        return // 小程序暂不支持@用户的功能
-        // #endif
-        
-        uni.hideKeyboard()
-        this.aboutUserKeyword = '';
-        console.log('showAboutMenber',this.memberList[0]);
-        this.callAboutUid = this.memberList[0].users._id
-        this.aboutMenberIsShow = true
+      showMenberList(){
+        this.$refs['member-list'].show(arguments[0])
       },
       async beforeSendMsg(param = {},_continue = true) {
         console.log('beforeSendMsg',{param});
@@ -793,9 +673,11 @@
           conversation_id: this.conversation.id,
           group_id: this.conversation.group_id,
           client_create_time: Date.now(),
-          from_uid: uniCloud.getCurrentUserInfo().uid,
+          from_uid: this.current_uid,
           state: 0,
-          body: this.chatInputContent
+          body: this.chatInputContent,
+          // 接收消息的appId，默认为当前应用的appId。如果你是2个不同appId的应用相互发，请修改此值为相对的appId
+          appId: this.systemInfo.appId
         }
         // 根据传入的参数设置消息类型和内容
         for (let key in param) {
@@ -824,9 +706,9 @@
         }
 
         // 消息列表追加此消息。此时消息状态值为0，表示发送中
-        let resMsg = this.conversation.msgList.push(msg)
+        msg = this.conversation.msg.add(msg)
         
-        // 代码是另一个输入框，这里不能清空
+        // 代码在，弹出的代码输入框，无需清空消息输入框内容
         if(msg.type !== 'code'){
           this.resetChatInput()
         }
@@ -834,10 +716,9 @@
         this.$nextTick(() => {
           this.showLast()
         })
-        msg.state = 0
         // console.error('sendMsg-sendMsg-sendMsg', msg);
         // 存到本地数据库
-        await this.conversation.msgManager.localMsg.add(msg)
+        // await this.conversation.msgManager.localMsg.add(msg)
         // console.log('msg被localMsg.add引用 会新增一个unique_id',msg)
         if(_continue){
           this.sendMsg(msg);
@@ -854,6 +735,7 @@
         return this.chatInputContent?.aboutUserIds || []
       },
       sendMsg(msg, callback) {
+        
         if(this.conversation.source){
           msg.chat_source = this.conversation.source
         }
@@ -862,12 +744,6 @@
         const uniImCo = uniCloud.importObject('uni-im-co', {
           customUI: true
         });
-        // 接收消息的appId，默认为当前应用的appId。如果你是2个不同appId的应用相互发，请修改此值为相对的appId
-        msg.appId = this.systemInfo.appId
-        // 拿到当前消息的索引值
-        let index = this.conversation.msgList.findIndex(i => i.unique_id == msg.unique_id)
-        // 生成新对象，否则不触发更新
-        msg = Object.assign({}, msg)
         
         // 检查内容不是包含 个推 两个字，有则 改成 个 + 零宽字符 + 推
         let tmpBody = JSON.stringify(msg.body)
@@ -878,10 +754,9 @@
         uniImCo.sendMsg(msg)
           .then(async e => {
             // console.log('uniImCo.sendMsg',{e,msg});
-            msg.state = e.errCode === 0 ? 100 : -100;
-            msg.create_time = e.data.create_time;
-            msg._id = e.data._id;
-            await this.updateMsg(msg)
+            msg.state = e.errCode === 0 ? 100 : -100
+            msg.create_time = e.data.create_time
+            msg._id = e.data._id
           })
           .catch(async e => {
             uni.showModal({
@@ -890,10 +765,9 @@
               confirmText: '关闭',
             });
             console.error('uniImCo.sendMsg error:', e.errCode, e.message);
-            // 必须要有create_time的值，否则indexDB通过创建时间索引找不到数据
-            msg.create_time = Date.now();
-            msg.state = -200;
-            await this.updateMsg(msg)
+            // todo:必须要有create_time的值，否则indexDB通过创建时间索引找不到数据。后续会优化这个问题
+            msg.state = -200,
+            msg.create_time = Date.now()
           })
           .finally(e => {
             if (callback) {
@@ -901,29 +775,6 @@
             }
           });
       },
-      // 更新消息
-      async updateMsg(msg){
-        if(!msg.conversation_id){
-          throw 'msg.conversation_id不能为空'
-        }
-        if(!msg.unique_id){
-          throw 'msg.unique_id不能为空'
-        }
-        let conversation = await uniIm.conversation.get(msg.conversation_id)
-        let index = conversation.msgList.findIndex(_msg => _msg.unique_id == msg.unique_id)
-        if(index === -1){
-          throw 'updateMsg msg 不存在'
-        }
-
-        /* TODO: splice 更新方式会把原本的 msg 对象从数组中踢出，导致已经渲染的消息组件无法响应后续的变更（比如 read_msg），
-          所以这里使用 merge 更新方式，虽然此方式在 vue2 中有问题。*/
-        let oldMsg = conversation.msgList[index]
-        Object.assign(oldMsg, msg)
-        // conversation.msgList.splice(index, 1, msg)
-
-        conversation.msgManager.localMsg.update(msg.unique_id, msg)
-        // console.log('change after',conversation.msgList[index]);
-      },
       retriesSendMsg(msg) {
         uni.showLoading({
           mask: true
@@ -957,62 +808,20 @@
         }
       },
       setCallAboutUid(user_id,needDeleteLeftART = true) {
-        this.aboutMenberIsShow = false
+        // 拿到@之后为搜索用户的关键字长度，以便插入@的用户后删除关键字 (移动端搜索的关键词并不在消息输入栏)
+        const keywordLength = this.isWidescreen ? this.$refs['member-list'].keyword.length : 0
         this.$refs['chat-input'].addCallUser({
           user_id,
-          nickname: this.group_member[user_id].users.nickname
-        },needDeleteLeftART,this.aboutUserKeyword.length)
+          nickname: user_id == '__ALL' ? '所有人' : uniIm.users[user_id]?.nickname || '未知用户'
+        },needDeleteLeftART,keywordLength)
       },
       async showControl({
         msgId,
         msgContentDomInfo
       }) {
-        const msg = this.conversation.msgList.find(msg => msg._id === msgId)
-        let isSelf = msg.from_uid == uniCloud.getCurrentUserInfo().uid
+        const msg = this.conversation.msg.find(msgId)
+        let isSelf = msg.from_uid == this.current_uid
         this.$refs['msg-popup-control'].show({isSelf,msg,msgContentDomInfo})
-        
-        /*
-        let controlData = {
-          msg,
-          isInTop: false
-        };
-
-        let metrics = uniIm.utils.getScreenMetrics()
-        if (isSelf) {
-          controlData.left = 'unset'
-          controlData.right = metrics.pageWidth - msgContentDomInfo.right
-        } else {
-          controlData.left = msgContentDomInfo.left + msgContentDomInfo.width / 2
-          controlData.right = 'unset'
-        }
-        
-        controlData.isInTop = msgContentDomInfo.top > 60
-        
-        if (controlData.isInTop) {
-          // #ifdef H5
-          let n = -20
-          // #endif
-          // #ifndef H5
-          let n = -65
-          // #endif
-          controlData.top = msgContentDomInfo.top + n
-        } else {
-          // #ifdef APP
-          let n = 8
-          // #endif
-          // #ifdef H5
-          let n = 55
-          // #endif
-          // #ifdef MP
-          let n = 10
-          // #endif
-          controlData.top = msgContentDomInfo.bottom + n
-        }
-        
-        console.log('msgContentDomInfo',msgContentDomInfo)
-        controlData.msgWidth = msgContentDomInfo.width
-        this.$refs['msg-popup-control'].show(controlData)
-        */
       },
       shareMsg(msgList,merge = false) {
         this.$refs['share-msg'].open(msgList,merge)
@@ -1032,14 +841,20 @@
       },
       updateNavTitle(){
         this.navTitle = this.conversation.title
-        if (this.conversation.group_id) {
-          this.navTitle += '(' + Object.keys(this.conversation.group_member).length + ")";
+        const group_id = this.conversation?.group_id
+        if (group_id && group_id?.indexOf('__tmp') != 0) {
+          this.navTitle += `（${this.conversation.group.member_count}）`
         }
         if(this.navTitle && !this.isWidescreen){
           uni.setNavigationBarTitle({
           	title: this.navTitle
           });
         }
+      },
+      clearUnreadCount(){
+        if ( this.conversation.unread_count > 0) {
+          this.conversation.clearUnreadCount();
+        }
       }
     },
     onNavigationBarButtonTap(e) {
@@ -1072,9 +887,9 @@ page {
 .uni-im-chat {
   position: relative;
   height: 100%;
+  width: 100%;
   flex: 1;
   background-color: #efefef;
-  
   .msg-list {
     /* height: 1px; 覆盖掉 组件内的height：100%，使得flex-grow: 1作用在容器内被撑开*/
     height: 1px !important;
@@ -1082,6 +897,7 @@ page {
   }
   
   .chat-foot,.disable-chat-foot{
+    position: relative;
     flex-direction: column;
     border-top: 1rpx solid #BBBBBB;
     background-color: #F7F7F7;
@@ -1155,111 +971,8 @@ page {
     font-size: 12px;
     margin-top: 3px;
   }
-  
   /* #endif */
   
-  .member-list-box {
-    position: absolute;
-    width: 750rpx;
-    height: 80vh;
-    bottom: 0;
-    z-index: 10;
-    background-color: #ffffff;
-    overflow: hidden;
-    border-radius: 15px 15px 0 0;
-    box-shadow: 0 0 100px rgba(0, 0, 0, 0.2);
-    /* #ifdef H5 */
-    @media screen and (min-device-width:960px){
-      border-radius: 15px;
-      max-height: 300px;
-      height: auto;
-      width: 260px;
-      left: auto;
-      right: calc(50vw - 300px);
-      bottom: 300px;
-    }
-    /* #endif */
-    .head{
-      flex-direction: row;
-      position: relative;
-      .close {
-        position: absolute;
-        left: 5px;
-        background-color: #eee;
-        height: 18px;
-        width: 18px;
-        margin: 12px;
-        transform: rotate(270deg);
-        border-radius: 50%;
-        justify-content: center;
-        align-items: center;
-      }
-      .title {
-        flex: 1;
-        text-align: center;
-        margin-top: 10px;
-        font-size: 14px;
-        color: #000;
-      }
-    }
-    .search {
-       ::v-deep .uni-searchbar__box {
-        margin: 0;
-        height: 30px;
-        .uni-searchbar__box-icon-search {
-          padding: 0 5px;
-        }
-        .uni-searchbar__text-placeholder {
-          // font-size: 12px;
-        }
-      }
-    }
-    .member-list {
-      height: 100%;
-      overflow-y: auto;
-      padding: 10px;
-      .member-list-item {
-        overflow: hidden;
-        height: 40px;
-        width: 100%;
-        font-size: 14px;
-        line-height: 40px;
-        padding-left: 15px;
-        border-radius: 10px;
-        margin-bottom: 10px;
-        text-align: left;
-        /* #ifdef H5 */
-        @media screen and (min-device-width:960px){
-          margin:0;
-          margin-bottom: 5px;
-          cursor: pointer;
-        }
-        /* #endif */
-      }
-      .member-list-item-active {
-        background-color: #efefef;
-      }
-      .null-about-menber-tip {
-        color: #666;
-        font-size: 12px;
-        align-items: center;
-        justify-content: center;
-        height: 100px;
-      }
-    }
-  }
-  .member-list-mark {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 750rpx;
-    flex: 1;
-    width: 100vw;
-    height: 100vh;
-    z-index: 9;
-    background-color: rgba(0, 0, 0, 0.1);
-  }
-  
   .toolbar{
     position: absolute;
     bottom: 0;
diff --git a/pages/chat/cmp/chat-fragment.vue b/pages/chat/components/chat-fragment.vue
similarity index 100%
rename from pages/chat/cmp/chat-fragment.vue
rename to pages/chat/components/chat-fragment.vue
diff --git a/pages/chat/emojiCodes.js b/pages/chat/emojiCodes.js
deleted file mode 100644
index 87333d16acc1c8c03c6a9ac838360f9d82fdacf4..0000000000000000000000000000000000000000
--- a/pages/chat/emojiCodes.js
+++ /dev/null
@@ -1 +0,0 @@
-export default `😀,😁,😂,🤣,😃,😄,😅,😆,😉,😊,😋,😎,😍,😘,😗,😙,😚,☺️,🙂,🤗,🤩,🤔,🤨,😐,😑,😶,🙄,😏,😣,😥,😮,🤐,😯,😪,😫,😴,😌,😛,😜,😝,🤤,😒,😓,😔,😕,🙃,🤑,😲,☹️,🙁,😖,😞,😟,😤,😢,😭,😦,😧,😨,😩,🤯,😬,😰,😱,😳,🤪,😵,😡,😠,🤬,😷,🤒,🤕,🤢,🤮,🤧,😇,🤠,🤡,🤥,🤫,🤭,🧐,🤓,😈,👿,👹,👺,💀,☠️,👻,👽,🤖,😺,😸,😹,😻,😼,😽,🙀,😿,😾,🙈,🙉,🙊,👶,🧒,👦,👧,🧑,👨,👩,🧓,👴,👵,👨‍⚕️,👩‍⚕️,👨‍🎓,👩‍🎓,👨‍🏫,👩‍🏫,👨‍⚖️,👩‍⚖️,👨‍🌾,👩‍🌾,👨‍🍳,👩‍🍳,👨‍🔧,👩‍🔧,👨‍🏭,👩‍🏭,👨‍💼,👩‍💼,👨‍🔬,👩‍🔬,👨‍💻,👩‍💻,👨‍🎤,👩‍🎤,👨‍🎨,👩‍🎨,👨‍✈️,👩‍✈️,👨‍🚀,👩‍🚀,👨‍🚒,👩‍🚒,👮,👮‍♂️,👮‍♀️,🕵️,🕵️‍♂️,🕵️‍♀️,💂,💂‍♂️,💂‍♀️,👷,👷‍♂️,👷‍♀️,🤴,👸,👳,👳‍♂️,👳‍♀️,👲,🧕,🧔,👱,👱‍♂️,👱‍♀️,🤵,👰,🤰,🤱,👼,🎅,🤶,🧙,🧙‍♀️,🧙‍♂️,🧚,🧚‍♀️,🧚‍♂️,🧛,🧛‍♀️,🧛‍♂️,🧜,🧜‍♀️,🧜‍♂️,🧝,🧝‍♀️,🧝‍♂️,🧞,🧞‍♀️,🧟,🧟‍♀️,🙍,🙍‍♂️,🙍‍♀️,🙎,🙎‍♂️,🙎‍♀️,🙅,🙅‍♂️,🙅‍♀️,🙆,🙆‍♂️,🙆‍♀️,💁,💁‍♂️,💁‍♀️,🙋,🙋‍♂️,🙋‍♀️,🙇,🙇‍♂️,🙇‍♀️,🤦,🤦‍♂️,🤦‍♀️,🤷,🤷‍♂️,🤷‍♀️,💆,💆‍♂️,💆‍♀️,💇,💇‍♂️,💇‍♀️,🚶,🚶‍♂️,🚶‍♀️,🏃,🏃‍♂️,🏃‍♀️,💃,🕺,👯,👯‍♂️,👯‍♀️,🧖,🧖‍♀️,🧖‍♂️,🧗,🧗‍♀️,🧗‍♂️,🧘,🧘‍♀️,🧘‍♂️,🕴️,👤,👥,👫,👬,👭,💏,👨‍❤️‍💋‍👨,👩‍❤️‍💋‍👩,💑,👨‍❤️‍👨,👩‍❤️‍👩,👪,👨‍👩‍👧,👨‍👩‍👧‍👦,👨‍👩‍👦‍👦,👨‍👩‍👧‍👧,👨‍👨‍👦,👨‍👨‍👧,👨‍👨‍👧‍👦,👨‍👨‍👦‍👦,👨‍👨‍👧‍👧,👩‍👩‍👦,👩‍👩‍👧,👩‍👩‍👧‍👦,👩‍👩‍👦‍👦,👩‍👩‍👧‍👧,👨‍👦,👨‍👧,👨‍👧‍👦,👨‍👧‍👧,👩‍👦‍👦,👩‍👧,👩‍👧‍👦,🤳,👃,👅,👄,💋,💘,❤️,💓,💔,💕,💖,💗,💙,💚,💛,🧡,💜,🖤,💝,💞,❣️,💌,💬,🌬️,☃️,⛄,🎎,🗿,👾,💩,🛀,🛌,💅,👂,👣,👀,👁️,🧠,💭,👓,👔,👕,👖,🧣,🧤,🧥,🧦,👗,👘,👙,👚,👛,👜,👝,🎒,👞,👟,👠,👡,👢,👑,👒,🎩,🎓,🧢,📿,💄,💍,💎,🥄,🔪,🏺,🗺️,🗾,🎠,🎡,🎢,💈,🎪,🛰️,🚀,🛸,🛎️,⌛,⏳,⌚,⏰,🕰️,🌡️,🌂,☂️,☔,⛱️,⚡,🎃,🎄,🎆,🎇,🎈,🎉,🎊,🎏,🎐,🎑,🎀,🎁,🎗️,🎟️,🎫,🔮,🎮,🕹️,🎰,🃏,🎴,🎭,🖼️,🎨,🔇,🔈,🔉,🔊,📢,📣,📯,🔔,🔕,🎼,🎵,🎶,🎙️,🎚️,🎛️,🎤,🎧,📻,🎷,🎸,🎹,🎺,🎻,🥁,📱,📲,☎️,📞,📟,📠,🔋,🔌,💻,🖥️,🖨️,⌨️,🖱️,🖲️,💽,💾,💿,📀,🎥,🎞️,📽️,🎬,📺,📷,📸,📹,📼,🔍,🔎,💡,🔦,🏮,📔,📕,📖,📗,📘,📙,📚,📓,📒,📃,📜,📄,📰,📑,🔖,💰,💴,💵,💶,💷,💸,💳,✉️,📧,📨,📩,📤,📥,📦,📫,📪,📬,📭,📮,✏️,✒️,📝,💼,📁,📂,📅,📆,📇,📈,📉,📊,📋,📌,📍,📎,📏,📐,✂️,🔒,🔓,🔏,🔐,🔑,🔨,🔫,🔧,🔩,🔬,🔭,📡,💉,💊,🚪,🚽,🚿,🛁,🛒,🚬,🔅,🔆,⚜️,🔱,📛,🚂,🚃,🚄,🚅,🚆,🚇,🚈,🚉,🚊,🚝,🚞,🚋,🚌,🚍,🚎,🚐,🚑,🚒,🚓,🚔,🚕,🚖,🚗,🚘,🚙,🚚,🚛,🚜,🚲,🛴,🛵,🚏,🛣️,🛤️,🛢️,⛽,🚨,🚥,🚦,🛑,🚧,⛵,🛶,🚤,🛳️,⛴️,🛥️,🚢,✈️,🛩️,🛫,🛬,💺,🚁,🚟,🚠,🚡,⚠️,⛔,🦗,🍇,🍈,🍉,🍊,🍋,🍌,🍍,🍎,🍏,🍐,🍑,🍒,🍓,🥝,🍅,🥥,🥑,🍆,🥔,🥕,🌽,🌶️,🥒,🥦,🥜,🍞,🥐,🥖,🥨,🥞,🧀,🍖,🍗,🥩,🥓,🍔,🍟,🍕,🌭,🥪,🌮,🌯,🥙,🥚,🍳,🥘,🍲,🥣,🥗,🍿,🥫,🍱,🍘,🍙,🍚,🍛,🍜,🍝,🍠,🍢,🍣,🍤,🍥,🍡,🥟,🥠,🥡,🍦,🍧,🍨,🍩,🍪,🎂,🍰,🥧,🍫,🍬,🍭,🍮,🍯,🍼,🥛,☕,🍵,🍶,🍾,🍷,🍸,🍹,🍺,🍻,🥂,🥃,🥤,🥢,🍽️,🍴`.split(',')
diff --git a/pages/chat/info.vue b/pages/chat/info.vue
index b74ac4c7c484a2021f9c06f4f431a92f94ae836f..8cf02a71b8aae45ad354d1d52e1f08e5a63f2f05 100644
--- a/pages/chat/info.vue
+++ b/pages/chat/info.vue
@@ -2,7 +2,7 @@
 <view class="chat-info">
   <uni-list :border="false" class="list">
     <uni-im-info-card
-      :avatarUrl="friend_info.avatar_file ? friend_info.avatar_file.url:'/uni_modules/uni-im/static/avatarUrl.png'"
+      :avatarUrl="friend_info.avatar_file?.url || '/uni_modules/uni-im/static/avatarUrl.png'"
       :title="friend_info.nickname"
       :note="friend_info.nickname != friend_info.email ? friend_info.email : ''"
     />
@@ -15,7 +15,7 @@
     <!-- #ifdef H5 -->
     <!-- 发送名片消息（仅内部人员可用） -->
     <uni-list-item
-      v-if="uniIDHasRole('staff')"
+      v-if="isWidescreen && uniIDHasRole('staff')"
       :link="true"
       title="发送他（她）的名片"
       @click="sendNameCard"
@@ -85,11 +85,10 @@ export default {
   computed: {
     ...uniIm.mapState(['isWidescreen']),
     isFriend() {
-      let friendList = uniIm.friend.get()
-      return friendList.find(i => i._id == this.friend_uid)
+      return this.friend_uid ? uniIm.friend.find(this.friend_uid) : false
     },
     currentUid() {
-      return uniCloud.getCurrentUserInfo().uid
+      return uniIm.currentUser._id
     }
   },
   async onLoad(options) {
@@ -146,10 +145,12 @@ export default {
             try {
               await db.collection('uni-im-friend').where({
                 friend_uid: this.friend_uid,
-                user_id: uniCloud.getCurrentUserInfo().uid
+                user_id: this.currentUid
               }).remove()
-              // 收到push消息后store会自动，将此用户从列表中移除
-              uni.navigateBack({ delta: 2 })
+              if (!uniIm.isWidescreen) {
+                // 收到push消息后store会自动，将此用户从列表中移除
+                uni.navigateBack({ delta: 2 })
+              }
             } catch (e) {
               uni.showModal({
                 content: JSON.stringify(e.message),
@@ -178,7 +179,7 @@ export default {
           user_id: this.conversation.friend_uid,
           name: this.conversation.title,
         },
-        from_uid: uniCloud.getCurrentUserInfo().uid,
+        from_uid: this.currentUid,
         create_time: Date.now(),
       }
       this.$refs['share-msg'].open([msg], false)
diff --git a/pages/common/video/video.vue b/pages/common/video/video.vue
index ce40cae63ef7652f0f13fefe40147866ba35ee2d..c95f22496d56134811f5003fdfec72ccb6e4822e 100644
--- a/pages/common/video/video.vue
+++ b/pages/common/video/video.vue
@@ -34,7 +34,7 @@ import uniIm from '@/uni_modules/uni-im/sdk/index.js';
       
       // 监听esc按键，关闭视频
       // #ifdef H5
-      uniIm.utils.appEvent.onKeyDown(evt => this.onDownEscapeKey, {
+      uniIm.utils.appEvent.onKeyDown(evt => this.onDownEscapeKey(), {
         order: 1000,
         match: {
           key: 'Escape',
@@ -83,7 +83,8 @@ page {
   height: 100%;
 }
 .video-box {
-  &.video{
+  flex: 1;
+  .video{
     width: 100vw;
     height: 100%;
   }
diff --git a/pages/common/view-code-page/view-code-page.vue b/pages/common/view-code-page/view-code-page.vue
index d17a18597bc68554c1be2a78311b2236d6e83a04..9d8f3066c1b0bf73f170a97a88bb4e6deead2d8f 100644
--- a/pages/common/view-code-page/view-code-page.vue
+++ b/pages/common/view-code-page/view-code-page.vue
@@ -23,9 +23,7 @@
     onLoad({
       msgId,conversationId
     }) {
-      this.msg = uniIm.conversation.dataList
-          .find(item => item.id === conversationId)
-          .msgList.find(item => item._id === msgId)
+      this.msg = uniIm.conversation.find(conversationId).msg.find(msgId)
     },
     methods: {}
   }
diff --git a/pages/contacts/addPeopleGroups/addPeopleGroups.vue b/pages/contacts/addPeopleGroups/addPeopleGroups.vue
index f3273a4e2058f7b8064ebdfae1d326300b8b3b8a..b282577bd300f0f20bc16ab0665878dbe11b3c87 100644
--- a/pages/contacts/addPeopleGroups/addPeopleGroups.vue
+++ b/pages/contacts/addPeopleGroups/addPeopleGroups.vue
@@ -22,7 +22,7 @@
 				<view v-if="usersList.length">
 					<uni-im-info-card v-for="(item,index) in usersList" :key="index"
 						:title="item.nickname" :avatarCircle="true"
-						:avatar="item.avatar_file&&item.avatar_file.url ? item.avatar_file.url : '/uni_modules/uni-im/static/avatarUrl.png'"  
+						:avatar="item.avatar_file?.url || '/uni_modules/uni-im/static/avatarUrl.png'"  
 					>
             <text v-if="item.isFriend" class="chat-custom-right grey">已添加</text>
 						<text v-else @click="addUser(index)" class="chat-custom-right">加为好友</text>
@@ -42,7 +42,7 @@
 				<view v-if="groupList.length">
 					<uni-im-info-card v-for="(item,index) in groupList" :key="index"
 						:title="item.name" 
-						:avatar="item.avatar_file && item.avatar_file.url ? item.avatar_file.url : '/uni_modules/uni-im/static/avatarUrl.png'" 
+						:avatar="item.avatar_file?.url || '/uni_modules/uni-im/static/avatarUrl.png'" 
 					>
             <text v-if="item.isExist" class="chat-custom-right grey">已加入</text>
 						<text v-else @click="addUser(index)" class="chat-custom-right">申请加入</text>
@@ -56,7 +56,7 @@
 			<uni-popup-dialog mode="input" :title="activeIndex?'申请加群':'申请添加好友'" 
 				placeholder="请输入验证信息" confirmText="发送" message="成功消息" 
 				:duration="2000" :before-close="true" :value="value"
-				@close="close" @confirm="confirm"
+				@close="close" @confirm="confirm" :maxlength="100"
 			></uni-popup-dialog>
 		</uni-popup>
 	</view>
@@ -97,7 +97,6 @@ import uniIm from '@/uni_modules/uni-im/sdk/index.js';
 		},
 		computed: {
 			usersList() {
-				let current_uid = uniCloud.getCurrentUserInfo().uid
 				let friendList = uniIm.friend.dataList
 				return this.usersData.map(item => {
 					const isFriend = friendList.find(i=>i._id == item._id)
@@ -127,7 +126,7 @@ import uniIm from '@/uni_modules/uni-im/sdk/index.js';
 		},
 		methods: {
       setParam(param){
-        console.log("param: ",param);
+        // console.log("param: ",param);
         if(param.group_id){
           this.current = 1
           this.setActiveIndex({currentIndex: 1})
@@ -138,16 +137,16 @@ import uniIm from '@/uni_modules/uni-im/sdk/index.js';
         this.getGroupsList()
       },
 			async getGroupsList(){
-        const limit = 1000
-        const skip = this.groupData.length/limit + 1
+        const limit = 100
+        const skip = this.groupData.length/limit
 				const res =  await db.collection('uni-im-group')
-                              .where(`"user_id" != "${uniCloud.getCurrentUserInfo().uid}"`)
+                              .where(`"user_id" != "${uniIm.currentUser._id}"`)
                               .field('_id,name,avatar_file')
                               .orderBy('create_date', 'desc')
-                              .limit(limit)
                               .skip(skip)
+                              .limit(limit)
                               .get()
-				// console.log("uni-im-group: ",res);
+				// console.error("uni-im-group: ",res);
 				if(res.result.data.length){
 					this.loading = false
 					this.hasMore = true
@@ -174,18 +173,22 @@ import uniIm from '@/uni_modules/uni-im/sdk/index.js';
 				uni.navigateBack()
 			},
 			async doSearch(e){
-				console.log("doSearch: ",e,this.keyword);
+				// console.log("doSearch: ",e,this.keyword);
         uni.showLoading({
           title: '搜索中'
         })
 				if(this.activeIndex){
-					let res = await db.collection('uni-im-group')
-						.where(`
+          let where = {};
+          if(this.keyword){
+            where = `
               /${this.keyword}/.test(name) || 
 							"_id" == "${this.keyword}"
-						`)
+						`
+          }
+					let res = await db.collection('uni-im-group')
+						.where(where)
 						.get()
-					console.log(res);
+					// console.log(res);
 					this.groupData = res.result.data
 				}else{
           const whereString = [
@@ -334,7 +337,7 @@ import uniIm from '@/uni_modules/uni-im/sdk/index.js';
   @media screen and (min-device-width:960px){
     .content {
       margin-top: 0;
-      height: calc(100vh - 175px);
+      height: calc(100vh - 150px);
       overflow: auto;
     }
   	::v-deep .uni-navbar__header-btns-left,
diff --git a/pages/contacts/contacts.vue b/pages/contacts/contacts.vue
index 664a6a9cc38837f9b645d792f775c286fe528c25..2715b10df744ec666bde61063988babdd4f0cbfe 100644
--- a/pages/contacts/contacts.vue
+++ b/pages/contacts/contacts.vue
@@ -212,7 +212,7 @@
 							});
 							await db.collection('uni-im-friend').where({
 								friend_uid: item._id,
-								user_id: uniCloud.getCurrentUserInfo().uid
+								user_id: uniIm.currentUser._id
 							}).remove()
 							uni.hideLoading()
 							// 收到push消息后会自动，将此用户从列表中移除
diff --git a/pages/contacts/createGroup/createGroup.vue b/pages/contacts/createGroup/createGroup.vue
index cb8d7c7964a96905ef507d3da185de4bcefb8c40..dcf3c6f7cf0306bd0458a4f6fd5632db7ff16980 100644
--- a/pages/contacts/createGroup/createGroup.vue
+++ b/pages/contacts/createGroup/createGroup.vue
@@ -4,12 +4,15 @@
       <uni-search-bar v-model="keyword" placeholder="搜索" bgColor="#fff" :radius="100" 
         @cancel="doClear();isFocus = true" @clear="doClear" :isFocus="isFocus" @focus="isFocus = true" @blur="isFocus = false" ></uni-search-bar>
     </view>
-    <uni-list class="content-box">
+    <uni-list class="content-box" :border="false">
       <uni-im-info-card @click="checkboxChange(item._id)" v-for="(item,index) in friendList" :key="index" :avatar-circle="true" :title="item.nickname" :border="false" :clickable="true"
-        :avatar="item.avatar_file && item.avatar_file.url ? item.avatar_file.url : '/uni_modules/uni-im/static/avatarUrl.png'">
+        :avatarUrl="item.avatar_file?.url || '/uni_modules/uni-im/static/avatarUrl.png'">
         <template v-slot:left>
-          <view class="checkbox">
-            <uni-icons type="checkmarkempty" color="#007aff" v-if="checkFriendIds.includes(item._id)"></uni-icons>
+          <view class="checkbox" :class="{
+            'disabled': groupMemberUid.includes(item._id),
+            'checked': checkFriendIds.includes(item._id)}
+          ">
+            <uni-icons type="checkmarkempty" color="#FFF" v-if="groupMemberUid.includes(item._id) || checkFriendIds.includes(item._id)"></uni-icons>
           </view>
         </template>
       </uni-im-info-card>
@@ -31,6 +34,7 @@
   import uniIm from '@/uni_modules/uni-im/sdk/index.js';
   const db = uniCloud.database();
   export default {
+    emits: ['done'],
     data() {
       return {
         loading: true,
@@ -47,9 +51,7 @@
       friendList() {
         return this.friendData.filter(item => {
           //转小写筛选
-          return !this.groupMemberUid.includes(item._id)
-           && 
-          (this.keyword == '' || item.nickname.toLowerCase().includes(this.keyword.toLowerCase()))
+          return (this.keyword == '' || item.nickname.toLowerCase().includes(this.keyword.toLowerCase()))
         })
       },
       checkFriendNum() {
@@ -84,9 +86,11 @@
         console.log("group_id", options);
         if (options.group_id) {
           this.group_id = options.group_id
-          uni.setNavigationBarTitle({
-            title: '邀请新成员'
-          })
+          if(!uniIm.isWidescreen){
+            uni.setNavigationBarTitle({
+              title: '邀请新成员'
+            })
+          }
           //查本群，成员，
           let res = await db.collection('uni-im-group-member').where({
               group_id: options.group_id
@@ -94,7 +98,7 @@
             .get()
           console.log("res:查本群，成员 ", res);
           this.groupMemberUid = res.result.data.map(item => item.user_id)
-          console.log('this.groupMemberUid', this.groupMemberUid);
+          // console.log('this.groupMemberUid', this.groupMemberUid);
         }
         this.getFriendsData()
       },
@@ -132,6 +136,9 @@
         this.getFriendsData()
       },
       checkboxChange(user_id) {
+        if (this.groupMemberUid.includes(user_id)){
+          return console.log('已经在群里了');
+        }
         console.log("checkboxChange-value",user_id);
         this.checkFriendIds = this.checkFriendIds.includes(user_id) ? this.checkFriendIds.filter(item => item != user_id) : this.checkFriendIds.concat(user_id)
         console.log("checkboxChange",this.checkFriendIds);
@@ -146,9 +153,13 @@
         this.checkFriendIds = []
         // console.log('createGroup',res);
         if (this.group_id) {
-          uni.navigateBack({
-            delta: 1
-          })
+          if (uniIm.isWidescreen) {
+            this.$emit('done')
+          } else {
+            uni.navigateBack({
+              delta: 1
+            })
+          }
         } else {
           // #ifdef H5
           if (uniIm.isWidescreen) {
@@ -209,12 +220,22 @@
     height: 20px;
     justify-content: center;
     align-items: center;
-    border-radius: 3px;
+    border-radius: 100px;
+    &.disabled {
+      background-color: #1189e9;
+      opacity: 0.5;
+      border: none;
+      cursor: not-allowed;
+    }
+    &.checked {
+      background-color: #1189e9;
+      border: none;
+    }
   }
   
   .foot-box {
     position: fixed;
-    bottom: 0;
+    bottom: 15px;
     // 注意：此页面可能显示在pc端所以不能用750rpx，而用100%
     width: 100%;
     height: 60px;
@@ -228,15 +249,13 @@
   
   /* #ifdef H5 */
   @media screen and (min-device-width:960px){
-    .create-group-box {
-      width: 100%;
-      margin: 10px auto;
-    }
+    width: 100%;
+    margin: 10px auto;
     &.join-grpop {
       width: 800px;
     }
     .content-box {
-      height: calc(95vh - 200px);
+      height: calc(100vh - 175px);
     }
     .content-box ::v-deep .info-card {
       cursor: pointer;
diff --git a/pages/contacts/groupList/groupList.vue b/pages/contacts/groupList/groupList.vue
index 51bf1feca3632073ea214d88392f17fe8375e7b5..0d6eb73d7d2ea79526e3a9079b50baf17f8bb13d 100644
--- a/pages/contacts/groupList/groupList.vue
+++ b/pages/contacts/groupList/groupList.vue
@@ -6,11 +6,11 @@
 		></uni-search-bar>
 		<view class="uni-list">
 			<uni-im-info-card v-for="(item,index) in groupList" :key="index" 
-				@click="toChat(item.group_info._id)" link
-				:title="item.group_info.name"
-				:avatar="item.group_info.avatar_file&&item.group_info.avatar_file.url ? item.group_info.avatar_file.url : '/uni_modules/uni-im/static/avatarUrl.png'">
+				@click="toChat(item._id)" link
+				:title="item?.name"
+				:avatar="item?.avatar_file?.url || '/uni_modules/uni-im/static/avatarUrl.png'">
 			</uni-im-info-card>
-      <uni-im-load-state :status="groupHasMore?'loading':'noMore'"></uni-im-load-state>
+      <uni-im-load-state class="uni-im-load-state" :status="groupHasMore?'loading':'noMore'"></uni-im-load-state>
 		</view>
 	</view>
 </template>
@@ -30,10 +30,10 @@
 				return uniIm.isWidescreen
 			},
 			groupList() {
-				let groupList = uniIm.group.get()
+				const groupList = uniIm.group.dataList
 				if(this.keyword){
 					return groupList.filter(item=>{
-					  return item.group_info.name.includes(this.keyword) || item.group_info._id.includes(this.keyword)
+					  return item.name.includes(this.keyword) || item._id.includes(this.keyword)
 					})
 				}else{
 					return groupList
@@ -43,6 +43,15 @@
 				return uniIm.group.hasMore
 			}
 		},
+    mounted() {
+      uni.createIntersectionObserver(this, { observeAll: true })
+        .relativeTo('body', {})
+        .observe('.uni-im-load-state', (res) => {
+          if (res.intersectionRatio > 0) {
+            uniIm.group.loadMore()
+          }
+        })
+    },
     async onLoad(options) {
     	this.setParam(options)
     },
@@ -69,7 +78,7 @@
   /* #ifdef H5 */
   	@media screen and (min-device-width:960px){
       .uni-list {
-        height: calc(100vh - 185px);
+        height: calc(100vh - 165px);
         overflow: auto;
       }
   	}
diff --git a/pages/contacts/notification/action.js b/pages/contacts/notification/action.js
index 0bc486dee5e75a38c0e7cd7ba22bf073797f0047..d22cf8f628eaa18830c6a9b2830c269563521d42 100644
--- a/pages/contacts/notification/action.js
+++ b/pages/contacts/notification/action.js
@@ -44,7 +44,6 @@ export default async function({
 								state:confirm?100:-100
 							})
 							.then((res) => {
-								uni.hideLoading()
 								callback()
 							}).catch((err) => {
 								console.log(err);
@@ -53,6 +52,9 @@ export default async function({
 									showCancel: false
 								})
 							})
+              .finally(() => {
+                uni.hideLoading()
+              })
 			break;
 		default:
 			console.log({subType})
diff --git a/pages/contacts/notification/notification.vue b/pages/contacts/notification/notification.vue
index aeb765c4fda28ed559f7718d927862aedf04d756..3a59f70214844261f3002e77ccc99eabf13b0def 100644
--- a/pages/contacts/notification/notification.vue
+++ b/pages/contacts/notification/notification.vue
@@ -4,9 +4,9 @@
 		<uni-list :border="false">
 			<template v-if="notificationDatas && notificationDatas.length">
 				<uni-im-info-card v-for="(item,index) in notificationDatas" :key="item.id" :avatarCircle="true"
-					:clickable="true" :badge-text="item.is_read?'':'dot'" badgePositon="left"
-					:title="item.payload.title||item.title" :note="item.payload.content||item.content||'无'"
-					:avatar="item.payload.avatar_file&&item.payload.avatar_file.url ? item.payload.avatar_file.url : '/uni_modules/uni-im/static/noticeIcon/notification2.png'"
+					:clickable="true" :badge="item.is_read?'':'dot'" badgePositon="left"
+					:title="item.payload.title || item.title" :note="item.payload.content||item.content||'无'"
+					:avatar="item.payload?.avatar_file?.url || '/uni_modules/uni-im/static/noticeIcon/notification2.png'"
 					@click.native="clickHandle(index,item)" direction="column" :time="friendlyTime(item.create_time)">
 					<view class="handle-box">
 						<template v-if="item.payload.state">
diff --git a/pages/group/info.vue b/pages/group/info.vue
index ead10669b2816f57dc39de19fec94e47feee3d58..a47fcfd98a4c3905167dc8a7af49becc9e8f679a 100644
--- a/pages/group/info.vue
+++ b/pages/group/info.vue
@@ -2,18 +2,18 @@
   <view class="group-info-box" v-if="conversation_id">
     <uni-im-group-members :conversation_id="conversation_id"></uni-im-group-members>
     <uni-list>
-      <uni-list-item v-if="!leave_group" title="消息免打扰" @switchChange="changeConversationMute"
-        :switchChecked="conversation.mute" :showSwitch="true"></uni-list-item>
+      <uni-list-item v-if="!leave_group && !isTmpGroup" title="消息免打扰" @switchChange="changeConversationMute"
+        :switchChecked="conversation.mute" :showSwitch="true" switchColor="#22b832"></uni-list-item>
       <uni-list-item v-for="(val,key) in editorFields" :key="key" @click.native="openPopupInfo(key)" :title="val"
         :showArrow="isAdmin" :clickable="isAdmin">
         <template v-slot:footer>
           <text
-            class="group-info-text">{{ (key == "notification" ? conversation.group_info[key]?.content : conversation.group_info[key]) || '未设置' }}</text>
+            class="group-info-text">{{ (key == "notification" ? conversation.group[key]?.content : conversation.group[key]) || '未设置' }}</text>
         </template>
       </uni-list-item>
       <uni-list-item @click.native="setAvatar" title="群头像" :clickable="isAdmin">
         <template v-slot:footer>
-          <image class="logo" :src="logoUrl||'/uni_modules/uni-im/static/avatarUrl.png'" mode=""></image>
+          <uni-im-img width="50px" height="50px" :src="logoUrl||'/uni_modules/uni-im/static/avatarUrl.png'" mode=""></uni-im-img>
         </template>
       </uni-list-item>
       <template v-if="isAdmin">
@@ -23,10 +23,10 @@
           </template>
         </uni-list-item>
         <uni-list-item title="全员禁言" @switchChange="setMuteAllMembers"
-          :switchChecked="conversation.group_info.mute_all_members" :showSwitch="true"></uni-list-item>
+          :switchChecked="conversation.group.mute_all_members" :showSwitch="true"></uni-list-item>
       </template>
       <!-- #ifdef H5 -->
-      <uni-list-item @click="share" :clickable="true" title="分享此群">
+      <uni-list-item v-if="!isTmpGroup" @click="share" :clickable="true" title="分享此群">
         <template v-slot:footer>
           <uni-icons size="25px" color="#666" type="redo"></uni-icons>
         </template>
@@ -37,12 +37,18 @@
       <text style="padding: 15px;text-align: center;color: #666;">- 你不是此群成员 -</text>
       <!-- <text @click="joinGroup" style="padding: 15px;text-align: center;color: #005eca;cursor: pointer;">申请加入</text> -->
     </view>
+    <text v-else-if="isTmpGroup" style="padding: 15px;text-align: center;color: #666;">- 临时群聊 -</text>
     <text v-else class="exitGroup" @click="exitGroup">{{isGroupCreator?'解散群聊':'退出群聊'}}</text>
     <uni-popup ref="popupInfo" type="dialog">
       <uni-popup-dialog mode="input" :title="editorFields[editorType]" :placeholder="'请输入'+editorFields[editorType]"
-        :duration="2000" :before-close="true" :value="editorDefaultValue" @close="closePopupInfo"
+        :duration="2000" :before-close="true" :value="editorDefaultValue" @close="closePopupInfo" :maxlength="500"
         @confirm="confirmPopupInfo"></uni-popup-dialog>
     </uni-popup>
+    <!-- #ifdef H5 -->
+    <uni-popup v-if="isWidescreen" ref="popup-qr-code" type="center">
+      <qrCodePage ref="popup-qr-code-page"></qrCodePage>
+    </uni-popup>
+    <!-- #endif -->
   </view>
 </template>
 
@@ -50,22 +56,30 @@
   const db = uniCloud.database()
   import uniIm from '@/uni_modules/uni-im/sdk/index.js';
   import members from '@/uni_modules/uni-im/pages/group/members';
+  // #ifdef H5
+  import qrCodePage from './qrcode.vue'
+  // #endif
   export default {
     components: {
-      'uni-im-group-members':members
+      'uni-im-group-members':members,
+      // #ifdef H5
+      qrCodePage
+      // #endif
     },
     data() {
       return {
         conversation: {
-          group_info: {
+          group: {
             user_id: "",
-            mute_all_members: false
+            mute_all_members: false,
+            member: {
+              dataList: [],
+              count:() => 0
+            },
           },
-          group_member: {},
           mute: false
         },
         leave_group: false,
-        member_list: [],
         editorFields: {
           "name": " 群聊名称",
           "introduction": "群简介",
@@ -85,74 +99,43 @@
     },
     computed: {
       ...uniIm.mapState(['isWidescreen']),
+      currentUid() {
+        return uniIm.currentUser._id
+      },
       logoUrl() {
-        return this.conversation.group_info.avatar_file ? this.conversation.group_info.avatar_file.url : false
+        return this.conversation.group.avatar_file ? this.conversation.group.avatar_file.url : false
       },
       join_option() {
-        let val = this.conversation.group_info.join_option
+        let val = this.conversation.group.join_option
         return {
           needPermission: "需要验证权限",
           freeAccess: "自由加入",
           disableApply: "禁止加入"
         } [val]
       },
-      memberList() {
-        return this.member_list
-          // 根据关键词搜索
-          .filter(member => {
-            // 忽略大小写
-            return member.users.nickname.toLowerCase().includes(this.keyword.toLowerCase())
-          })
-          // 是管理员排序靠前
-          .sort((a, b) => {
-            if (a.role.includes('admin') && !b.role.includes('admin')) {
-              return -1
-            } else if (!a.role.includes('admin') && b.role.includes('admin')) {
-              return 1
-            } else {
-              return 0
-            }
-          })
-      },
       isGroupCreator() {
-        return this.conversation.group_info.user_id == uniCloud.getCurrentUserInfo().uid
+        return this.conversation.group.user_id == this.currentUid
       },
       canPrivateChat(){
         // 当前登录的账号是管理员，或者当前消息是群管理员发的
-        return this.uniIDHasRole('staff') || this.hoverUserId && this.conversation.group_member[this.hoverUserId].role.includes('admin')
+        return this.uniIDHasRole('staff') || this.hoverUserId && this.conversation.group.member.find(this.hoverUserId).role.includes('admin')
+      },
+      isTmpGroup(){
+        return this.conversation?.id?.indexOf('__tmp') === 0
       }
     },
     watch: {
-      "conversation.group_info.user_id"(adminUserId) {
-        // 当前用户是群的创建者或者管理员（在群成员中找到当前用户的角色包含admin）
-        const currentUserId = uniCloud.getCurrentUserInfo().uid
-        this.isAdmin = this.isGroupCreator || this.conversation.group_member[currentUserId]?.role.includes('admin')
-      },
-      "conversation.group_member": {
-        handler(group_member, oldValue) {
-          // console.log('group_member',group_member);
-          this.member_list = []
-          for (let key in group_member) {
-            this.member_list.push(group_member[key])
-          }
-          if (!uniIm.isWidescreen) { // pc宽屏不需要
-            let title = "群信息（" + this.member_list.length + "人）"
-            uni.setNavigationBarTitle({
-              title
-            });
-          }
-        },
-        deep: true,
-        immediate: true
+      "conversation.group.member_count"(){
+        this.updateNavTitle()
       },
       // （后续）通过监听实现实时切换管理员实时刷新权限
       // console.log('isAdmin',isAdmin);
       conversation: {
         handler(conversation, oldValue) {
-          const currentUserId = uniCloud.getCurrentUserInfo().uid
-          this.isAdmin = this.isGroupCreator || this.conversation.group_member[currentUserId]?.role.includes('admin')
+          // 当前用户是群的创建者或者管理员（在群成员中找到当前用户的角色包含admin）
+          this.isAdmin = this.isGroupCreator || this.conversation.group.member.find(this.currentUid)?.role.includes('admin')
           this.leave_group = conversation.leave
-          this.mute_all_members = conversation.group_info.mute_all_members
+          this.mute_all_members = conversation.group.mute_all_members
         },
         deep: true
       },
@@ -164,9 +147,17 @@
       this.load(e.conversation_id)
     },
     onShow() {
-      // console.log("this.conversation: ", this.conversation.group_member);
+      // console.log("this.conversation: ", this.conversation.group.member);
+      this.updateNavTitle()
     },
     methods: {
+      updateNavTitle(){
+        const {group:{member_count},title} = this.conversation
+        if (!uniIm.isWidescreen && typeof member_count == 'number') { // pc宽屏不需要
+          const newTitle = title + "（" + member_count + "人）-  群信息"
+          uni.setNavigationBarTitle({"title":newTitle});
+        }
+      },
       navToMembers(conversation_id){
         uni.navigateTo({
           url:"/uni_modules/uni-im/pages/group/members?conversation_id=" + conversation_id
@@ -177,7 +168,7 @@
         this.conversation = await uniIm.conversation.get(conversation_id)
       },
       async exitGroup() {
-        const group_id = this.conversation.group_info._id
+        const group_id = this.conversation.group._id
         if (this.isGroupCreator) {
           uni.showModal({
             title: '确认要解散群聊吗？',
@@ -207,8 +198,8 @@
           });
         } else {
           uni.showModal({
-            title: '确认要退出群聊吗？',
-            content: '不能撤销，请谨慎操作',
+            title: '确认退出当前群聊？',
+            content: `退出后聊天记录将会被清空，此操作无法撤销，请谨慎操作。`,
             cancelText: '取消',
             confirmText: '确认',
             complete: async (e) => {
@@ -221,7 +212,7 @@
                   mask: true
                 });
                 let res = await db.collection('uni-im-group-member').where({
-                    user_id: uniCloud.getCurrentUserInfo().uid,
+                    user_id: this.currentUid,
                     group_id
                   })
                   .remove()
@@ -231,6 +222,7 @@
                     title: '成功退出',
                     icon: 'none'
                   });
+                  uniIm.conversation.remove(this.conversation_id)
                 }
                 uni.hideLoading()
                 // console.log('exitGroup', res);
@@ -243,7 +235,7 @@
         // console.log(type);
         if (!this.isAdmin) return
         this.editorType = type
-        this.editorDefaultValue = this.conversation.group_info[type]
+        this.editorDefaultValue = this.conversation.group[type]
         if (this.editorType == "notification") {
           this.editorDefaultValue = this.editorDefaultValue?.content || ""
         }
@@ -253,6 +245,7 @@
         this.$refs.popupInfo.close()
       },
       confirmPopupInfo(value) {
+        value = value.trim()
         if (!value) {
           uni.showToast({
             title: '内容不能为空！',
@@ -260,6 +253,13 @@
           });
           return
         }
+        if (value.length < 5) {
+          uni.showToast({
+            title: '内容长度不能低于5',
+            icon: 'none'
+          });
+          return
+        }
         // console.log('value', value);
         const updateData = {};
         if (this.editorType == 'notification') {
@@ -287,12 +287,12 @@
           }
         })
       },
-      async updateGroupInfo(group_info) {
-        // console.log('group_info---------',group_info);
-        this.conversation.group_info = Object.assign(this.conversation.group_info, group_info)
+      async updateGroupInfo(group) {
+        // console.log('group---------',group);
+        this.conversation.group = Object.assign(this.conversation.group, group)
         let res = await db.collection('uni-im-group')
           .doc(this.conversation.group_id)
-          .update(group_info)
+          .update(group)
         // console.log('change group info', res.result.updated,this.conversation);
       },
       async setAvatar() {
@@ -342,7 +342,7 @@
             }
             // #endif
             // console.log(this.users);
-            let cloudPath = uniCloud.getCurrentUserInfo().uid + '' + Date.now()
+            let cloudPath = this.currentUid + '' + Date.now()
             avatar_file.name = cloudPath
             uni.showLoading({
               title: "更新中",
@@ -368,28 +368,31 @@
       // #ifdef H5
       share() {
         // 获取当前域名
-        const data = location.origin + "/#/?joinGroup=" + this.conversation.group_info._id
-        uni.setClipboardData({
-          data,
-          showToast: false,
-          success: () => {
-            uni.showToast({
-              title: "已成功复制分享链接",
-              duration: 2000,
-              icon: 'none'
-            });
-          }
-        })
-      
-        // uni.navigateTo({
-        // 	url: '/uni_modules/uni-im/pages/group/groupQRCode?id=' +
-        // 		this.conversation.group_info._id +
-        // 		'&name=' + this.conversation.group_info.name +
-        // 		'&avatar_file=' + url,
-        // 	complete: (e) => {
-        // 		// console.log(e);
-        // 	}
-        // });
+        // const data = location.origin + "/#/?joinGroup=" + this.conversation.group._id
+        // uni.setClipboardData({
+        //   data,
+        //   showToast: false,
+        //   success: () => {
+        //     uni.showToast({
+        //       title: "已成功复制分享链接",
+        //       duration: 2000,
+        //       icon: 'none'
+        //     });
+        //   }
+        // })
+        if(uniIm.isWidescreen){
+          this.$refs['popup-qr-code'].open()
+          setTimeout(() => {
+            this.$refs['popup-qr-code-page'].load({"conversation_id":this.conversation.id})
+          },0)
+        }else{
+          uni.navigateTo({
+          	url: '/uni_modules/uni-im/pages/group/qrCode?conversation_id=' + this.conversation.id,
+          	complete: (e) => {
+          		console.log(e);
+          	}
+          });
+        }
       },
       // #endif
       joinGroup() {
@@ -405,10 +408,9 @@
         })
       },
       setMuteAllMembers(e) {
-        for (let user_id in this.conversation.group_member) {
-          const member = this.conversation.group_member[user_id]
+        this.conversation.group.member.dataList.forEach(member => {
           member.mute_type += (e.value ? 1 : -1)
-        }
+        })
         this.updateGroupInfo({
           "mute_all_members": e.value
         })
@@ -454,12 +456,20 @@
       color: #666;
       font-size: 14px;
       max-width: 560rpx;
-      text-align: right;
+      text-align: left;
+      word-break: break-all;
     }
     
     .join_option {
       color: #666;
       font-size: 14px;
     }
+    
+    .group-QRCode {
+      border-radius: 20px;
+      height: auto;
+      padding: 15px;
+      padding-top: 55px;
+    }
   }
 </style>
\ No newline at end of file
diff --git a/pages/group/members.vue b/pages/group/members.vue
index f871b4763e7f506b5f3fb0262cb774a95053a3cb..3d14881914d2732a064d2828fbdd6a24ba14497a 100644
--- a/pages/group/members.vue
+++ b/pages/group/members.vue
@@ -2,7 +2,7 @@
   <view class="group-members-box">
     <uni-search-bar v-model="keyword" class="search-bar" radius="5" placeholder="输入昵称搜索" clearButton="auto"
       cancelButton="none"></uni-search-bar>
-    <view v-if="!leave_group" class="members-list-container" :class="{'show-less':!showAllMember}">
+    <view v-if="!leave_group" class="members-list-container" >
       <view class="invite-box item" v-if="isAdmin">
         <view class="invite-icon">
           <uni-icons @click="invite" color="#989898" size="20px" type="plusempty"></uni-icons>
@@ -16,8 +16,7 @@
           @contextmenu.prevent="openConversationMenu($event,index)"
           @mousemove="hoverUserId = member.users._id"
           >
-          <image class="avatar"
-            :src="(member.users.avatar_file && member.users.avatar_file.url) ? member.users.avatar_file.url:'/uni_modules/uni-im/static/avatarUrl.png'"
+          <image class="avatar" :src="(member.users.avatar_file && member.users.avatar_file.url) ? member.users.avatar_file.url:'/uni_modules/uni-im/static/avatarUrl.png'"
             mode="widthFix"></image>
           <text class="nickname">{{member.users.nickname||'匿名用户'}}</text>
           <text v-if="member.role.includes('admin')" class="group-admin">管</text>
@@ -25,45 +24,71 @@
         </view>
       </template>
     </view>
-    <text v-if="showMoreBtn" class="show-all-menber-btn" @click="onClickShowAllMenber">{{showAllMember ? '收起' : '查看更多'}}</text>
+    <view v-if="showLoadMoreBtn" class="set-index-box">
+      <text v-if="laterRenderIndex > 0" class="item" @click="laterRenderIndex = 0" space="emsp">收起</text>  
+      <view class="look-more-box">
+        <text v-if="member.loading" class="item">加载中...</text>
+        <text v-else-if="!isAllShow" class="item" @click="lookMore">查看更多</text>
+      </view>
+    </view>
+    <template v-else>
+      <text v-if="member.loading" class="tip">加载中...</text>
+      <text v-else-if="!member.hasMore" class="tip">没有更多了</text>
+    </template>
     <uni-im-contextmenu ref="uni-im-contextmenu"></uni-im-contextmenu>
+    <!-- #ifdef H5 -->
+    <uni-popup v-if="isWidescreen" ref="invitePagePopup" type="center">
+      <invitePage class="invite-page" ref="invitePage" @done="$refs.invitePagePopup.close()"></invitePage>
+    </uni-popup>
+    <!-- #endif -->
   </view>
 </template>
 
 <script>
   const db = uniCloud.database()
   import uniIm from '@/uni_modules/uni-im/sdk/index.js';
+  // #ifdef H5
+  import invitePage from '@/uni_modules/uni-im/pages/contacts/createGroup/createGroup.vue'
+  // #endif
   export default {
+    components: {
+      // #ifdef H5
+      invitePage
+      // #endif
+    },
     data() {
       return {
         conversation: {
-          group_info: {
+          group: {
             user_id: "",
-            mute_all_members: false
+            mute_all_members: false,
+            member: {
+              dataList: []
+            }
           },
-          group_member: {},
           mute: false
         },
         leave_group: false,
-        member_list: [],
         editorType: '',
         editorDefaultValue: '',
         groupType: '',
         isAdmin: false,
         keyword: '',
         mute_all_members: false,
-        showAllMember: false,
         // 鼠标在哪个用户id上
         hoverUserId: '',
-        showMoreBtn: true,
         // 延迟渲染，避免页面卡顿
-        laterRenderIndex: 1
+        laterRenderIndex: 0,
+        showLoadMoreBtn: true
       };
     },
     computed: {
       ...uniIm.mapState(['isWidescreen']),
+      member(){
+        return this.conversation.group.member
+      },
       memberList() {
-        let memberList = this.member_list
+        let memberList = this.member.dataList
           // 根据关键词搜索
           .filter(member => {
             // 忽略大小写
@@ -79,67 +104,54 @@
               return 0
             }
           })
-          // laterRenderIndex
           .filter((item, index) => {
-            // web-pc端有显示更多按钮，不需要延迟渲染
-            return this.showMoreBtn ? true : index < this.laterRenderIndex * 50
+            return index < this.canRenderCount
           })
-        
-        const memberCount = memberList.length
-        if(memberCount && memberCount < 10){
-          this.showMoreBtn = false
-        }
-          
-        if (!this.showAllMember) {
-          memberList = memberList.slice(0, 9)
-        }
         return memberList
       },
+      // 允许被渲染的个数
+      canRenderCount() {
+        // 懒渲染的值*50，如果是管理员，减1（因为有一个“+邀请”用户加入群聊的占位）
+        let n = this.laterRenderIndex * 50 - (this.isAdmin ? 1 : 0)
+        // 如果是第一次渲染，则默认渲染10个，如果是管理员，则默认渲染9个（因为有一个“+邀请”用户加入群聊的占位）
+        if(this.laterRenderIndex === 0){
+          n = this.isAdmin ? 9 : 10
+        }
+        return n
+      },
+      // 剩余未渲染的个数
+      notRenderCount() {
+        return this.member.dataList.length - this.canRenderCount
+      },
+      // 是否全部显示（全部加载完毕，并全部被渲染）
+      isAllShow() {
+        return this.notRenderCount <= 0 && !this.member.hasMore
+      },
+      currentUid() {
+        return uniIm.currentUser._id
+      },
       isGroupCreator() {
-        return this.conversation.group_info.user_id == uniCloud.getCurrentUserInfo().uid
+        return this.conversation.group.user_id == this.currentUid
       },
       canPrivateChat(){
         // 当前登录的账号是管理员，或者是群管理员，或者要私信管理员
-        const currentUserId = uniCloud.getCurrentUserInfo().uid
         return this.uniIDHasRole('staff') || 
-              this.conversation.group_member[currentUserId].role.includes('admin') ||
-              this.hoverUserId && this.conversation.group_member[this.hoverUserId].role.includes('admin') 
+              this.member.find(this.currentUid)?.role.includes('admin') ||
+              this.hoverUserId && this.member.find(this.hoverUserId).role.includes('admin') 
       }
     },
     onReachBottom() {
-      this.laterRenderIndex++
+      this.showMore()
     },
     watch: {
-      "conversation.group_info.user_id"(adminUserId) {
-        // 当前用户是群的创建者或者管理员（在群成员中找到当前用户的角色包含admin）
-        const currentUserId = uniCloud.getCurrentUserInfo().uid
-        this.isAdmin = this.isGroupCreator || this.conversation.group_member[currentUserId]?.role.includes('admin')
-      },
-      "conversation.group_member": {
-        handler(group_member, oldValue) {
-          // console.log('group_member',group_member);
-          this.member_list = []
-          for (let key in group_member) {
-            this.member_list.push(group_member[key])
-          }
-          if (!uniIm.isWidescreen && this.showMoreBtn === false) { // pc宽屏不需要
-            let title = "群成员列表（" + this.member_list.length + "人）"
-            uni.setNavigationBarTitle({
-              title
-            });
-          }
-        },
-        deep: true,
-        immediate: true
-      },
       // （后续）通过监听实现实时切换管理员实时刷新权限
       // console.log('isAdmin',isAdmin);
       conversation: {
         handler(conversation, oldValue) {
-          const currentUserId = uniCloud.getCurrentUserInfo().uid
-          this.isAdmin = this.isGroupCreator || this.conversation.group_member[currentUserId]?.role.includes('admin')
+          // 当前用户是群的创建者或者管理员（在群成员中找到当前用户的角色包含admin）
+          this.isAdmin = this.isGroupCreator || this.member.find(this.currentUid)?.role.includes('admin')
           this.leave_group = conversation.leave
-          this.mute_all_members = conversation.group_info.mute_all_members
+          this.mute_all_members = conversation.group.mute_all_members
         },
         deep: true
       },
@@ -155,10 +167,10 @@
       if (!e.conversation_id) {
         throw new Error("会话id不能为空")
       }
-      // 以页面的方式打开，不需要显示更多的按钮和隐藏部分用户
-      this.showMoreBtn = false
-      this.showAllMember = true
       this.load(e.conversation_id)
+      // 以页面模式加载时不需要显示加载更多按钮
+      this.showLoadMoreBtn = false
+      this.laterRenderIndex = 1
     },
     mounted() { //pc端以组件模式加载时逻辑
       if (this.conversation_id) {
@@ -179,9 +191,22 @@
           })
         }
       },
-      onClickShowAllMenber() {
+      showMore(){
+        if(this.notRenderCount < 5){
+          this.member.loadMore().then(() => {
+            this.laterRenderIndex++
+          })
+        }else{
+          this.laterRenderIndex++
+        }
+      },
+      lookMore() {
         if(this.isWidescreen){
-          this.showAllMember = !this.showAllMember
+          if(this.isAllShow){
+            this.laterRenderIndex = 0
+          }else{
+            this.showMore()
+          }
         }else{
           uni.navigateTo({
             url: '/uni_modules/uni-im/pages/group/members?conversation_id=' + this.conversation.id,
@@ -190,9 +215,17 @@
         }
       },
       invite() {
-        uni.navigateTo({
-          url: '/uni_modules/uni-im/pages/contacts/createGroup/createGroup?group_id=' + this.conversation.group_info._id
-        })
+        const group_id = this.conversation.group._id
+        if (this.isWidescreen) {
+          this.$refs.invitePagePopup.open()
+          setTimeout(() => {
+            this.$refs.invitePage.setParam({group_id})
+          },0)
+        } else {
+          uni.navigateTo({
+            url: '/uni_modules/uni-im/pages/contacts/createGroup/createGroup?group_id=' + group_id
+          })
+        }
       },
       async expel(item) {
         uni.showModal({
@@ -209,7 +242,7 @@
               try {
                 let res = await db.collection('uni-im-group-member').where({
                     user_id: item.users._id,
-                    group_id: this.conversation.group_info._id
+                    group_id: this.conversation.group._id
                   })
                   .remove()
                 if (res.result.deleted) {
@@ -248,14 +281,14 @@
               try {
                 let res = await db.collection('uni-im-group-member').where({
                     user_id: item.users._id,
-                    group_id: this.conversation.group_info._id
+                    group_id: this.conversation.group._id
                   })
                   .remove()
                 console.log('expel', res);
                 const uniImCo = uniCloud.importObject("uni-im-co")
                 res = await uniImCo.addToGroupMenberBlackList({
                   user_id: item.users._id,
-                  group_id: this.conversation.group_info._id
+                  group_id: this.conversation.group._id
                 })
                 console.log('expelAndToBlack', res);
               } catch (error) {
@@ -313,7 +346,7 @@
           }
         });
       },
-      openConversationMenu(e, index) {
+      openConversationMenu(event, index) {
         if (!this.isAdmin) {
           return
         }
@@ -335,7 +368,7 @@
           }
         })
             
-        if (!this.conversation.group_info.mute_all_members) {
+        if (!this.conversation.group.mute_all_members) {
           menuList.unshift({
             "title": member.mute_type ? "解除禁言" : '设为禁言',
             "action": () => {
@@ -382,16 +415,16 @@
         if (menuList.length > 0) {
           member.focus = true
           const myContextmenu = this.$refs['uni-im-contextmenu']
-          const position = {
-            "contextmenu": {
-              "top": e.clientY,
-              "left": e.clientX
-            },
-            "longpress": {
-              "top": e.touches[0].screenY || e.touches[0].clientY,
-              "left": e.touches[0].screenX || e.touches[0].clientX
+          let position = {
+            "top": event.touches[0].screenY || event.touches[0].clientY,
+            "left": event.touches[0].screenX || event.touches[0].clientX
+          }
+          if(event.type === 'contextmenu'){
+            position = {
+              "top": event.clientY,
+              "left": event.clientX,
             }
-          } [e.type]
+          }
       
           // #ifdef H5
           position.top = position.top + 120
@@ -409,7 +442,6 @@
 
 <style lang="scss">
 @import "@/uni_modules/uni-im/common/baseStyle.scss";
-page,
 .group-members-box {
   width: 750rpx;
   background-color: #f5f5f5;
@@ -417,29 +449,25 @@ page,
     width: 750rpx;
     flex-direction: row;
     flex-wrap: wrap;
-  }
-  .item {
-    position: relative;
-    width: 150rpx;
-    height: 140rpx;
-    margin: 5px 0;
-    align-items: center;
-    justify-content: space-around;
-  }
-  
-  .invite-icon {
-    border: 1px dashed #ccc;
-    border-radius: 10px;
-    width: 90rpx;
-    height: 90rpx;
-    justify-content: center;
+    .item {
+      position: relative;
+      width: 150rpx;
+      height: 140rpx;
+      margin: 5px 0;
+      align-items: center;
+      justify-content: space-around;
+    }
+    .invite-icon {
+      border: 1px dashed #ccc;
+      border-radius: 10px;
+      width: 90rpx;
+      height: 90rpx;
+      justify-content: center;
+      cursor: pointer;
+    }
   }
   
   /* #ifdef H5 */
-  // 收缩
-  .show-less {
-    max-height: 400px;
-  }
   .windows .item {
     width: 146rpx;
   }
@@ -493,21 +521,46 @@ page,
     text-overflow: ellipsis;
   }
   
-  .show-all-menber-btn {
+  .tip {
     text-align: center;
     font-size: 14px;
     color: #666;
-    height: 40px;
-    line-height: 40px;
+    height: 60px;
+    line-height: 60px;
   }
-  /* #ifdef H5 */
-  .show-all-menber-btn {
-    cursor: pointer;
+  
+  .set-index-box {
+    flex-direction: row;
+    justify-content: center;
+    .look-more-box {
+      flex-direction: row;
+      justify-content: center;
+    }
+    .item {
+      margin:0 10px;
+      text-align: center;
+      font-size: 14px;
+      color: #666;
+      height: 40px;
+      line-height: 40px;
+    }
+    /* #ifdef H5 */
+    .item {
+      cursor: pointer;
+    }
+    .item:hover {
+      color: #333;
+    }
+    /* #endif */
   }
-  .show-all-menber-btn:hover {
-    color: #333;
+  .invite-page {
+    border-radius: 10px;
+    background-color: #fff;
+    overflow: hidden;
+    .header-box {
+      padding-top: 5px;
+    }
   }
-  /* #endif */
 }
 
   
diff --git a/pages/group/groupQRCode.vue b/pages/group/qrCode.vue
similarity index 58%
rename from pages/group/groupQRCode.vue
rename to pages/group/qrCode.vue
index 03060279da38214816c6d9eeddaf8c763c8d1c58..cb16edebcf14f7b2bb964fad5c94004b36518d99 100644
--- a/pages/group/groupQRCode.vue
+++ b/pages/group/qrCode.vue
@@ -2,15 +2,19 @@
 	<view class="group-QRCode">
 		<view class="qr-code">
 			<view class="code-info">
-				<text class="group-name">{{name}}</text>
-				<text class="group-id" @click="copyGroupID">群号：{{group_id}}</text>
+				<text class="group-name">{{group.name}}</text>
+				<!-- <text class="group-id" @click="copyGroupID">群号：{{group.id_axxx}}</text> -->
 				<!--uqrcode 组件来源，插件Sansnn-uQRCode 链接地址：https://ext.dcloud.net.cn/plugin?id=1287 -->
 				<!-- #ifndef MP-WEIXIN -->
-				<!-- <uqrcode ref="uqrcode" :start="false" :size="200" canvas-id="qrcode" :value="qrcodeData"></uqrcode> -->
+				<uqrcode @click="copyUrl" ref="uqrcode" :start="false" :size="200" canvas-id="qrcode" :value="joinGroupUrl"></uqrcode>
 				<!-- #endif -->
+        <text class="tip">点击二维码复制链接</text>
 			</view>
-			<image class="group-avatar" :src="avatar_file || '/uni_modules/uni-im/static/avatarUrl.png'" mode="">
-			</image>
+			<uni-im-img class="group-avatar" :src="group?.avatar_file?.url || '/uni_modules/uni-im/static/avatarUrl.png'" 
+        mode=""
+        width="100px"
+        height="100px"
+      ></uni-im-img>
 		</view>
 
 		<!-- <view class="btn-box">
@@ -27,51 +31,48 @@
 </template>
 
 <script>
+  import uniIm from '@/uni_modules/uni-im/sdk/index.js';
 	import uqrcode from "@/uni_modules/Sansnn-uQRCode/components/uqrcode/uqrcode"
+  import config from '@/uni_modules/uni-im/common/config.js';
 	export default {
 		components: {
 			uqrcode
 		},
 		data() {
 			return {
-				group_id: '',
-				name: '',
-				avatar_file: ''
+        group: {}
 			}
 		},
 		computed: {
-			qrcodeData() {
-				let data = {
-					"type": "uni-im",
-					"subType": "groupInfo",
-					"data": {
-						group_id: this.group_id,
-						name: this.name,
-						avatar_file: this.avatar_file
-					}
-				}
-				return JSON.stringify(data)
+			joinGroupUrl() {
+				return config.domain + "/#/?joinGroup=" + this.group._id
 			}
 		},
-		onLoad(options) {
-			// console.log("options: ",options);
-			this.group_id = options.id
-			this.name = options.name
-			this.avatar_file = options.avatar_file
-		},
-		onReady(){
-			setTimeout(()=>{
-				this.$refs.uqrcode.make({
-					success: () => {
-						// console.log('生成成功');
-					},
-					fail: err => {
-						// console.log(err)
-					}
-				});
-			},1000)
+		onLoad(param) {
+			this.load(param)
 		},
 		methods: {
+      async load({conversation_id}){
+        console.log("conversation_id: ",conversation_id);
+        const conversation = await uniIm.conversation.get(conversation_id)
+        this.group = conversation.group
+        this.$refs.uqrcode.make({
+        	success: () => {
+        		// console.log('生成成功');
+        	},
+        	fail: err => {
+        		console.log(err)
+        	}
+        });
+      },
+      copyUrl() {
+        uni.setClipboardData({
+          data: this.joinGroupUrl,
+          success: function() {
+            console.log('success');
+          }
+        });
+      },
 			copyGroupID() {
 				uni.setClipboardData({
 					data: this.group_id,
@@ -114,20 +115,28 @@
   }
   
   .group-avatar {
-    width: 150rpx;
-    height: 150rpx;
+    width: 100px;
+    height: 100px;
     border-radius: 100rpx;
     position: absolute;
     top: -70rpx;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  }
+  
+  .tip {
+    font-size: 24rpx;
+    color: #999;
+    margin-top: 20rpx;
   }
   
   .group-name {
     width: 400rpx;
-    font-size: 46rpx;
+    font-size: 16px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    margin-top: 120rpx;
+    margin-top: 40px;
+    margin-bottom: 10px;
     text-align: center;
   }
   
diff --git a/pages/index/index.scss b/pages/index/index.scss
index e2cc2d06598e68a53f207e77ef22ad01fcbded47..e1c68339dcf153d3580657468924d4c4fb18365e 100644
--- a/pages/index/index.scss
+++ b/pages/index/index.scss
@@ -3,107 +3,94 @@
  // }
 page {
   width: 100%;
-  height: 100vh;
+  height: 100%;
+  flex: 1;
   background-color: #2e2e3e;
   /* #ifdef H5 */
   @media screen and (min-device-width:960px){
+    height: 100vh;
     padding: 20px;
-    padding-bottom: 60px;
     .pointer {
       cursor: pointer;
     }
   }
-   @media screen and (max-device-width:960px){
-      height: calc(100vh - 44px);
-    }
   /* #endif */
   .uni-im-index {
     // border: 1px solid #FFF;
     background-color: #ececec;
     flex: 1;
     height: 100%;
+    overflow: hidden;
+    flex-direction: row;
     /* #ifdef H5 */
     @media screen and (min-device-width:960px){
       border-radius: 20px;
     }
-    /* #endif */
-    overflow: hidden;
-    flex-direction: row;
     #left-view {
-      /* #ifdef H5 */
-      & > *{
+      .item{
        cursor: pointer;
        margin-top: 36px;
       }
-      & > *:hover{
-       /* border: 1px solid #fefefe; */
+      .item:hover{
        box-shadow: 0 0 20px 2px #fefefe;
        border-radius: 10px;
       }
-      /* #endif */
       width:60px;
       align-items: center;
       padding-top: 100px;
       background-color: #ececec;
       border-radius: 20px 0 0 20px;
-    }
-    #center-view{
-      background-color: #f5f5f5;
-      width: 100%;
-      /* #ifdef H5 */
-      @media screen and (min-device-width:960px){
-        width:300px;
+      
+      .uni-link:hover{
+        color: #00aa55 !important;
       }
-      /* #endif */
-      overflow: hidden;
-      #search-bar-box {
-        flex-direction: row;
-        align-items: center;
-        height: 70px;
-        padding:0 10px;
-        #search-bar {
-          flex: 1;
-        }
-      }
-      #conversation-list-box {
-        height: 0;
-        flex: 1;
-        /* #ifdef H5 */
-        @media screen and (min-device-width:960px){
-          ::v-deep {
-            .conversation-list-item {
-              margin: 5px;
-            }
+      .download {
+        box-shadow: unset;
+        margin-top: auto;
+        margin-bottom: 60px;
+        .item {
+          box-shadow: unset;
+          margin-top: 25px;
+          padding: 5px;
+          width: 45px;
+          &:hover {
+            box-shadow: 0 0 20px 2px #fefefe;
           }
-        }
-        /* #endif */
-      }
-      #uni-im-contacts-box {
-        position: absolute;
-        top: 0;
-        left: 0;
-        z-index: 9;
-        width: 100%;
-        height: 100%;
-        .contacts-pages ::v-deep {
-          .user-list-box {
-            overflow: auto;
+          ::v-deep span {
+            display: flex;
+            align-items: center;
+            flex-direction: column;
+            .icon {
+              font-size: 12px;
+               width: 26px;
+               height: 26px;
+               margin-bottom: 3px;
+            }
+            .title {
+              width: 50px;
+              text-align: center;
+              font-size: 12px;
+              transform: scale(0.8);
+              color: #666;
+            }
           }
-          .activeMenu {
-            background-color: #f5f5f5 !important;
+          &.uni-link--withline {
+            // 去掉下划线
+            text-decoration: unset !important;
           }
         }
       }
-    }  
+    }
     #right-view {
+      position: relative;
       width: 0;
       flex-grow: 1;
       background-color: #FFFFFF;
       #chat-view-box {
         flex-grow: 1;
         .header {
-          height: 70px;
-          background-color: #FFFFFF;
+          height: 50px;
+          background-color: #FAFAFA;
           padding:0 20px;
           flex-direction: row;
           justify-content: end;
@@ -119,14 +106,17 @@ page {
             {
               position: absolute;
               z-index: 99;
-              top: -45px;
+              top: -35px;
               left: 15px;
+              flex-direction: row;
             }
             .unread_count {
               display: none;
             }
             .msg-list {
               .uni-im-list {
+                height: 0;
+                flex: 1;
                 .uni-im-msg {
                   padding: 0 10px;
                 }
@@ -144,7 +134,6 @@ page {
             .group-info-parent{
               height: 100%;
               overflow-y: auto;
-              background-color: #f5f5f5;
             }
             .group-info-text {
               max-width: 250px !important;
@@ -170,7 +159,7 @@ page {
       #dynamic-component-box {
        z-index: 9;
        width: 100%;
-       height: 95vh;
+       height: 100%;
        background-color: #fff;
        position: absolute;
        right: 0;
@@ -191,36 +180,101 @@ page {
        }
       }
     }
+    /* #endif */
+    #center-view{
+      position: relative;
+      background-color: #FFF;
+      width: 100%;
+      /* #ifdef H5 */
+      @media screen and (min-device-width:960px){
+        width:300px;
+        background-color: #F9F9F9;
+      }
+      /* #endif */
+      overflow: hidden;
+      #search-bar-box {
+        flex-direction: row;
+        align-items: center;
+        height: 50px;
+        padding:0 10px;
+        background-color: #FCFCFC;
+        #search-bar {
+          flex: 1;
+          padding: 0;
+          ::v-deep .uni-searchbar__box {
+            height: 26px;
+            justify-content: flex-start;
+            .uni-input-placeholder,
+            .uni-searchbar__text-placeholder {
+              color: #CCC;
+              font-size: 12px;
+              padding-left: 0;
+            }
+            .uni-searchbar__box-icon-search {
+              padding: 0 2px 0 8px;
+              top: -1px;
+              .uniui-search:before {
+                font-size: 14px;
+                color: #CCC;
+              }
+            }
+          }
+        }
+        .add-icon {
+          margin-left: 10px;
+          width: 25px;
+          height: 25px;
+          display: flex;
+          background-color: #f3f3f3;
+          justify-content: center;
+          align-items: center;
+          border-radius: 5px;
+        }
+      }
+      #conversation-list-box {
+        height: 0;
+        flex: 1;
+        /* #ifdef H5 */
+        @media screen and (min-device-width:960px){
+          ::v-deep {
+            .conversation-list-item {
+              margin: 5px;
+            }
+          }
+        }
+        /* #endif */
+      }
+      #uni-im-contacts-box {
+        position: absolute;
+        top: 0;
+        left: 0;
+        z-index: 9;
+        width: 100%;
+        height: 100%;
+        .contacts-pages ::v-deep {
+          .user-list-box {
+            overflow: auto;
+          }
+          .activeMenu {
+            background-color: #f5f5f5 !important;
+          }
+        }
+      }
+    }  
   }
-  #foot {
-    position: fixed;
-    width: 100%;
-    height: 50px;
-    bottom: 0;
-    flex-direction: row;
-    justify-content: center;
-    color: #FFFFFF;
-    .uni-link:hover{
-      color: #00aa55 !important;
-    }
-    .item {
-       flex-direction: row;
-       margin:0 50px;
-       align-items: center;
-      .icon {
-         width: 20px;
-         height: 20px;
-         margin-right: 5px;
-       }
-       .link {
-         margin-left: 5px;
-       }
-     }
-   }
 }
 
 .windows {
   #center-view #conversation-list-box  .conversation-list-item .uni-list-chat__container {
     padding-right: 10px;
   }
-} 
\ No newline at end of file
+} 
+
+.isPWA {
+  uni-page-body {
+    padding: 0;
+    .uni-im-index {
+      border-radius: 0;
+    }
+  }
+}
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 39f062e0bc539bddc6cbd3f73b6f6223a5d4ed19..ef906df47a42db8c655a1d958df1ef8d20aee4ba 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,42 +1,38 @@
 <template>
 	<view id="page" class="uni-im-index">
 		<!-- #ifdef H5 -->
-    <!-- 底部栏 -->
-    <view id="foot" v-if="isWidescreen">
-      
-      <view class="item">
-        <image class="icon" src="https://mp-172f98d6-0564-4974-980e-d78dc9189b22.cdn.bspapp.com/cloudstorage/af92325b-6993-4765-8c80-4c69eb900fa7.png" mode="widthFix"></image>
-      	<text>APP端</text>
-        <uni-link class="link" href="https://im.dcloud.net.cn/uni-portal.html" text="下载地址"></uni-link>
-      </view>
-      
-      <view class="item">
-        <image class="icon" src="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/hx.png" mode="widthFix"></image>
-      	<text>离线通知插件</text>
-        <uni-link class="link" href="https://ext.dcloud.net.cn/plugin?id=16984" text="下载地址"></uni-link>
-      </view>
-      
-      <view class="item">
-        <image class="icon" src="https://web-assets.dcloud.net.cn/unidoc/zh/git-1.png" mode="widthFix"></image>
-      	<text>本项目已开源</text>
-        <uni-link class="link" href="https://gitcode.net/dcloud/hello-uni-im/-/tree/v3" text="git仓库地址"></uni-link>
-      </view>
-      
-    </view>
-
 		<!-- 布局最左侧 菜单栏 -->
 		<view id="left-view" v-if="isWidescreen" @click="chatInfoIsShow = false;">
-			<cloud-image class="user-avatar" @click="toUcenter" :src="avatarUrl" width="40px" height="40px"
-				borderRadius="100px"></cloud-image>
-			<!-- {{currentUserInfo.username}} -->
-			<uni-badge @contextmenu.prevent.native="openConversationMenu($event,'unreadMsgCount')" class="chat-icon" size="small" :text="unreadMsgCount" absolute="rightTop" type="error">
+			<uni-im-img class="user-avatar item" @click="toUcenter" :src="avatarUrl" width="40px" height="40px"
+				borderRadius="10px"></uni-im-img>
+			<uni-badge class="chat-icon item" @contextmenu.prevent.native="openConversationMenu($event,'unreadMsgCount')" size="small" :text="unreadMsgCount" absolute="rightTop" type="error">
 				<uni-icons  @click="showChatView"
 					:color="contactsViewIsShow?'#c5c5c5':'#5fc08e'" size="32" type="chatbubble-filled"></uni-icons>
 			</uni-badge>
-			<uni-badge id="show-contacts-btn" size="small" :text="unreadnotificationCount" absolute="rightTop" type="error">
+			<uni-badge class="item" id="show-contacts-btn" size="small" :text="unreadnotificationCount" absolute="rightTop" type="error">
 				<uni-icons @click="showContactsView" :color="contactsViewIsShow?'#5fc08e':'#c5c5c5'" size="32"
 					type="staff-filled"></uni-icons>
 			</uni-badge>
+      <template v-for="(component,index) in extIndexMenu" :key="index" class="item">
+        <component :is="component"></component>
+      </template>
+      
+      <view class="download">
+        <uni-link class="item" href="https://im.dcloud.net.cn/uni-portal.html" text="下载地址">
+          <image class="icon" src="https://mp-172f98d6-0564-4974-980e-d78dc9189b22.cdn.bspapp.com/cloudstorage/af92325b-6993-4765-8c80-4c69eb900fa7.png" mode="widthFix"></image>
+        	<text class="title">APP端</text>
+        </uni-link>
+        
+        <uni-link class="item" href="https://ext.dcloud.net.cn/plugin?id=16984">
+          <image class="icon" src="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/hx.png" mode="widthFix"></image>
+        	<text class="title">通知插件</text>
+        </uni-link>
+        
+        <uni-link class="item" href="https://gitcode.net/dcloud/hello-uni-im/-/tree/v3">
+          <image class="icon" src="https://web-assets.dcloud.net.cn/unidoc/zh/git-1.png" mode="widthFix"></image>
+        	<text class="title">开源仓库</text>
+        </uni-link>
+      </view>
 		</view>
 		<!-- #endif -->
 
@@ -46,8 +42,11 @@
       <template v-if="isWidescreen">
         <!-- 搜索会话用户、聊天记录... -->
         <view id="search-bar-box" v-show="!contactsViewIsShow">
-        	<uni-search-bar v-model="keyword" id="search-bar" radius="5" placeholder="搜索" clearButton="auto" cancelButton="none"></uni-search-bar>
-        	<uni-icons class="pointer" @click="beforeJoinGroup" color="#aaa" size="26" type="plus"></uni-icons>
+        	<uni-search-bar v-model="keyword" id="search-bar" radius="5" placeholder="搜索" bgColor="#F3F3F3" clearButton="auto" cancelButton="none"></uni-search-bar>
+        	<!-- <uni-icons class="pointer" @click="beforeJoinGroup" color="#aaa" size="26" type="plus"></uni-icons> -->
+        	<view class="add-icon-box">
+            <uni-im-icons title="加入群聊" class="pointer add-icon" @click="beforeJoinGroup" color="#999" size="12" code="eab9"></uni-im-icons>
+          </view>
         </view>
         <view id="uni-im-contacts-box" v-show="contactsViewIsShow">
         	<uni-im-contacts @clickMenu="clickMenu" id="uni-im-contacts" ref="uni-im-contacts"></uni-im-contacts>
@@ -78,21 +77,19 @@
 			<!-- 聊天窗口 -->
 			<view id="chat-view-box">
 				<template v-if="!contactsViewIsShow && currentConversationId">
-          <chat-filtered v-if="filteredConversationId" class="content" ref="chat-filtered" @to-chat="toChat($event)"/>
-          <template v-else>
-            <view class="header">
-            	<uni-icons @click="showChatInfo" class="more" type="more-filled" size="20"></uni-icons>
-            </view>
-            <view class="content">
-              <chat-view ref="chat-view"></chat-view>
-              <view v-if="chatInfoIsShow" class="chatInfoBox" @click.stop="chatInfoIsShow = false">
-                <view @click.stop class="group-info-parent">
-                  <uni-im-group-info v-if="currentConversation.group_id" ref="group-info"></uni-im-group-info>
-                  <uni-im-chat-info v-else ref="chat-info"></uni-im-chat-info>
-                </view>
+          <view class="header">
+            <uni-icons @click="showChatInfo" class="more" type="more-filled" size="20"></uni-icons>
+          </view>
+          <view class="content">
+            <chat-filtered v-if="filteredConversationId" ref="chat-filtered" @to-chat="toChat($event)"/>
+            <chat-view v-else ref="chat-view"></chat-view>
+            <view v-if="chatInfoIsShow" class="chatInfoBox" @click.stop="chatInfoIsShow = false">
+              <view @click.stop class="group-info-parent">
+                <uni-im-group-info v-if="currentConversation.group_id" ref="group-info"></uni-im-group-info>
+                <uni-im-chat-info v-else ref="chat-info"></uni-im-chat-info>
               </view>
             </view>
-					</template>
+          </view>
 					
 				</template>
     
@@ -113,10 +110,7 @@
 </template>
 
 <script>
-	import {
-		store as uniIdStore,
-		mutations as uniIdMutations
-	} from '@/uni_modules/uni-id-pages/common/store.js';
+  import {markRaw} from "vue";
 	import uniIm from '@/uni_modules/uni-im/sdk/index.js';
 	import contacts from '@/uni_modules/uni-im/pages/contacts/contacts';
 
@@ -151,6 +145,7 @@
 		// #endif
 		data() {
 			return {
+        extIndexMenu: uniIm.extensions.invokeExts("index-page-menu").map(i=>markRaw(i.component)),
 				users: {},
 				dynamicComponentName: 'uni-im-addPeopleGroups', //通过动态组件引入页面在pc端显示
 				view2Title: '加人/加群',
@@ -171,14 +166,8 @@
 			unreadnotificationCount() {
 				return uniIm.notification.unreadCount()
 			},
-			currentUserInfo() {
-				return uniIdStore.userInfo
-			},
 			avatarUrl() {
-				if (this.currentUserInfo.avatar_file && this.currentUserInfo.avatar_file.url) {
-					return this.currentUserInfo.avatar_file.url
-				}
-				return '/uni_modules/uni-im/static/avatarUrl.png'
+				return uniIm.currentUser?.avatar_file?.url || '/uni_modules/uni-im/static/avatarUrl.png'
 			}
 		},
 		watch: {
@@ -229,10 +218,12 @@
 			},
       //  根据当前会话id，设置会话对象
 			async currentConversationId(id) {
-				this.currentConversation = await uniIm.conversation.get(id)
-        // 如果是被隐藏的会话，取消隐藏
-        if(this.currentConversation.hidden){
-          this.currentConversation.hidden = false
+        if(id){
+          this.currentConversation = await uniIm.conversation.get(id)
+          // 如果是被隐藏的会话，取消隐藏
+          if(this.currentConversation.hidden){
+            this.currentConversation.hidden = false
+          }
         }
 			}
 		},
@@ -243,7 +234,7 @@
        */
       await Promise.all(uniIm.extensions.invokeExts('index-load-before-extra', param))
       
-      const {tokenExpired} = uniCloud.getCurrentUserInfo()
+      const {tokenExpired} = uniIm.currentUser
       if (tokenExpired < Date.now()) {
       	console.info('当前用户的登录状态无效，将自动跳转至登录页面。', param)
       	let url = '/uni_modules/uni-id-pages/pages/login/login-withpwd?uniIdRedirectUrl='
@@ -264,6 +255,9 @@
         this.init(param)
       })
 		},
+    onShow(){
+      
+    },
 		async onReady() {
       uni.$on('uni-im-toChat', param => {
       	if (param) {
@@ -274,33 +268,111 @@
       	this.contactsViewIsShow = false
       })
 			// #ifdef H5
-      const shortcutKeyFn = (keyName,event)=>{
-        const index = this.conversationList.findIndex(item=>item.id == this.currentConversationId)
-        if(keyName == 'ArrowUp' && index > 0){
-          this.toChat( this.conversationList[index - 1].id )
-          event.preventDefault();
-        }else if(keyName == 'ArrowDown' && index < this.conversationList.length){
-          this.toChat( this.conversationList[index + 1].id )
-          event.preventDefault();
+      const deviceInfo = uni.getDeviceInfo()
+      if(deviceInfo.deviceType === 'pc'){
+        // about PWA start -
+        // 判断用户是否已经要求不再显示安装PWA的提示
+        const isNotShowInstallPWAPrompt = uni.getStorageSync('uni-im-data:isNotShowInstallPWAPrompt')
+        if(!isNotShowInstallPWAPrompt){
+          const mediaQuery = window.matchMedia('(display-mode: standalone)');
+          function handleMediaChange(event) {
+            // console.error('standalone',event.matches)
+            if (event.matches) {
+              document.body.classList.add('isPWA')
+            } else {
+              document.body.classList.remove('isPWA')
+              // console.error('window.installPWAPrompt',window.installPWAPrompt)
+              if(window.installPWAPrompt){
+                uni.showModal({
+                  content: '仅需 1 秒，即可快速安装本应用桌面端，畅享更好的体验。',
+                  cancelText: '不再提醒',
+                  confirmText: '安装',
+                  success: (res) => {
+                    if (res.confirm) {
+                      window.installPWAPrompt.prompt();
+                    }else{
+                      console.error('不再提醒');
+                      uni.setStorage({
+                        key: 'uni-im-data:isNotShowInstallPWAPrompt',
+                        data: true
+                      })
+                    }
+                  }
+                });
+              }
+            }
+          }
+          mediaQuery.addListener(handleMediaChange);
+          handleMediaChange(mediaQuery);
+        }
+        // about PWA end -
+        
+        
+        const centerView = document.querySelector('#center-view')
+        const indexCenterViewWidth = uni.getStorageSync('uni-im-data:indexCenterViewWidth') || "380px"
+        centerView.style.width = indexCenterViewWidth
+        // 拖动center-view的 伪元素 after 来调整center-view的宽度
+        const resizeLine = document.createElement('div')
+        resizeLine.className = 'resize-line'
+        resizeLine.style = `
+          position: absolute;
+          top: 0;
+          right: 0;
+          width: 3px;
+          height: 100%;
+          cursor: col-resize;
+        `;
+        centerView.appendChild(resizeLine)
+        resizeLine.addEventListener('mousedown', (e) => {
+          e.preventDefault()
+          let startX = e.clientX
+          let startWidth = centerView.offsetWidth
+          document.onmousemove = (e) => {
+            let moveX = e.clientX - startX
+            const newWidth = startWidth + moveX
+            if(newWidth > 550){
+              // 改变鼠标样式，为向左箭头
+              document.body.style.cursor = 'w-resize';
+            }else if(newWidth < 200){
+              // 改变鼠标样式，为向右箭头
+              document.body.style.cursor = 'e-resize';
+            }else{
+              centerView.style.width = newWidth + 'px'
+              uni.setStorage({
+                key: 'uni-im-data:indexCenterViewWidth',
+                data: centerView.style.width
+              })
+            }
+          }
+          document.onmouseup = () => {
+            document.body.style.cursor = '';
+            document.onmousemove = null
+            document.onmouseup = null
+          }
+        })
+        const shortcutKeyFn = (keyName,event)=>{
+          const index = this.conversationList.findIndex(item=>item.id == this.currentConversationId)
+          if(keyName == 'ArrowUp' && index > 0){
+            this.toChat( this.conversationList[index - 1].id )
+            event.preventDefault();
+          }else if(keyName == 'ArrowDown' && index < this.conversationList.length){
+            this.toChat( this.conversationList[index + 1].id )
+            event.preventDefault();
+          }
+        }
+        uniIm.utils.shortcutKey.withMeta(shortcutKeyFn)
+        uniIm.utils.shortcutKey.withCtrl(shortcutKeyFn)
+        
+        if (!window.chrome && (deviceInfo.deviceType === 'pc' || deviceInfo.platform != 'ios')) {
+          let newElement = document.createElement('div')
+          newElement.innerHTML = `
+          <div id="tip-browser-compatibility" style="background: #fff9ea;color: #ff9a43;position: fixed;top: 0;left: 0;width: 100vw;padding: 15px;font-size: 18px;">
+          	注意：本系统仅兼容chrome内核的浏览器，其他浏览器可能出现异常。<a href="https://www.google.cn/chrome/">点此下载chrome浏览器</a>
+          </div>
+          `
+          document.body.appendChild(newElement)
         }
       }
-      uniIm.utils.shortcutKey.withMeta(shortcutKeyFn)
-      uniIm.utils.shortcutKey.withCtrl(shortcutKeyFn)
-      
-			let systemInfo = uni.getSystemInfoSync()
-			uniIm.systemInfo = systemInfo
-			if (systemInfo.browserName != 'chrome' && (this.isWidescreen == true || systemInfo.osName != 'ios')) {
-        let newElement = document.createElement('div')
-        newElement.innerHTML = `
-        <div id="tip-browser-compatibility" style="background: #fff9ea;color: #ff9a43;position: fixed;top: 0;left: 0;width: 100vw;padding: 15px;font-size: 18px;">
-        	注意：本系统仅兼容chrome浏览器，其他浏览器可能出现异常。<a href="https://www.google.cn/chrome/">点此下载chrome浏览器</a>
-        </div>
-        `
-        document.body.appendChild(newElement)
-      }
-      
-      // 设置 right-view的宽为屏幕的百分之99
-      // document.querySelector('#right-view').style.width = systemInfo.screenWidth - 360 + 'px'
 			// #endif
 		},
 		onUnload() {
@@ -355,7 +427,7 @@
             })
           }
         }).catch((err) => {
-        	if(err.message === "已经是群成员"){
+        	if(err.code === 10001){
             console.log('已经是群成员 直接打开对应页面');
         		return this.toChat("group_" + group_id)
         	}
@@ -483,7 +555,7 @@
                           .filter(item => !item.mute)
                           .map(item => item.id)
         if(ucId.length > 0){
-          let index = ucId.findIndex(item => item.id == this.currentConversation.id)
+          let index = ucId.findIndex(item => item == this.currentConversation.id)
           // 如果当前会话存在未读消息，则切换到下一个会话。如果当前会话不存在未读消息，则切换到第一个存在未读消息的会话
           index >= 0 ? index ++ : index = 0;
           this.toChat(ucId[index])
@@ -529,24 +601,12 @@
 
       async toChat(param) {
         this.chatInfoIsShow = false;
-        // console.log('toChat param',param);
-        let conversation_id = await getConversationId(param)
-
         this.keyword = ''
         this.filteredConversationId = false
-        uniIm.currentConversationId = conversation_id
         
-        // console.log('conversation_id',conversation_id);
-        
-        if(conversation_id.indexOf('group_') === 0){
-          uni.showLoading({
-            title: '加载中',
-            mask: false
-          });
-          const conversation = await uniIm.conversation.get(conversation_id)
-          uni.hideLoading()
-        }
-
+        const conversation_id = await getConversationId(param)
+        // console.log('toChat', conversation_id)
+        uniIm.currentConversationId = conversation_id
         if (this.isWidescreen) { // 若为宽屏，则切换右侧的组件
           this.$nextTick(() => {
             let chatViewRef = this.$refs['chat-view']
@@ -570,7 +630,7 @@
             } else if (param.group_id) {
               return 'group_' + param.group_id
             } else if (param.user_id || param.friend_uid) {
-              // 注：这里不使用静态方法，为了将打开的会话可能不存在的情况，需要本地创建的情况
+			  // 获取会话id（如果此单聊会话未创建会自动创建）
               return (await uniIm.conversation.get(param)).id
             } else {
               throw new Error("toChat param is error")
diff --git a/pages/userList/userList.vue b/pages/userList/userList.vue
index 2b5dd1b957e1c3c0997e65f25d894fb34aa05357..1897e45f53886c31bc048cbd3343e51090c1cea2 100644
--- a/pages/userList/userList.vue
+++ b/pages/userList/userList.vue
@@ -5,10 +5,10 @@
 			<view v-if="error" class="error">
 				<text>{{ error.message }}</text>
 			</view>
-			<uni-list v-else>
+			<uni-list v-else :border="false">
 				<uni-im-info-card v-for="(item, index) in data" :key="item._id" link
 					:title="item.nickname"
-					:avatar="item.avatar_file ? item.avatar_file.url : '/uni_modules/uni-im/static/avatarUrl.png'"
+					:avatar="item.avatar_file?.url || '/uni_modules/uni-im/static/avatarUrl.png'"
 					@click="toChat(item._id)"></uni-im-info-card>
 			</uni-list>
 			<uni-im-load-state :status="loading ? 'loading' : loadMoreStatus"></uni-im-load-state>
diff --git a/readme.md b/readme.md
index 0f28c570d17479dd33680d0e7c421bfeba28563a..539085e44c51a06e043510737186e51f270dda8a 100644
--- a/readme.md
+++ b/readme.md
@@ -1,29 +1,33 @@
-# 简介  
+**uni-im 已开放需求征集和投票** [点此前往](https://vote.dcloud.net.cn/#/?name=uni-im)
+
+# 简介
 uni-im是云端一体的、全平台的、免费的、开源即时通讯系统。
 - 基于uni-app，App、小程序、web全端兼容
 - 基于uniCloud，前后端都使用js开发
 - 基于[uni-push2](https://uniapp.dcloud.net.cn/unipush-v2.html)，专业稳定的全端推送系统
-- 基于[uni-id](https://uniapp.dcloud.net.cn/uniCloud/uni-id-summary.html)，完善的账户体系
+- 基于[uni-id](https://uniapp.dcloud.net.cn/uniCloud/uni-id/summary.html)，完善的账户体系
 - 支持服务端为非uniCloud（比如：应用服务端的开发语言是php、java、go、.net、python、c#等）或 不基于uni-id-pages 开发的项目接入
 
 案例：
+1. 应用名称：DCloud，该 App 的内置聊天模块，即基于 uni-im 开发。下载地址为：[https://im.dcloud.net.cn/uni-portal.html](https://im.dcloud.net.cn/uni-portal.html)  
 
-<img width="600px" src="https://qiniu-web-assets.dcloud.net.cn/ext/uni-im/20230228110007.jpg"></img>
-
-如图：在插件市场任意插件详情页面，点击咨询作者按钮，即可看到基于uni-im搭建的客服系统。
+2. 如图：在插件市场任意插件详情页面，点击“进入交流群”按钮，即可看到基于uni-im搭建的客服系统。
+<img width="600px" src="https://web-ext-storage.dcloud.net.cn/unicloud/uni-im/img/17198039234743b6c4dd0-27b8-11eb-9e1d-136fabf12402.png">
 
 下载地址：[https://ext.dcloud.net.cn/plugin?name=uni-im](https://ext.dcloud.net.cn/plugin?name=uni-im)
 
 ## 特点优势  
-- 性价比高；前后端代码均免费开源，相比竞品使用uni-im仅需花费极少的托管在uniCloud（serverless服务器）产生的费用[详情查看](#cost)
+- 性价比高；前后端代码均免费开源，相比同类产品使用uni-im仅需花费极少的托管在uniCloud（serverless服务器）产生的费用[详情查看](#cost)
 - 全端可用
+- App端支持nvue，更好的长列表性能。list组件性能优势[详情参考](https://uniapp.dcloud.net.cn/component/list.html)
 - 中心化响应式数据管理，切换会话无需重新加载数据，更流畅的体验
 - App端聚合多个手机厂商推送通道，app不在线也可以收到消息
 
 优先开发哪些，取决于开发者的反馈。同时也欢迎开发者共建这个开源项目。
-> uni-im相关功能建议或问题，可以加入由uni-im（本插件）搭建的交流群，[点此加入](https://im.dcloud.net.cn/#/?joinGroup=63ef49711d358337456f4d67)，备用QQ群（当系统处于维护中使用）群号:[854520009](https://qm.qq.com/cgi-bin/qm/qr?k=DJNSajXAYHnYcr9pouOfxF9Rwwl1AJHc&jump_from=webapi&authKey=HZ1fG58Eudp3o0GCoyx1/UPMY9Fv1sGT5jdqYqPJlTGT0XVUip3Bk8E+UyToQOMo)
+> uni-im相关功能建议或问题，可以加入由uni-im（本插件）搭建的交流群[点此加入](https://im.dcloud.net.cn/#/?joinGroup=63ef49711d358337456f4d67)
+
+## 使用uniCloud产生的费用说明@cost
 
-## 使用uniCloud产生的费用说明@cost  
 uni-im本身并不收费，实际使用中需要依赖uniCloud云服务，会产生费用；而uniCloud的价格很实惠：  
 - 调用10000次云函数仅需0.0133元
 - 调用10000次数据库查询仅需0.015元
@@ -53,4 +57,4 @@ uni-im本身并不收费，实际使用中需要依赖uniCloud云服务，会产
 
 相比市面上同类型产品，使用uni-im仅需花费如此便宜的uniCloud（serverless服务器）费用；在价格这块uni-im性价比极高。
 
-## 开发文档[详情查看](https://uniapp.dcloud.net.cn/uniCloud/uni-im.html)
+## 开发文档[详情查看](https://uniapp.dcloud.net.cn/uniCloud/uni-im.html)
\ No newline at end of file
diff --git a/sdk/ext/CloudData.class.js b/sdk/ext/CloudData.class.js
new file mode 100644
index 0000000000000000000000000000000000000000..6a1d26c0f9e05cbdfce2238e490c43ef4c1ee70a
--- /dev/null
+++ b/sdk/ext/CloudData.class.js
@@ -0,0 +1,330 @@
+const dbJQL = uniCloud.databaseForJQL()
+const dbJQLcmd = dbJQL.command
+const $ = dbJQL.command.aggregate
+import $state from '../state/index.js';
+import utils from '@/uni_modules/uni-im/sdk/utils/index.js';
+
+export default class CloudData {
+  dataList = []
+  hasMore = true
+  loading = false
+  loadLimit = 100
+  indexKey = '_id'
+  __getMoreQueue = []
+  // 被哪个类继承
+  inheritedBy = ''
+  constructor() {
+    // this.dbJQL = dbJQL
+    // this.dbJQLcmd = dbJQLcmd
+    // this.dbJQL$ = $
+    if(this.indexKey){
+      this.dataMap = new Map()
+    }
+  }
+  reset() {
+    this.dataList.length = 0
+    this.hasMore = true
+    this.loading = false
+    if(this.indexKey){
+      this.dataMap.clear()
+    }
+  }
+  remove(param) {
+    let item = this.find(param)
+    if(item){
+      if(Array.isArray(this.dataList)){
+        this.dataList.splice(this.dataList.indexOf(item), 1)
+      }else{
+        delete this.dataList[item._id]
+      }
+      if(this.indexKey){
+        let key;
+        this.indexKey.split('.').forEach(k => {
+          key = key ? key[k] : item[k]
+        })
+        this.dataMap.delete(key)
+      }
+    }
+    this.__afterRemove(item)
+  }
+  __beforeRemove(param) {
+    // 空实现
+    return param
+  }
+  __afterRemove(param) {
+    // 空实现
+    return param
+  }
+  __beforeFind(param) {
+    // 空实现，用于子类重写
+    return param
+  }
+  /**
+   * @description 查找本地中存在的数据
+   * @param {Object} param 查找条件，如果为空则返回全部数据，否则返回查找到的1条数据
+   */
+  find(param) {
+    if(!param){
+      throw new Error('请传入查找条件')
+    }
+    const dataList = this.dataList
+    param = this.__beforeFind(param)
+    let res;
+    if(this.indexKey){
+      // 先判断param是否和this.indexKey一样,可以走dataMap查找
+      const indexKeyArr = this.indexKey.split('.');
+      let mapKey = false;
+      // 判断索引为字符串还是对象
+      if(indexKeyArr.length == 1 && typeof param == 'string'){
+        // 字符串索引
+        mapKey = param
+      }else if(typeof param == 'object' && convertObjToString(param) === this.indexKey){
+        // 对象索引
+        let key;
+        indexKeyArr.forEach(k => {
+          key = key ? key[k] : param[k]
+        })
+        mapKey = key
+      }
+      if (mapKey) {
+        // console.time('find dataMap.get' + this.constructor.name)
+        res = this.dataMap.get(mapKey)
+        // console.timeEnd('find dataMap.get' + this.constructor.name)
+        return res
+      } else {
+        console.log('注意：此次查找未走索引',param,this.indexKey,this.constructor.name)
+      }
+    }
+    
+    console.time('find-no-index-' + this.constructor.name)
+    // 默认查找条件为_id
+    if(typeof param == 'string'){
+      res = dataList.find(item => item._id == param)
+    }else if(typeof param == 'object'){
+      // console.log('param',param)
+      function isEq(a, b) {
+        if (Array.isArray(a) || Array.isArray(b)) {
+          console.error('不支持数组比较')
+          return a === b;
+        }
+        let result = true;
+        for (let key in b) {
+          const valueA = a[key];
+          const valueB = b[key];
+          if (typeof valueB === 'object' 
+            && valueB !== null
+            && typeof valueA === 'object'
+            && valueA !== null
+          ) {
+            return isEq(valueA, valueB);
+          }
+          result = valueA === valueB;
+          if (!result) {
+            break;
+          }
+        }
+        return result;
+      }
+      res = dataList.find(item => isEq(item,param))
+    }else{
+      throw new Error('错误的查找条件')
+    }
+    if(this.__afterFind){
+      res = this.__afterFind({param,res})
+    }
+    console.timeEnd('find-no-index-' + this.constructor.name)
+    return res
+  }
+  /** @description 查询数据，先从本地查找，如果没有则从云端拉取
+   * @param {Object} param 查找条件，如果为空则返回全部数据，否则返回查找到的1条数据
+   */
+  async get(param) {
+    if(this.inheritedBy === 'conversation'){
+      // debugger
+    }
+    if(!param){
+      throw new Error('请传入查找条件')
+    }
+    let data = this.find(param)
+    if(!data){
+      data = await this.loadMore(param)
+    }
+    this.__afterGet(data)
+    return data
+  }
+  __afterGet(param) {
+    // 空实现，用于子类重写
+    return param
+  }
+  count() {
+    return this.dataList.length
+  }
+  __get(param){
+    // 空实现，用于子类重写
+    console.error('CloudData.pullData is not implemented')
+    // 返回入参，避免报错
+    return param
+  }
+  
+  async getMore(param) {
+    if(!param){
+      if(!this.hasMore){
+        console.log('没有更多数据了')
+        return []
+      }
+      if (this.loading) {
+        await new Promise((resolve, reject) => {
+          console.warn('正在加载中，本次请求进入列队。模块名称:' + this.constructor.name)
+          this.__getMoreQueue.push({resolve, reject})
+        })
+        console.log('列队任务已开始执行。模块名称:' + this.constructor.name)
+      }else{
+        this.loading = true
+      }
+    }
+    let datas = []
+    try{
+      datas = await this.__get(param)
+      if(!param){
+        this.hasMore = datas.length === this.loadLimit
+        this.loading = false
+      }
+    }catch(e){
+      console.error('loadMore err',e)
+      this.loading = false
+      uni.showToast({
+        title: e.message,
+        icon: 'none'
+      });
+    }
+    this.__afterGetMore?.(datas)
+    // 执行下一个队列
+    if(this.__getMoreQueue.length > 0){
+      const item = this.__getMoreQueue.shift()
+      item.resolve()
+    }
+    return datas
+  }
+  async loadMore(param) {
+    // console.log('loadMore param',param);
+    let datas = await this.getMore(param)
+    if(datas.length > 0){
+      datas = this.add(datas,{canSetIsFull:true})
+    }
+    return param == undefined ? datas : datas[0]
+  }
+  set(data){
+    // 先判断是否存在
+    let item = this.find(data.id || data._id || Object.keys(data)[0])
+    if(item){
+      // console.log('更新会话',data)
+      try{
+        utils.deepAssign(item,data)
+      }catch(e){
+        console.error('合并更新出错',{item,data,e})
+      }
+      return item
+    }else{
+      return this.add(data)
+    }
+  }
+  __beforeAdd(param) {
+    // 空实现，用于子类重写
+    return param
+  }
+  add(param,options = {}) {
+    console.time('add' + this.constructor.name)
+    const {canUpdate = true,unshift = false} = options
+    const paramIsArray = Array.isArray(param)
+    let datas = paramIsArray ? param : [param]
+    
+    // console.time('add __beforeAdd' + this.constructor.name)
+    let res = this.__beforeAdd(datas,options)
+    // console.timeEnd('add __beforeAdd' + this.constructor.name)
+    if(res !== undefined){
+      datas = res
+    }
+    // 插入之前dataList是否为空
+    const isEmpty = this.dataList.length === 0
+    const resData = datas.map(item => {
+      let val;
+      if(this.indexKey){
+        this.indexKey.split('.').forEach(k => {
+          val = val ? val[k] : item[k]
+        })
+      }else{
+        val = item._id || item.id || { [Object.keys(item)[0]]: item[Object.keys(item)[0]] }
+      }
+      // 如果当前数据列表为空或者没有传入索引值，则不检查要插入的数据是否存在
+      let _data = (isEmpty || !val) ? false : this.find(val)
+      // console.log('add _data',{_data,item})
+      // 如果已经存在的，只更新不添加
+      if(_data){
+        if(canUpdate && item != _data){
+          // console.log('添加的对象已经存在，更新对象',{item,item})
+          try{
+            utils.deepAssign(_data,item)
+          }catch(e){
+            console.error('合并更新出错',{item,_data,e})
+          }
+        }
+        return _data
+      }else{
+        if(unshift){
+          this.dataList.unshift(item)
+          item = this.dataList.slice(0,1)[0]
+        }else{
+          this.dataList.push(item)
+          item = this.dataList.slice(-1)[0]
+        }
+        if(this.indexKey){
+          // console.time('dataMap set')
+          let key;
+          this.indexKey.split('.').forEach(k => {
+            key = key ? key[k] : item[k]
+          })
+          const cs = this.__canSeaveToDataMap
+          const val = cs ? cs(item) : true
+          if(val){
+            this.dataMap.set(key, item)
+          }
+          // console.log('this.dataMap',this.dataMap)
+          // console.timeEnd('dataMap set')
+        }
+        return item
+      }
+    })
+    this.__afterAdd(resData,options)
+    // console.error('param',param)
+    console.timeEnd('add' + this.constructor.name)
+    return paramIsArray ? resData : resData[0]
+  }
+  __afterAdd(param) {
+    // 空实现，用于子类重写
+    return param
+  }
+  update(param, data) {
+    let item = this.find(param)
+    if(item){
+      Object.assign(item, data)
+    }
+    return item
+  }
+}
+
+function convertObjToString(obj) {
+  let result = '';
+  function recursiveConvert(currentObj, path) {
+    for (const key in currentObj) {
+      const value = currentObj[key];
+      const newPath = path? `${path}.${key}` : key;
+      if (typeof value === 'object') {
+        recursiveConvert(value, newPath);
+      } else {
+        result += `${newPath}`;
+      }
+    }
+  }
+  recursiveConvert(obj, '');
+  return result;
+}
\ No newline at end of file
diff --git a/sdk/ext/MsgManager.class.js b/sdk/ext/MsgManager.class.js
deleted file mode 100644
index 6c0c1c50890a014cba2e113c12522523fea4de1e..0000000000000000000000000000000000000000
--- a/sdk/ext/MsgManager.class.js
+++ /dev/null
@@ -1,640 +0,0 @@
-// import uniIm from '@/uni_modules/uni-im/sdk/index.js';
-import $utils from '@/uni_modules/uni-im/sdk/utils/index.js';
-import $methods from '@/uni_modules/uni-im/sdk/methods/index.js';
-import md5 from '@/uni_modules/uni-im/sdk/utils/md5.min.js'
-const db = uniCloud.database();
-const dbCmd = db.command
-const uniImCo = uniCloud.importObject("uni-im-co", {customUI: true})
-
-import $state from '../state/index.js'
-
-
-export default class Message {
-  constructor(currentConversation) {
-    // #ifdef APP
-    // this.sqlite = getApp().globalData.sqlite
-    // this.sqlite.clearMsgTable() // 清空数据库
-    // #endif
-    this.conversation_id = currentConversation.id
-
-    Object.defineProperty(this, 'msgList', {
-      get() {
-        return currentConversation.msgList
-      },
-      set(data) {
-        currentConversation.msgList = data
-      }
-    })
-  }
-  msgList = []
-  async sleep(t) {
-    return await new Promise((resolve, rejece) => {
-      setTimeout(resolve, t)
-    })
-  }
-  async localMsgMaxTime() {
-    // 拿到【本地】数据库中，当前会话聊天记录的最大值
-    if (this.localMsg.maxTime === false) {
-      let lastLocalDatas = await this.localMsg.get({
-        limit: 1,
-        orderBy: {
-          "create_time": "desc"
-        }
-      })
-      // console.log('lastLocalDatas------',lastLocalDatas);
-      let [lastLocalData] = lastLocalDatas
-      if (lastLocalData) {
-        this.localMsg.maxTime = lastLocalData.create_time
-      } else {
-        this.localMsg.maxTime = 0
-      }
-      // console.log('init localMsgMaxTime',this.localMsg.maxTime);
-    }
-    return this.localMsg.maxTime
-  }
-  getHistory = async () => {
-    // 锁定接口，禁止同一个会话对象并发查询
-    if(this.getHistory.isLock){
-      // console.log('this.getHistory.isLock');
-      await new Promise((resolve,reject)=>{
-        setTimeout(()=> {
-          if(this.getHistory.isLock === false){
-            // console.log('已结束');
-            resolve()
-          }
-        }, 300);
-      })
-    }
-    this.getHistory.isLock = true
-    // console.log('do getHistory');
-    /**
-     *  必须满足假设条件：大于本地会话更新时间的聊天数据（1.会话过程中，实时收到 2.启动/socket断线重连时，查云端数据库拉取）已拉取完整。
-     */
-    let database = false
-    if (0 && this.localMsg.hasMore) { // TODO暂时先不查本地库
-      database = this.localMsg
-    }else if(this.cloudMsg.hasMore){
-      database = this.cloudMsg
-    }else{
-      this.getHistory.isLock = false
-      return []
-    }
-    //已经拉取的数据中时间最小的值，作为最大
-    let maxTime = this.msgList[0] ? this.msgList[0].create_time : false
-    let data = await database.get({maxTime})
-    this.getHistory.isLock = false
-    
-    if(data.length && database != this.localMsg){
-      // 如果数据不来源本地，需要将查到的数据存入数据库
-      // this.localMsg.add(data) // TODO暂时先不写
-    }
-    database.hasMore = data.length != 0
-    return data.length ? data : this.getHistory()
-  }
-  cloudMsg = {
-    hasMore: true,
-    get: async ({
-      minTime = 0,
-      maxTime = false,
-      limit = 30
-    } = {}) => {
-      // console.log(1111,minTime,maxTime);
-      //console.log('this',this);
-      // let where = `"conversation_id" == "${this.conversation_id}"`
-      let where = {
-        "conversation_id": this.conversation_id
-      }
-      if (minTime && maxTime) {
-        where.update_time = dbCmd.and([
-          dbCmd.gt(minTime),
-          dbCmd.lt(maxTime)
-        ])
-      } else {
-        if (minTime) {
-          // where += `&& "update_time" > ${minTime}`
-          where.update_time = dbCmd.gt(minTime)
-        }
-        if (maxTime) {
-          // where += `&& "update_time" < ${maxTime}`
-          where.update_time = dbCmd.lt(maxTime)
-        }
-      }
-      const msgTable = db.collection('uni-im-msg')
-      let data;
-      try {
-        let res = await msgTable.where(where)
-          .limit(limit)
-          .orderBy('update_time', 'desc')
-          .get()
-        data = res.result.data.reverse()
-        // console.error('where', where,{minTime,maxTime},data);
-      } catch (e) {
-        // console.error(e);
-        // 断网等网络异常情况，会请求不到直接返回空即可
-        data = []
-      }
-      return data
-    }
-  }
-  localMsg = {
-    maxTime: false,
-    hasMore: true,
-    get: async ({
-      minTime = 0,
-      maxTime = false,
-      limit = 30,
-      orderBy = {
-        "create_time": "asc"
-      }, //asc 升序，desc 降序
-      _id = false
-    } = {}) => {
-      // #ifdef APP
-      // console.log('app的暂时注释掉')
-      // return []
-      let sql = `select * from msg WHERE conversation_id = "${this.conversation_id}" ` //注意结尾要留空格，下一段语句连接
-      if (_id) {
-        sql += `AND "_id" == "${_id}" `
-      } else if (maxTime || minTime) {
-        if (maxTime) {
-          sql += `AND create_time < ${maxTime} `
-        }
-        if (minTime) {
-          sql += `AND create_time > ${minTime} `
-        }
-      }
-      // 注意传入的orderBy是查询结果不是过程，im场景下都是从大到小查询
-      sql += `ORDER BY "create_time" DESC `
-
-      if (limit) {
-        sql += `LIMIT ${limit} `
-      }
-
-      let datas = []
-      try {
-        // datas = await this.sqlite.selectSql(sql)
-        // console.log(`###############从本地sqlite中找到，${datas.length}条，数据,sql:`,sql,{datas});
-      } catch (e) {
-        // 错误时，仍然返回空数组，提高 高可用性
-        console.error(e)
-      }
-      
-      datas = datas.map(data => {
-        try {
-          // 将数据中的字符串转义字符恢复
-          for (let key in data) {
-            if (typeof data[key] === 'string') {
-              data[key] = unescapeText(data[key])
-              // 尝试将字符串转换为对象
-              if (data[key].indexOf('{') === 0 || data[key].indexOf('[') === 0) {
-                try {
-                  data[key] = JSON.parse(data[key])
-                } catch (e) {
-                  console.log(e,data[key])
-                }
-              }
-            }
-          }
-          // console.log('data',data);
-          
-        } catch (e) {
-          console.error(e,data.body)
-        }
-        return data
-      }).sort((a, b) => {
-        if (orderBy.create_time == 'asc') {
-          return a.create_time - b.create_time
-        } else {
-          return b.create_time - a.create_time
-        }
-      })
-      // console.log('datas~~~~~~',datas);
-      // 方便测试先只显示1条
-      // datas = datas.slice(0,1)
-      return datas
-      // #endif
-
-      // #ifdef H5
-      let datas = await new Promise((resolve, reject) => {
-        //  根据 id 查询
-        if (_id) {
-          // console.error('$state.indexDB~~~',$state.indexDB)
-          let getRequest = $state.indexDB.transaction("uni-im-msg")
-            .objectStore("uni-im-msg")
-            .index("_id")
-            .get(_id)
-          getRequest.onsuccess = function(event) {
-            if (getRequest.result) {
-              resolve([getRequest.result])
-            } else {
-              resolve([])
-            }
-          };
-          getRequest.onerror = function(event) {
-            console.log('Error getting data');
-            resolve([])
-          };
-          return
-        }
-
-        let datas = [],
-          index = 0
-        if (!maxTime) {
-          maxTime = Date.now()
-        }
-        try {
-          // 设置查询索引
-          // console.log('kkkkkkkk',[this.conversation_id, minTime], [this.conversation_id,maxTime]);
-          let range = IDBKeyRange.bound([this.conversation_id, minTime], [this.conversation_id, maxTime])
-          // 传入的 prev 表示是降序遍历游标，默认是next表示升序；
-          // $state.indexDB 在im的场景下，查始终是降序遍历游标 orderBy指的是查询结果的排序方式
-          let sort = "prev"
-          // console.log('sortsortsortsortsortsortsort',sort);
-          // console.error('$state.indexDB~~~',$state.indexDB)
-          let task = $state.indexDB.transaction("uni-im-msg")
-            .objectStore("uni-im-msg")
-            .index("conversation_id-create_time")
-            .openCursor(range, sort)
-
-          task.onsuccess = function(event) {
-            let cursor = event.target.result;
-            if (cursor) {
-              // console.log('cursor',cursor.value);
-              // 排除边界值
-              if (![minTime, maxTime].includes(cursor.value.create_time)) {
-                datas.push(cursor.value)
-              }
-              index++
-              if (limit && index === limit) {
-                resolve(datas)
-              } else {
-                cursor.continue();
-              }
-            } else {
-              resolve(datas)
-            }
-          }
-
-          task.onerror = function(err) {
-            console.error(err);
-            resolve([])
-          }
-        } catch (e) {
-          console.error(e);
-          resolve([])
-        }
-      })
-      return datas.sort((a, b) => {
-        if (orderBy.create_time == 'asc') {
-          return a.create_time - b.create_time
-        } else {
-          return b.create_time - a.create_time
-        }
-      })
-      // #endif
-
-      // #ifdef MP
-      return []
-      // #endif
-    },
-    add: async (datas, action = 'push') => {
-      // console.log('localMsg.add',action,datas);
-      if (!Array.isArray(datas)) {
-        datas = [datas]
-      }
-      let _currentConversation = $state.conversation.getCached(this.conversation_id)
-      // 隐藏的会话，收到消息后需要再次显示出来
-      if(_currentConversation.hidden){
-        _currentConversation.hidden = false
-      }
-      
-      // 插入前，处理消息
-      datas.forEach(async data => {
-        // 创建唯一id:unique_id
-        data.unique_id = "u"+md5(JSON.stringify(data) + Math.random())
-        
-        // 以下代码，处理指令型消息（撤回、新用户进群、用户离群、@我 等）
-        const client_create_time = _currentConversation.client_create_time || 0
-        if (data.create_time < client_create_time) {
-          return // console.log("此消息指令，创建时间在当前设备，创建此会话之前。此设备无需执行");
-        }
-        //  如果收到的是撤回消息指令
-        if (data.type === "revoke_msg") {
-          let {
-            body: {
-              msg_id
-            },
-            conversation_id,
-            create_time
-          } = data
-          _currentConversation.revokeMsg(msg_id, false)
-        }
-
-        // 由扩展的消息类型处理 beforeLocalAdd
-        $methods.msgTypes.get(data.type)?.beforeLocalAdd?.(data, _currentConversation)
-
-        let current_uid = uniCloud.getCurrentUserInfo().uid
-        //  系统通知
-        if (data.type === "system") {
-          // 用户退出、被踢出群
-          if (["group-exit", "group-expel"].includes(data.action)) {
-            data.body.user_id_list.forEach(uid=>{
-              // 从列表中移除这些用户
-              // #ifdef VUE3
-              delete _currentConversation.group_member[uid]
-              // #endif
-              // #ifdef VUE2
-              Vue.delete(_currentConversation.group_member, uid)
-              // #endif
-            })
-          } 
-          // 新用户加群
-          else if (data.action === "join-group") {
-            const {new_member_list} = data.body
-            //  如果加入此群的用户id列表，包括当前用户 且此会话当前设备之前就加载过，需要重新加载群会话和成员列表（因为被踢出群期间可能有其他用户进群、发消息等）
-            if(new_member_list.includes(current_uid) && _currentConversation.client_create_time < data.create_time){
-              //重新拉取 群信息
-              let res = await uniImCo.getConversationList({"conversation_id":_currentConversation.id})
-              _currentConversation = Object.assign(_currentConversation, res.data[0])
-              //先清空 群成员
-              _currentConversation.group_member = []
-              //重新拉取 群成员
-              await uniIm.group.loadMember(_currentConversation.group_id)
-              // 获取群公告
-              _currentConversation.has_unread_group_notification = !!_currentConversation.group_info.notification
-            }else{
-              // 将新成员加入到群成员列表
-              for (let i = 0; i < new_member_list.length; i++) {
-                let member = new_member_list[i]
-                // 获取成员信息
-                member.users = await $state.users.get(member.user_id)
-                // #ifdef VUE3
-                _currentConversation.group_member[member.users._id] = member
-                // #endif
-                // #ifdef VUE2
-                Vue.set(_currentConversation.group_member, member.users._id, member)
-                // #endif
-              }
-            }
-            console.log('add user to group_member', _currentConversation.group_member)
-          }
-          //更新群资料
-          else if (data.action.indexOf("update-group-info-") === 0) {
-            if(data.action === "update-group-info-mute_all_members" && _currentConversation?.group_info?.mute_all_members != data?.body?.updateData?.mute_all_members){
-              const {mute_all_members} = data.body.updateData
-              for (let user_id in _currentConversation.group_member) {
-                const member = _currentConversation.group_member[user_id]
-                member.mute_type += (mute_all_members ? 1 : -1)
-              }
-            }
-            _currentConversation.group_info = Object.assign(_currentConversation.group_info,data.body.updateData)
-            const {notification} = data.body.updateData
-            if(data.action === "update-group-info-notification"){
-              console.log('收到群公告');
-              _currentConversation.has_unread_group_notification = true
-            }
-          }else if(data.action === "set-group-admin"){
-            const {user_id,addRole,delRole} = data.body
-            const {role} = _currentConversation.group_member[user_id]
-            if(addRole.length != 0){
-              role.push(...addRole)
-            }else if(delRole.length != 0){
-              console.log('delRole',delRole);
-              delRole.forEach(r=>{
-                console.log('r',r);
-                console.log('role',role);
-                const index = role.findIndex(i => i === r)
-                console.log('index',index);
-                if(index > -1){
-                  role.splice(index,1)
-                }
-              })
-            }
-            console.log('设置群管理员',_currentConversation.group_member[user_id]);
-          }
-        }
-        if (data.group_id && data.call_uid && data.call_uid.includes(current_uid)) {
-          _currentConversation.call_list.push(data._id)
-        }
-      })
-      
-      return // TODO：暂时先关闭本地库相关逻辑
-      
-      // #ifdef APP
-      /**
-       * 根据 datas 生成 sql 语句，插入到sqlList。
-       * 注意：所有字符串类型的字段，需要转义（包括对象/数组的值为字符串）
-       */
-      let sqlList = []
-      datas.forEach(data => {
-        let keys = [],
-          values = []
-        for (let key in data) {
-          keys.push(key)
-          let value = data[key]
-          if (typeof value === 'string') {
-            value = escapeText(value)
-            value = `'${value}'`
-          } else if (typeof value === 'object') {
-            value = escapeText(JSON.stringify(value))
-            value = `'${value}'`
-          }
-          values.push(value)
-        }
-        let sql = `INSERT INTO msg (${keys.join(',')}) VALUES (${values.join(',')});`
-        sqlList.push(sql)
-      })
-      // console.log('executeSql:',sqlList);
-      if (sqlList.length) {
-        try {
-          // let res = await this.sqlite.executeSql(sqlList)
-          // console.log('executeSql: add res',res,sqlList); 
-        } catch (e) {
-          console.error(e)
-        }
-      }
-      // #endif
-
-      // #ifdef H5
-      let res = await new Promise((resolve, reject) => {
-        // console.log('datas', datas[0]);
-        // 事务对象 指定表格名称和操作模式（"只读"或"读写"）
-        // console.error('$state.indexDB~~~',$state.indexDB)
-        let transaction = $state.indexDB.transaction('uni-im-msg', 'readwrite')
-        let objectStore = transaction.objectStore('uni-im-msg') // 仓库对象
-        let index = 0
-        let length = datas.length
-        datas.forEach(data => {
-          let res = objectStore.add(data)
-          res.onsuccess = (e) => {
-            // console.log('resolve',e, index, length);
-            index++
-            if (index == length) {
-              resolve()
-            }
-          }
-          res.onerror = (e) => {
-            console.error('add - failed', e);
-            reject(e)
-          }
-        })
-      })
-      // #endif
-
-      // #ifdef MP
-        // 小程序端不离线存储
-      // #endif
-
-      // 更新最大值
-      let maxTime = datas.map(i => i.create_time).sort((a, b) => b - a)[0]
-      let localMsgMaxTime = await this.localMsgMaxTime()
-      if (maxTime > localMsgMaxTime) {
-        // console.error('更新最大值 maxTime----------------',maxTime);
-        this.localMsg.maxTime = maxTime
-      }
-    },
-    update: async (unique_id, data) => {
-      // console.log('localMsg update',{data,unique_id});
-      data = JSON.parse(JSON.stringify(data))
-      
-      return []// TODO：暂时先关闭本地库相关逻辑
-      
-      // #ifdef APP
-      let dataStr = ''
-      for (let key in data) {
-        dataStr += `"${key}" = `
-        if (typeof data[key] === 'string') {
-          dataStr += `'${escapeText(data[key])}',`
-        } else if (typeof data[key] === 'object') {
-          dataStr += `'${escapeText(JSON.stringify(data[key]))}',`
-        } else {
-          dataStr += `${data[key]},`
-        }
-      }
-      let sql = `UPDATE msg SET ${dataStr.slice(0,-1)} WHERE unique_id = "${unique_id}"`
-      try {
-        // await this.sqlite.executeSql(sql)
-      } catch (e) {
-        console.log(e)
-      }
-      console.log('executeSql:',sql);
-      // #endif
-
-      // #ifdef H5
-      let datas = await new Promise((resolve, reject) => {
-        // console.error('$state.indexDB~~~',$state.indexDB)
-        let request = $state.indexDB.transaction(['uni-im-msg'], 'readwrite')
-          .objectStore("uni-im-msg")
-          .put(data)
-        request.onsuccess = function(event) {
-          // console.log('event---',event);
-          resolve(event)
-        }
-        request.onerror = function(event) {
-          console.error(event);
-          reject(event)
-        };
-      })
-      // #endif
-
-      // #ifdef MP
-      //  小程序端，无本地数据无需更新
-      return []
-      // #endif
-    },
-    delete: async (unique_id) => {
-      return []// TODO：暂时先关闭本地库相关逻辑
-      
-      // #ifdef APP
-      let sql = `DELETE FROM msg WHERE unique_id = "${unique_id}"`
-      try {
-        // await this.sqlite.executeSql(sql)
-      } catch (e) {
-        console.error(e)
-      }
-      // #endif
-
-      // #ifdef H5
-      let datas = await new Promise((resolve, reject) => {
-        // console.error('$state.indexDB~~~',$state.indexDB)
-        let request = $state.indexDB.transaction(['uni-im-msg'], 'readwrite')
-          .objectStore("uni-im-msg")
-          .delete(unique_id)
-        request.onsuccess = function(event) {
-          // console.log('event---',event);
-          resolve(event)
-        }
-        request.onerror = function(event) {
-          console.error(event);
-          reject(event)
-        };
-      })
-      // #endif
-
-      // #ifdef MP
-      //  小程序端，无本地数据无需更新
-      return []
-      // #endif
-    }
-  }
-}
-
-// #ifdef APP
-const matchRegExp = /["'&<>]/
-// 转义字符
-function escapeText(string) {
-  const str = '' + string
-  const match = matchRegExp.exec(str)
-  if (!match) {
-    return str
-  }
-  let escape
-  let _str = ''
-  let index = 0
-  let lastIndex = 0
-  for (index = match.index; index < str.length; index++) {
-    switch (str.charCodeAt(index)) {
-      case 34: // "
-        escape = '&quot;'
-        break
-      case 38: // &
-        escape = '&amp;'
-        break
-      case 39: // '
-        escape = '&#39;'
-        break
-      case 60: // <
-        escape = '&lt;'
-        break
-      case 62: // >
-        escape = '&gt;'
-        break
-      default:
-        continue
-    }
-    if (lastIndex !== index) {
-      _str += str.substring(lastIndex, index)
-    }
-    lastIndex = index + 1
-    _str += escape
-  }
-
-  return lastIndex !== index ? _str + str.substring(lastIndex, index) : _str
-}
-// 恢复转义字符
-function unescapeText(string) {
-  return string.replace(/&(quot|amp|#39|lt|gt);/g, function(match) {
-    switch (match) {
-      case '&quot;':
-        return '"'
-      case '&amp;':
-        return '&'
-      case '&#39;':
-        return "'"
-      case '&lt;':
-        return '<'
-      case '&gt;':
-        return '>'
-    }
-  })
-}
-// #endif
\ No newline at end of file
diff --git a/sdk/ext/indexDB.js b/sdk/ext/indexDB.js
index 75d7f8bf4576202b6350aa283548bd1ca1aa2598..49edb1ea29ec40af0f6cb68683caa16873a48ed4 100644
--- a/sdk/ext/indexDB.js
+++ b/sdk/ext/indexDB.js
@@ -6,7 +6,7 @@ export async function init(version) {
       showCancel: false
     });
   }
-  const maxIndexDBVersion = version || 2023101601
+  const maxIndexDBVersion = Date.now() // todo 临时方案，使得每次打开indexDB都会清空。等项目稳定后，再恢复
   let currentIndexDBVersion = uni.getStorageSync('uni-im-currentIndexDBVersion') || 0
   if (currentIndexDBVersion < maxIndexDBVersion) {
     // console.log('clear indexedDB database');
@@ -88,4 +88,4 @@ export async function init(version) {
       }
     }
   })
-}
+}
\ No newline at end of file
diff --git a/sdk/init/clearData.js b/sdk/init/clearData.js
index 5d2714f92491bb3ec1d4679dcbc3c8d3f9ab180d..d5ba002a1b75e43f7165848c71832b517b840415 100644
--- a/sdk/init/clearData.js
+++ b/sdk/init/clearData.js
@@ -1,16 +1,8 @@
 import $state from '../state/index.js';
 export default () => {
-  $state.conversation.dataList = [];
-  $state.conversation.hasMore = true;
-
-  $state.notification.dataList = [];
-  $state.notification.hasMore = true;
-
-  $state.friend.dataList = [];
-  $state.friend.hasMore = true;
-
-  $state.group.dataList = [];
-  $state.group.hasMore = true;
-
-  $state.currentConversationId = false;
+  $state.conversation.reset()
+  $state.notification.reset()
+  $state.friend.reset()
+  $state.group.reset()
+  $state.currentConversationId = false
 }
diff --git a/sdk/init/getCloudMsg.js b/sdk/init/getCloudMsg.js
index de19f0967dea1fa089ce3e2a8cb330e864e6134b..26f5496e3a16f6fdf4f038c433cd82672784967a 100644
--- a/sdk/init/getCloudMsg.js
+++ b/sdk/init/getCloudMsg.js
@@ -1,204 +1,212 @@
-import $state from '@/uni_modules/uni-im/sdk/state/index.js';
-const uniImCo = uniCloud.importObject("uni-im-co", {
-  customUI: false
-})
-const dbJQL = uniCloud.databaseForJQL();
-// 获得云端数据，适用于：socket突然断开丢失，或者应用iOS切到后台拿不到透传等场景使用 获取丢失的数据
-let getCloudMsgIng = false
-
-function getCloudMsg({
-  loadingTitle,
-  callback
-} = {
-  "callback": () => {}
-}) {
-  console.log('开始 getCloudMsg');
-
-
-  if ($state.isDisabled) {
-    return console.log('$state isDisabled')
-  }
-
-  if (getCloudMsgIng) {
-    callback()
-    return // 防止重复发起，比如即被切换到后台，socket又断开的场景
-  }
-
-  getCloudMsgIng = true
-
-  if (loadingTitle) {
-    uni.showLoading({
-      title: loadingTitle,
-      mask: true
-    });
-  }
-
-  // 下一次事件循环执行
-  setTimeout(async () => {
-    try {
-
-      await getConversationList()
-      async function getConversationList() {
-        // 根据本地会话的最大更新时间，查询云端数据
-        let maxConversation = ([...$state.conversation.dataList].sort((a, b) => b.update_time - a.update_time))[0]
-        console.log('maxConversation:' + maxConversation)
-        
-        if (!maxConversation) {
-          getCloudMsgIng = false
-          return
-        }
-        let minUpdateTime = maxConversation.update_time
-        
-         
-        console.log('minUpdateTime', minUpdateTime);
-        let {data:conversationDatas} = await uniImCo.getConversationList({
-          minUpdateTime,
-          limit: 30
-        })
-
-        conversationDatas.forEach(newConversationInfo => {
-          // console.error('newConversationInfo',newConversationInfo)
-          // 判断是否已经存在
-          let conversation = $state.conversation.getCached(newConversationInfo.id)
-          if (conversation) {
-            // 更新本地会话数据
-            Object.assign(conversation, newConversationInfo)
-          } else {
-            // 不存在则插入
-            [conversation] = $state.conversation.add(newConversationInfo)
-          }
-          // 如果当前会话已经被打开则需要设置未读消息数为0
-          if ($state.currentConversationId === conversation.id) {
-            conversation.unread_count = 0
-          }
-        })
-
-        for (let i = 0; i < conversationDatas.length; i++) {
-          console.log('需要查询的msg有：'+conversationDatas.length,i)
-          // 判断是否已经存在
-          const conversation = conversationDatas[i]
-          // 查询云端消息数据
-          await getConversationMsgs({conversation,minUpdateTime})
-        }
-
-        // await getMsgList({minUpdateTime,conversation_ids: conversationDatas.map(item => item.id)})
-
-        if (conversationDatas.length === 30) {
-          console.error("可能存在下一页数据");
-          return await getConversationList()
-        }
-        console.error(`更新会话：${conversationDatas.length}`)
-      }
-      getCloudMsgIng = false
-      callback()
-      console.log('离线数据同步完毕')
-      if (loadingTitle) {
-        uni.hideLoading()
-      }
-    } catch (e) {
-      console.error('getCloudMsg error', e);
-      getCloudMsgIng = false
-    }
-  }, 0);
-}
-
-export default getCloudMsg
-
-async function seaveMsgs(msgs) {
-  if (msgs.length === 0) {
-    return
-  }
-  const conversation = $state.conversation.getCached(msgs[0].conversation_id)
-  msgs.sort((a, b) => a.update_time - b.update_time)
-  msgs.forEach(async msg => {
-    // 判断是否出现重复          
-    let [localHasThisMsg] = await conversation.msgManager.localMsg.get({
-      _id: msg._id
-    })
-    if (localHasThisMsg) {
-      // console.log('出现重复', localHasThisMsg);
-      // 更新本地的这条消息内容
-      const unique_id = localHasThisMsg.unique_id
-      msg.unique_id = unique_id
-      await conversation.msgManager.localMsg.update(unique_id, msg)
-      // 如果内存中存在也更新（这种情况，会话确定已经初始化（打开）过）
-      let memoryMsg = conversation.msgList.find(item => item._id === msg._id)
-      if (memoryMsg) {
-        // console.log('出现重复', memoryMsg);
-        Object.assign(memoryMsg, msg)
-      }
-    } else {
-      // 本地库插入新消息
-      conversation.msgManager.localMsg.add(msg)
-      // console.log('本地库插入新消息', msg);
-      // 初始化（打开）过的会话，需要更新内存
-      if (conversation.isInit) {
-        conversation.msgList.push(msg)
-      }
-    }
-  })
-}
-
-async function getConversationMsgs({
-  limit = 100,
-  conversation,
-  minUpdateTime = 0
-}){
-  // console.error('getConversationMsgs minUpdateTime',minUpdateTime);
-  // 按会话查
-  const conversation_id = conversation.id
-  let res = await dbJQL.collection('uni-im-msg').where({
-      conversation_id,
-      "update_time": dbJQL.command.gt(minUpdateTime),
-    })
-    .orderBy('update_time', 'asc')
-    .limit(limit)
-    .get()
-  console.log('查询到新msg数据', res,res.data.length);
-  seaveMsgs(res.data)
-  // 递推查询
-  if (res.data.length === limit) {
-    arguments[0].minUpdateTime = res.data[limit - 1].update_time
-    await getConversationMsgs(arguments[0])
-  }
-}
-
-// async function getMsgList({
-//   minUpdateTime = 0,
-//   conversation_ids
-// }) {
-//   const limit = 1000
-//   console.log('minUpdateTime', minUpdateTime);
-//   console.log('conversation_ids', conversation_ids);
-//   let res = await uniImCo.getMsgList({
-//     conversation_ids,
-//     minUpdateTime,
-//     limit
-//   })
-
-//   console.error('查询到新消息数据', res.data.length);
-//   // 按会话id分组
-//   let conversationMsgs = {}
-//   res.data.forEach(msg => {
-//     if (!conversationMsgs[msg.conversation_id]) {
-//       conversationMsgs[msg.conversation_id] = []
-//     }
-//     conversationMsgs[msg.conversation_id].push(msg)
-//   })
-//   // console.log('conversationMsgs', conversationMsgs);
-//   // 逐个会话处理
-//   for (let conversation_id in conversationMsgs) {
-//     let msgs = conversationMsgs[conversation_id]
-//     // console.log('msgs', msgs);
-//     seaveMsgs(msgs)
-//   }
-
-//   if (res.data.length === limit) {
-//     minUpdateTime = res.data[limit - 1].update_time
-//     let res2 = await getMsgList(arguments[0])
-//     res.data = res.data.concat(res2.data)
-//     return res
-//   } else {
-//     return res
-//   }
+import $state from '@/uni_modules/uni-im/sdk/state/index.js';
+const uniImCo = uniCloud.importObject("uni-im-co", {
+  customUI: false
+})
+const dbJQL = uniCloud.databaseForJQL();
+// 获得云端数据，适用于：socket突然断开丢失，或者应用iOS切到后台拿不到透传等场景使用 获取丢失的数据
+let getCloudMsgIng = false
+
+function getCloudMsg({
+  loadingTitle,
+  callback
+} = {
+  "callback": () => {}
+}) {
+  if ($state.isDisabled) {
+    return console.log('$state isDisabled')
+  }
+
+  if (getCloudMsgIng) {
+    callback()
+    return // 防止重复发起，比如即被切换到后台，socket又断开的场景
+  }
+
+  getCloudMsgIng = true
+
+  if (loadingTitle) {
+    uni.showLoading({
+      title: loadingTitle,
+      mask: true
+    });
+  }
+
+  // 下一次事件循环执行
+  setTimeout(async () => {
+    try {
+
+      await getConversationList()
+      async function getConversationList() {
+        // 根据本地会话的最大更新时间，查询云端数据
+        let maxConversation = ([...$state.conversation.dataList].sort((a, b) => b.update_time - a.update_time))[0]
+        console.log('maxConversation:', maxConversation)
+        
+        if (!maxConversation) {
+          getCloudMsgIng = false
+          return
+        }
+        let minUpdateTime = maxConversation.update_time
+        // console.log('minUpdateTime', minUpdateTime);
+        console.log('getCloudMsg');
+        let {data:conversationDatas} = await uniImCo.getConversationList({
+          minUpdateTime,
+          limit: 30
+        })
+        
+        // console.error('conversationDatas',conversationDatas)
+
+        conversationDatas.forEach(newConversationInfo => {
+          // console.error('newConversationInfo',newConversationInfo)
+          // 存在则更新，不存在则新增
+          const conversation = $state.conversation.set(newConversationInfo)
+          // 如果当前会话已经被打开则需要设置未读消息数为0
+          if ($state.currentConversationId === conversation.id) {
+            conversation.unread_count = 0
+          }
+        })
+
+        for (let i = 0; i < conversationDatas.length; i++) {
+          console.log('需要查询的msg有：'+conversationDatas.length,i)
+          // 判断是否已经存在
+          const conversation = conversationDatas[i]
+          // 查询云端消息数据
+          await getConversationMsgs({conversation,minUpdateTime})
+        }
+
+        // await getMsgList({minUpdateTime,conversation_ids: conversationDatas.map(item => item.id)})
+
+        if (conversationDatas.length === 30) {
+          console.error("可能存在下一页数据");
+          return await getConversationList()
+        } else {
+          console.log('离线会话数据同步完毕')
+        }
+        console.log(`更新会话：${conversationDatas.length}`)
+      }
+      getCloudMsgIng = false
+      callback()
+      if (loadingTitle) {
+        uni.hideLoading()
+      }
+    } catch (e) {
+      console.error('getCloudMsg error', e);
+      getCloudMsgIng = false
+    }
+  }, 0);
+}
+
+export default getCloudMsg
+
+async function seaveMsgs(msgs) {
+  if (msgs.length === 0) {
+    return
+  }
+  const conversation = $state.conversation.find(msgs[0].conversation_id)
+  msgs.forEach(msg => {
+    // todo：暂时先不考虑本地库
+    // 会话未初始化（打开）过，不需要更新内存
+    if(conversation.isInit){
+      let hasThisMsg = conversation.msg.find(msg._id)
+      if (hasThisMsg) {
+        // 更新内存的这条消息内容
+        Object.assign(hasThisMsg, msg)
+      } else {
+        conversation.msg.add(msg)
+      }
+    }
+  })
+  /**
+   * 以下为启用本地库的端使用的代码
+   */
+  // msgs.sort((a, b) => a.update_time - b.update_time)
+  // msgs.forEach(async msg => {
+  //   // 判断是否出现重复
+  //   let [localHasThisMsg] = await conversation.msgManager.localMsg.get({
+  //     _id: msg._id
+  //   })
+  //   if (localHasThisMsg) {
+  //     // console.log('出现重复', localHasThisMsg);
+  //     // 更新本地的这条消息内容
+  //     const unique_id = localHasThisMsg.unique_id
+  //     msg.unique_id = unique_id
+  //     await conversation.msgManager.localMsg.update(unique_id, msg)
+  //     // 如果内存中存在也更新（这种情况，会话确定已经初始化（打开）过）
+  //     let memoryMsg = conversation.msg.find(msg._id)
+  //     if (memoryMsg) {
+  //       // console.log('出现重复', memoryMsg);
+  //       Object.assign(memoryMsg, msg)
+  //     }
+  //   } else {
+  //     // 本地库插入新消息
+  //     conversation.msgManager.localMsg.add(msg)
+  //     // console.log('本地库插入新消息', msg);
+  //     // 初始化（打开）过的会话，需要更新内存
+  //     if (conversation.isInit) {
+  //       conversation.msg.add(msg)
+  //     }
+  //   }
+  // })
+}
+
+async function getConversationMsgs({
+  limit = 100,
+  conversation,
+  minUpdateTime = 0
+}){
+  // console.error('getConversationMsgs minUpdateTime',minUpdateTime);
+  // 按会话查
+  const conversation_id = conversation.id
+  let res = await dbJQL.collection('uni-im-msg').where({
+      conversation_id,
+      "update_time": dbJQL.command.gt(minUpdateTime),
+    })
+    .orderBy('update_time', 'asc')
+    .limit(limit)
+    .get()
+  console.log('查询到新msg数据', res,res.data.length);
+  seaveMsgs(res.data)
+  // 递推查询
+  if (res.data.length === limit) {
+    arguments[0].minUpdateTime = res.data[limit - 1].update_time
+    await getConversationMsgs(arguments[0])
+  }
+}
+
+// async function getMsgList({
+//   minUpdateTime = 0,
+//   conversation_ids
+// }) {
+//   const limit = 1000
+//   console.log('minUpdateTime', minUpdateTime);
+//   console.log('conversation_ids', conversation_ids);
+//   let res = await uniImCo.getMsgList({
+//     conversation_ids,
+//     minUpdateTime,
+//     limit
+//   })
+
+//   console.error('查询到新消息数据', res.data.length);
+//   // 按会话id分组
+//   let conversationMsgs = {}
+//   res.data.forEach(msg => {
+//     if (!conversationMsgs[msg.conversation_id]) {
+//       conversationMsgs[msg.conversation_id] = []
+//     }
+//     conversationMsgs[msg.conversation_id].push(msg)
+//   })
+//   // console.log('conversationMsgs', conversationMsgs);
+//   // 逐个会话处理
+//   for (let conversation_id in conversationMsgs) {
+//     let msgs = conversationMsgs[conversation_id]
+//     // console.log('msgs', msgs);
+//     seaveMsgs(msgs)
+//   }
+
+//   if (res.data.length === limit) {
+//     minUpdateTime = res.data[limit - 1].update_time
+//     let res2 = await getMsgList(arguments[0])
+//     res.data = res.data.concat(res2.data)
+//     return res
+//   } else {
+//     return res
+//   }
 // }
\ No newline at end of file
diff --git a/sdk/init/imData.js b/sdk/init/imData.js
index 3959a15e2948d0062cb420e319dbe370b8906897..61bf17a764362b60ffd4b82c52d880ac918bd5fd 100644
--- a/sdk/init/imData.js
+++ b/sdk/init/imData.js
@@ -1,7 +1,6 @@
 import getCloudMsg from './getCloudMsg.js';
 import $state from '@/uni_modules/uni-im/sdk/state/index.js';
 import $methods from '@/uni_modules/uni-im/sdk/methods/index.js';
-import { store as uniIdStore } from '@/uni_modules/uni-id-pages/common/store.js';
 
 const imData = {
   onInitAfter(callback){
@@ -13,13 +12,7 @@ const imData = {
     }
   },
   async init() {
-    console.log('初始化数据 data');
-    // 初始化uniIm依赖的全局变量
-    $state.notification.dataList = []
-    $state.friend.dataList = []
-    $state.group.dataList = []
-    $state.conversation.dataList = []
-    let uid = uniCloud.getCurrentUserInfo().uid
+    // console.log('初始化数据 data');
     let storageConversationList = []
     
     // #ifdef H5
@@ -44,84 +37,84 @@ const imData = {
     if (storageConversationList.length) {
       $state.conversation.add(storageConversationList)
     }
-    getCloudMsg({
-      showLoading: "加载中",
-      async callback(){
-        /*console.log('启动后通过getCloudMsg拉取了会话数据，和直接云端全量拉做对比');
-        let localConversations = [...$state.conversation.dataList]
-        let localLength = localConversations.length
-        const uniImCo = uniCloud.importObject("uni-im-co",{
-          customUI:true
-        })
-        uniImCo.getConversationList({
-          limit: 30
-        }).then(res => {
-          // console.log('拉取了云端会话数据', res.data);
-          // 取30个对比
-          // console.log('本地会话数据', localConversations);
-          let newConversations = res.data
-          function tr(arr){
-            arr = arr
-              .map(({update_time,id,group_info,user_info}) => {
-                let item = {
-                  update_time,
-                  id
-                }
-                if(group_info){
-                  const {name,type} = group_info
-                  item.group_info = {name,type}
-                }
-                if(user_info){
-                  const {nickname} = user_info
-                  item.user_info = {nickname}
-                }
-                return item
-              })
-              .sort((a, b) => b.update_time - a.update_time)
-              // 去重id相等的去掉
-            let tmpObj = {}
-            arr.forEach(item => {
-              tmpObj[item.id] = item
-            })
-            arr = Object.values(tmpObj)
-            arr = arr.slice(0, localLength > 20 ? 20 : localLength)
-            console.log('arr.length', arr.length,arr);
-            return JSON.stringify(arr)
-          }
+    // getCloudMsg({
+    //   showLoading: "加载中",
+    //   async callback(){
+    //     /*console.log('启动后通过getCloudMsg拉取了会话数据，和直接云端全量拉做对比');
+    //     let localConversations = [...$state.conversation.dataList]
+    //     let localLength = localConversations.length
+    //     const uniImCo = uniCloud.importObject("uni-im-co",{
+    //       customUI:true
+    //     })
+    //     uniImCo.getConversationList({
+    //       limit: 30
+    //     }).then(res => {
+    //       // console.log('拉取了云端会话数据', res.data);
+    //       // 取30个对比
+    //       // console.log('本地会话数据', localConversations);
+    //       let newConversations = res.data
+    //       function tr(arr){
+    //         arr = arr
+    //           .map(({update_time,id,group_info,user_info}) => {
+    //             let item = {
+    //               update_time,
+    //               id
+    //             }
+    //             if(group_info){
+    //               const {name,type} = group_info
+    //               item.group = {name,type}
+    //             }
+    //             if(user_info){
+    //               const {nickname} = user_info
+    //               item.user_info = {nickname}
+    //             }
+    //             return item
+    //           })
+    //           .sort((a, b) => b.update_time - a.update_time)
+    //           // 去重id相等的去掉
+    //         let tmpObj = {}
+    //         arr.forEach(item => {
+    //           tmpObj[item.id] = item
+    //         })
+    //         arr = Object.values(tmpObj)
+    //         arr = arr.slice(0, localLength > 20 ? 20 : localLength)
+    //         console.log('arr.length', arr.length,arr);
+    //         return JSON.stringify(arr)
+    //       }
           
-          localConversations = tr(localConversations)
-          newConversations = tr(newConversations)
+    //       localConversations = tr(localConversations)
+    //       newConversations = tr(newConversations)
           
-          // console.log('localConversations', localConversations.length, localConversations);
-          // console.log('newConversations', newConversations.length, newConversations);
-          if (localConversations === newConversations) {
-            console.log('会话数据一致，无需更新');
-          }else{
-            console.error('会话数据不一致，需要更新');
-            // 把不一致的项console.log出来
-            let local = JSON.parse(localConversations)
-            let newC = JSON.parse(newConversations)
-            local.forEach((item, index) => {
-              // 缺少的项
-              if (!newC.find(i => i.id === item.id)) {
-                console.error('缺少的项', item);
-              }
-            })
-            newC.forEach((item, index) => {
-              // 多余的项
-              if (!local.find(i => i.id === item.id)) {
-                console.error('多余的项', item);
-              }
-            })
-            $state.conversation.dataList = []
-            res.data.forEach(item => {
-              $state.conversation.add(item)
-            })
-          }
-        })
-        .catch(err => {
-          console.error('拉取会话数据失败', err);
-        })*/
+    //       // console.log('localConversations', localConversations.length, localConversations);
+    //       // console.log('newConversations', newConversations.length, newConversations);
+    //       if (localConversations === newConversations) {
+    //         console.log('会话数据一致，无需更新');
+    //       }else{
+    //         console.error('会话数据不一致，需要更新');
+    //         // 把不一致的项console.log出来
+    //         let local = JSON.parse(localConversations)
+    //         let newC = JSON.parse(newConversations)
+    //         local.forEach((item, index) => {
+    //           // 缺少的项
+    //           if (!newC.find(i => i.id === item.id)) {
+    //             console.error('缺少的项', item);
+    //           }
+    //         })
+    //         newC.forEach((item, index) => {
+    //           // 多余的项
+    //           if (!local.find(i => i.id === item.id)) {
+    //             console.error('多余的项', item);
+    //           }
+    //         })
+    //         $state.conversation.dataList = []
+    //         res.data.forEach(item => {
+    //           $state.conversation.add(item)
+    //         })
+    //       }
+    //     })
+    //     .catch(err => {
+    //       console.error('拉取会话数据失败', err);
+    //     })*/
         
         // 初始化完成
         $state.ext._initImData.isInit = true
@@ -130,15 +123,15 @@ const imData = {
           fn();
         })
         
-      }
-    })
+    //   }
+    // })
     
     
     $state.notification.loadMore()
     $state.friend.loadMore()
     $state.group.loadMore()
     let users = {}
-    users[uniIdStore.userInfo._id] = uniIdStore.userInfo
+    users[$state.currentUser._id] = $state.currentUser
     $state.users.merge(users)
   }
 }
diff --git a/sdk/init/index.js b/sdk/init/index.js
index 605dba3acab44fad4946f414e5740327d2f4bd5b..4a87fe886a1a4d638fb34d1e5c0fadc294e038bb 100644
--- a/sdk/init/index.js
+++ b/sdk/init/index.js
@@ -2,7 +2,6 @@ import config from '@/uni_modules/uni-im/common/config.js';
 import $state from '@/uni_modules/uni-im/sdk/state/index.js';
 import $methods from '@/uni_modules/uni-im/sdk/methods/index.js';
 import {init as initIndexDB} from '@/uni_modules/uni-im/sdk/ext/indexDB.js';
-import { mutations as uniIdMutations} from '@/uni_modules/uni-id-pages/common/store.js';
 import $utils from '@/uni_modules/uni-im/sdk/utils';
 
 import checkVersion from './checkVersion'
@@ -61,11 +60,39 @@ export default async function (initParam) {
       showCancel: false
     });
   }
+  
+  $state.networkConnected = navigator.onLine;
+  window.addEventListener('online', function() {
+    $state.networkConnected = true;
+    console.log('网络已连接');
+  });
+  window.addEventListener('offline', function() {
+    $state.networkConnected = false;
+    console.log('网络已断开');
+  });
+  // #endif
+  
+  // #ifndef H5
+  // uni.onNetworkStatusChange(({
+  // 	networkType
+  // }) => {
+  // 	if (this.networkType == 'none' && networkType != 'none') { //之前没网现在有了
+  // 		this.$emit('networkResume')
+  // 	}
+  // 	this.networkType = networkType;
+  // });
+  // uni.getNetworkType({
+  // 	success: ({
+  // 		networkType
+  // 	}) => {
+  // 		this.networkType = networkType;
+  // 	}
+  // });
   // #endif
   
   
   // 如果已经登录就直接初始化数据
-  if (uniCloud.getCurrentUserInfo().tokenExpired > Date.now()) {
+  if ($state.currentUser.tokenExpired > Date.now()) {
     await modules.imData.init()
   } else {
     console.log("登录状态过期，暂不初始化数据");
@@ -77,21 +104,53 @@ export default async function (initParam) {
   });
   
   modules.imData.onInitAfter(() => {
-    //初始化务必后再 监听im消息
-    uni.onPushMessage(res => {
-      // console.log('uni_on_PushMessage', res.data.payload);
-      switch (res.data.payload.type) {
-        case "uni-im":
-          modules.msgEvent.emitMsg(res)
-          break;
-        case "uni-im-notification":
-          modules.onNotification(res) //添加好友相关模块，暂不维护
-          break;
-        default:
-          break;
-      }
-    })
+    //初始化完毕后
+    // 读取 云端{"未读会话id":未读数}的数据
+    const dbJQL = uniCloud.databaseForJQL()
+    dbJQL.collection("uni-im-conversation")
+      .where(`
+        "user_id" == $cloudEnv_uid && 
+        "unread_count" > 0 &&
+        "hidden" != true &&
+        "leave" != true &&
+        "mute" != true
+      `)
+      .field("id,unread_count,group_id")
+      .limit(1000)
+      .get()
+      .then(({data}) => {
+        // console.log('读取云端未读会话数据', data)
+        $state.conversation.cloudUnreadCountObj = data.reduce((acc, {id,unread_count}) => {
+          acc[id] = unread_count
+          return acc
+        }, {})
+      })
+      .catch(e => {
+        console.error('读取云端未读会话数据失败', e)
+        // uni.showModal({
+        //   content: '读取云端未读会话数据失败' + JSON.stringify(e),
+        //   showCancel: false
+        // });
+      })
+
+    // 移除监听，避免重复监听
+    uni.offPushMessage(onPushMsg)
+    // 监听推送消息
+    uni.onPushMessage(onPushMsg)
   })
+  function onPushMsg(res){
+    // console.log('uni_on_PushMessage', res.data.payload);
+    switch (res.data.payload.type) {
+      case "uni-im":
+        modules.msgEvent.emitMsg(res)
+        break;
+      case "uni-im-notification":
+        modules.onNotification(res) //添加好友相关模块，暂不维护
+        break;
+      default:
+        break;
+    }
+  }
 
   // 监听并记录socket连接状态
   modules.onSocketStateChange((state, count) => {
@@ -108,11 +167,16 @@ export default async function (initParam) {
     this.appActivateState = state;
     if (!state) return;
     // #ifdef APP
-    //清理系统通知栏消息和app角标
-    plus.push.clear()
-    plus.runtime.setBadgeNumber(0)
-    // 查询一次缺失的云端消息
-    modules.getCloudMsg()
+    this.socketConnectState = state;
+    if(!$state.ext._previewImageIsOpen){
+      //清理系统通知栏消息和app角标
+      plus.push.clear()
+      plus.runtime.setBadgeNumber(0)
+      // 查询一次缺失的云端消息
+      modules.getCloudMsg()
+    } else {
+      $state.ext._previewImageIsOpen = false
+    }
     // #endif
     
     // 拿到当前页面的路由
@@ -121,7 +185,7 @@ export default async function (initParam) {
     const isLoginPage = currentPage?.route.includes('uni_modules/uni-id-pages/pages/login')
     
     // 第二次 activate 之后开始 检查token是否已经过期，如果已经过期则重定向至登录页面
-    const { tokenExpired } = uniCloud.getCurrentUserInfo()
+    const { tokenExpired } = $state.currentUser
     if (!isLoginPage && count > 1 && tokenExpired < Date.now()) {
       console.info('uni-im检测到，当前用户登录过且当前登录状态已过期，将自动跳转至登录页面。')
       uni.reLaunch({
@@ -142,7 +206,7 @@ export default async function (initParam) {
   // #ifndef H5
   // 提前拿到键盘高度，防止第一次在会话点击输入框时，输入框的高度弹起速度慢
   $state.keyboardMaxHeight = uni.getStorageSync('uni-im-data-keyboard-max-height') || 0;
-  console.log('键盘高度', $state.keyboardMaxHeight);
+  // console.log('键盘高度', $state.keyboardMaxHeight);
   // if ($state.keyboardMaxHeight === 0) {
   //   uni.onKeyboardHeightChange((e) => {
   //     if (e.height > $state.keyboardMaxHeight) {
@@ -192,8 +256,8 @@ export default async function (initParam) {
     let oldState = $state.isWidescreen
     $state.isWidescreen = window.innerWidth > 960
   }
-  // window.addEventListener('resize',setIsWidescreen);
-  // setIsWidescreen();
+  window.addEventListener('resize',setIsWidescreen);
+  setIsWidescreen();
   // #endif
 
   const audioContext = uni.createInnerAudioContext()
@@ -355,10 +419,22 @@ export default async function (initParam) {
     })
   }
   
+  if (navigator.platform.indexOf('Win') > -1) {
+    // win 系统时给 dom 最外层加一个class .windows方便样式调整
+    document.body.classList.add('windows');
+  }
+  // #endif
+  
   // uni.previewImage打开事件
   uni.addInterceptor('previewImage', {
-    success: (res) => {
-      
+    invoke: (e) => {
+      // #ifdef APP
+      $state.ext._previewImageIsOpen = true
+      // console.log('previewImage打开')
+      // #endif
+    },
+    success: (res) => {  
+      // #ifdef H5
       setTimeout(() => {
         const previewImageDom = document.getElementById('u-a-p')
         const onDownEscapeKey = () => {
@@ -392,15 +468,10 @@ export default async function (initParam) {
           navigationDomList[0].remove()
         }
       },0)
+      // #endif
     }
   })
   
-  if (navigator.platform.indexOf('Win') > -1) {
-    // win 系统时给 dom 最外层加一个class .windows方便样式调整
-    document.body.classList.add('windows');
-  }
-  // #endif
-  
   $utils.appEvent.onAppActivate(() => {
     $state.ext.appIsActive = true
   })
diff --git a/sdk/init/msgEvent.js b/sdk/init/msgEvent.js
index e75a23f561a832caa50903c0f52d1029d5b449f2..84abdc57dcbbb8c3705cec99b79fa563a6fd9eeb 100644
--- a/sdk/init/msgEvent.js
+++ b/sdk/init/msgEvent.js
@@ -54,21 +54,42 @@ msgEvent.onMsg(async res=>{
         console.error('超长文本类型消息查库失败', msg._id);
       }
     }
+    await Promise.all($extensions.invokeExts('before-on-im-msg', msg))
     // console.log('payload------', payload.device_id, $state.systemInfo.deviceId);
     // console.log(777);
+    // 更新本地users信息
+    if(msg.nickname){
+      const {nickname,avatar_file,from_uid:_id} = msg
+      const aboutUser = $state.users[_id]
+      if(aboutUser){
+        aboutUser.nickname = nickname
+        aboutUser.avatar_file = avatar_file
+      }else{
+        $state.users[_id] = {nickname,avatar_file}
+      }
+      // console.error('更新本地users信息', msg.from_uid, msg.nickname,$state.users[_id]);
+    }else{
+      // console.error('msg.nickname不存在', msg);
+    }
     const {
       conversation_id,
       group_id
     } = msg
     // console.log('msgmsgmsgmsgmsg.msg',msg);
     // 拿到收到消息的会话对象
-    let conversation = $state.conversation.getCached(conversation_id)
+    let conversation = $state.conversation.find(conversation_id)
     let isNewCreateConversation = false
     if (!conversation) {
       isNewCreateConversation = true
       conversation = await $state.conversation.get(conversation_id)
     }
     
+    if (!conversation) {
+      // 当前用户自己点退出登录的时候，最后一条退出消息通知来之前 会话已经被本地移除属于正常情况
+      console.log('找不到会话对象 id:'+ conversation_id);
+      return
+    }
+    
     // 处理其他设备已读某会话的情况
     if (msg.type == 'clear-conversation-unreadCount') {
       if (conversation.update_time < msg.create_time) {
@@ -99,7 +120,7 @@ msgEvent.onMsg(async res=>{
                                   // 消息不是系统配置了免打扰的
                                   !isMuteMsg &&
                                   // 不是自己发的消息
-                                  msg.from_uid != uniCloud.getCurrentUserInfo().uid
+                                  msg.from_uid != $state.currentUser._id
     // 判断并创建通知栏消息
     // #ifdef H5
     if (canCreateNotification) {
@@ -122,9 +143,8 @@ msgEvent.onMsg(async res=>{
     /**
      * 排除会话中已包含此消息的情况
      */
-    let msgList = conversation.msgList
-    if (!msgList.find(item => item._id == msg._id)) {
-      msgList.push(msg)
+    if (!conversation.msg.find(msg._id)) {
+      conversation.msg.add(msg)
       if (
         // 不是正在对话的会话，且不是自己发的消息，就给会话的未读消息数+1
         $state.currentConversationId != msg.conversation_id &&
@@ -132,7 +152,7 @@ msgEvent.onMsg(async res=>{
         isReadableMsg &&
         // 消息不是系统配置了免打扰的
         !isMuteMsg &&
-        msg.from_uid != uniCloud.getCurrentUserInfo().uid &&
+        msg.from_uid != $state.currentUser._id &&
         // 新创建的会话直接读取云端的未读消息数，本地不需要 ++
         !isNewCreateConversation
       ) {
@@ -141,7 +161,7 @@ msgEvent.onMsg(async res=>{
     }
     // 如果socket已经关闭的情况下收到消息，说明消息来源浏览器页签之间通讯 不需要重复存库
     if (!$state.socketIsClose) {
-      conversation.msgManager.localMsg.add(msg)
+      // conversation.msgManager.localMsg.add(msg)
     }
     
     // #ifdef APP
diff --git a/sdk/init/onNotification.js b/sdk/init/onNotification.js
index da84b3653d3e9518f890e11035609c57f8c946e3..baa2d738cf6648a142ba42d8f99e5bc002eb4c01 100644
--- a/sdk/init/onNotification.js
+++ b/sdk/init/onNotification.js
@@ -1,11 +1,35 @@
 import $state from '@/uni_modules/uni-im/sdk/state/index.js';
-export default res => {
-  res.data.create_time = Date.now()
-  res.data.is_read = res.data.is_read || false
-  console.log('res.data notification.add', res.data)
-  res.data._id = res.data.payload.notificationId
-  const notificationData = res.data
-  delete res.data.payload.notificationId
-  delete res.data.unipush_version
-  $state.notification.add(res.data)
+const current_uid = $state.currentUser._id
+export default res => {
+  res.data.create_time = Date.now()
+  res.data.is_read = res.data.is_read || false
+  console.log('res.data notification.add', res.data)
+  res.data._id = res.data.payload.notificationId
+  const notificationData = res.data
+  delete res.data.payload.notificationId
+  delete res.data.unipush_version
+  $state.notification.add(res.data)
+  const {data} = notificationData?.payload || {}
+  const actions = {
+    "uni-im-friend-delete"(){
+      const friend_uid = data.from_uid == current_uid ? data.to_uid : data.from_uid
+      $state.friend.remove(friend_uid)
+    },
+    async "uni-im-friend-add"(){
+      const friend_uid = data.from_uid == current_uid ? data.to_uid : data.from_uid
+      let friendInfo = await $state.users.get(friend_uid)
+      console.log('friendInfo',friendInfo)
+      $state.friend.add(friendInfo)
+    }
+  }
+  
+  try{
+    console.log(777,notificationData?.payload?.subType, notificationData)
+    const action = actions[notificationData?.payload?.subType]
+    action && action()
+  }catch(e){
+    console.error(e, notificationData)
+  }
+  
+  
 }
\ No newline at end of file
diff --git a/sdk/methods/conversation/index.js b/sdk/methods/conversation/index.js
deleted file mode 100644
index 33629eb066e176cdf5e83fde529c2d51eed75169..0000000000000000000000000000000000000000
--- a/sdk/methods/conversation/index.js
+++ /dev/null
@@ -1,275 +0,0 @@
-// #ifdef VUE3
-import {watch,computed} from 'vue'
-// #endif
-
-/**
- * 会话对象
- * data:会话对象数据模型（conversationDatas是原始数据，data为经过转化的数据）
- * loadMore：加载更多数据方法
- */
-import Conversation from './Conversation.class.js';
-import $state from '@/uni_modules/uni-im/sdk/state/index.js';
-import $utils from '@/uni_modules/uni-im/sdk/utils/index.js';
-import MsgManager from '@/uni_modules/uni-im/sdk/ext/MsgManager.class.js';
-
-import $extensions from '../extensions.js';
-import $users from '../users.js';
-import $group from '../group.js';
-
-const uniImCo = uniCloud.importObject("uni-im-co")
-import {
-  store as uniIdStore,
-} from '@/uni_modules/uni-id-pages/common/store'
-
-const current_uid = () => uniIdStore.userInfo._id
-// console.log('current_uid', current_uid())
-
-export default {
-  // 同步获取已经缓存在本地的会话信息，适用于在能够确定会话信息已经拉到本地的上下文中调用。
-  getCached(conversation_id) {
-    return $state.conversation.dataList.find(c => c.id == conversation_id)
-  },
-
-  async get(param) {
-    /**
-     *  字符串	会话id
-     * 	数组		一组会话id（暂不支持）
-     * 	对象类型	会话对方信息（用于如果本地不存在则需要自动创建的场景），包括：{friend_uid,to_uid,from_uid,group_id,user_info}
-     */
-    let conversationId = false
-    if (param) {
-      if (typeof param == 'object') {
-        let {
-          friend_uid,
-          user_id,
-          group_id,
-          conversation_id
-        } = param
-        conversationId = conversation_id
-        if (user_id) {
-          friend_uid = user_id
-          param.friend_uid = user_id
-        }
-        if (!conversationId) {
-          if (!group_id && !friend_uid) {
-            console.log('param---------', param);
-            throw new Error("会话对象不详，请检查参数", param)
-          }
-          conversationId = $utils.getConversationId(friend_uid || group_id, friend_uid ? 'single' : 'group')
-        }
-      } else if (typeof param == 'string') {
-        conversationId = param
-      } else {
-        throw new Error("会话对象不详，请检查参数", param)
-      }
-    }
-    let conversationDatas = $state.conversation.dataList
-    if (conversationId) {
-      conversationDatas = conversationDatas.filter(i => i.id == conversationId)
-      if (conversationDatas.length == 0) {
-        // 本地没有没有就联网查找
-        let conversationData = await this.loadMore(conversationId)
-        if (conversationData) {
-          conversationDatas = [conversationData]
-        } else if (param.friend_uid) {
-          //  普通用户会话，云端没有可以本地创建一个
-          if (!param.user_info) {
-            let res = await uniCloud.database()
-              .collection('uni-id-users')
-              .doc(param.friend_uid)
-              .field('_id,nickname,avatar_file')
-              .get()
-            console.log('user_info', res)
-            param.user_info = res.result.data[0]
-            // console.log('param.user_info', param.user_info);
-            if (!param.user_info) {
-              throw new Error("用户查找失败")
-            }
-          }
-          let conversationData = {
-            "friend_uid": param.friend_uid,
-            "unread_count": 0,
-            "user_id": current_uid(),
-            "id": conversationId,
-            "user_info": param.user_info,
-            "type": param.friend_uid ? 1 : 2,
-            "msgList": [],
-            "update_time": Date.now()
-          }
-          
-          /**
-           * 存在source字段的会话，表示此会话基于某个来源而被创建。
-           * 比如：群聊会话，可能是从群聊列表中创建的，此时source字段会记录群聊的id
-           * 用于在云端同步创建会话时的判断依据，比如：限制只能群成员和群管理员才能发起私聊时，确定指的是哪个群
-           */
-          if(param.source){
-            conversationData.source = param.source
-          }
-          
-          conversationData = this.add(conversationData)[0]
-          conversationDatas.push(conversationData)
-        } else {
-          throw new Error("未找到此群会话")
-        }
-      }
-
-      let conversationData = conversationDatas[0]
-      // console.error('conversationData',conversationData,conversationData.group_member)
-      // 指定获取某个id的群会话时，判断如果群会话的 群成员为空就从云端拉取
-      if (conversationData.group_id && Object.keys(conversationData.group_member).length == 0 && !conversationData
-        .leave) {
-        // uni.showLoading({
-        //   title: '加载中',
-        //   mask: true
-        // });
-        await $group.loadMember(conversationData.group_id)
-        // uni.hideLoading()
-      }
-
-      // console.log('conversationData*-*--*-**-',conversationData)
-      // #ifdef APP
-      // if (!conversationData.isInit) {
-      //   conversationData.msgManager = new MsgManager(conversationData)
-      // }
-      // #endif
-      return conversationData
-    } else {
-      return conversationDatas
-    }
-  },
-  async loadMore(conversation_id) {
-    // console.log('loadMore-----','loadMore')
-    if (!conversation_id) {
-      // console.log('$state.conversation.loading',$state.conversation.loading)
-      //上一次正在调用，下一次不能马上开始
-      if ($state.conversation.loading) {
-        // console.log('加载中')
-        return []
-      } else {
-        $state.conversation.loading = true
-      }
-    }
-
-    let conversationDatas = await this.get()
-    let lastConversation = [...conversationDatas].sort((a, b) => a.update_time - b.update_time)[0]
-    // console.log('conversationDatas.length',conversationDatas.length,lastConversation)
-    let maxUpdateTime = lastConversation ? lastConversation.update_time : ''
-    if (conversation_id) {
-      // 已有会话id的情况下，不设置更新时间条件
-      maxUpdateTime = ''
-    }
-    let res = {
-      data: []
-    }
-    // console.log('maxUpdateTime', maxUpdateTime);
-    try {
-      const uniImCo = uniCloud.importObject("uni-im-co",{
-        customUI: true
-      })
-      res = await uniImCo.getConversationList({
-        maxUpdateTime,
-        limit: 30,
-        conversation_id
-      })
-    } catch (e) {
-      console.log(e)
-      if (!conversation_id) {
-        $state.conversation.loading = false
-      }
-    }
-
-    if (res.data.length) {
-      // console.log('getConversationList res', res, {
-      // 	maxUpdateTime,
-      // 	limit: 30,
-      // 	conversation_id
-      // });
-      // console.log('res.data',JSON.parse(JSON.stringify(res.data)))
-      res.data = this.add(res.data)
-    }
-    if (!conversation_id) {
-      $state.conversation.loading = false
-      $state.conversation.hasMore = (res.data.length == 30)
-      return res.data
-    } else {
-      return res.data[0]
-    }
-  },
-  add(datas) {
-    if (!Array.isArray(datas)) {
-      datas = [datas]
-    }
-    return datas.reduce((resList, item, index) => {
-      // console.log('resList',resList);
-      // 判断是否存在，再新增。
-      let conversation_item = $state.conversation.getCached(item.id)
-      if (conversation_item) {
-        // 此会话已经存在，返回给add方法调用者，不重复插到$state.conversation.dataList
-        resList.push(conversation_item)
-        return resList
-      }
-      // console.log('新增会话', item)
-      
-      const conversation = new Conversation(item)
-      // console.log('新增会话', conversation)
-      const usersInfo = conversation.getUsersInfo()
-      // 把会话相关的用户信息合并到 $users
-      $users.merge(usersInfo)
-      // 插入到会话列表
-      $state.conversation.dataList.push(conversation)
-      
-      // 拿到响应式的conversation对象
-      const _conversation = $state.conversation.getCached(conversation.id)
-      // 设置字段为响应式
-      let activeProperty = _conversation.activeProperty()
-      Object.keys(activeProperty).forEach(key => {
-        conversation[key] = computed(activeProperty[key])
-      })
-      
-      resList.push(_conversation)
-      // #ifdef H5
-        // // 将会话数据存入indexDB
-        // let data = JSON.parse(JSON.stringify(_conversation))
-        // let request = $state.indexDB.transaction(['uni-im-convasation'], 'readwrite')
-        //   .objectStore("uni-im-convasation")
-        //   .put(data)
-        // request.onsuccess = function(event) {
-        //   // console.error('indexDB success',event);
-        // }
-        // request.onerror = function(event) {
-        //   console.error('add convasation data to indexDB error',event);
-        // };
-      // #endif
-      return resList
-    }, [])
-  },
-  // 统计所有消息的未读数
-  unreadCount() {
-    let conversationDatas = $state.conversation.dataList
-    const unreadCount = conversationDatas.reduce((sum, item, index, array) => {
-      if (!item.hidden && !item.mute) {
-        sum += item.unread_count
-      }
-      return sum
-    }, 0)
-    return unreadCount
-  },
-  remove(id) {
-    let index = $state.conversation.dataList.findIndex(i => i.id == id)
-    $state.conversation.dataList.splice(index, 1)
-  },
-  /**
-   * 清空所有未读消息数
-   */
-  clearUnreadCount(){
-    uniImCo.clearUnreadCount().then(res => {
-      let conversationDatas = $state.conversation.dataList.filter(i => i.unread_count > 0)
-      conversationDatas.forEach(i => {
-        i.unread_count = 0
-        // console.log('i',i)
-      })
-    }).catch(err => {
-      console.error('clearUnreadCount err',err)
-    })
-  }
-}
diff --git a/sdk/methods/extensions.js b/sdk/methods/extensions.js
index 1e8ee2f6eb19227c07e8d7e7be903781a10b22af..37a1198a8bddc74ecf67addc3432681b4d8353c2 100644
--- a/sdk/methods/extensions.js
+++ b/sdk/methods/extensions.js
@@ -1,5 +1,5 @@
 import $state from '../state/index.js';
-let registeredExtensionPoints = $state.ext._extensionPoints
+let registeredExtensionPoints = {}// $state.ext._extensionPoints
 
 /**
  * 由扩展模块调用，在指定的扩展点上挂接一个扩展程序。
diff --git a/sdk/methods/friend.js b/sdk/methods/friend.js
index 05a266512e2cf250bcf2b8a537153db2fa4a0d84..7f65b83afb9663037bab1f1ccbffe5a85ba0e418 100644
--- a/sdk/methods/friend.js
+++ b/sdk/methods/friend.js
@@ -7,6 +7,7 @@ export default {
   async loadMore({
     friend_uid
   } = {}) {
+    const limit = 1000
     let whereString = '"user_id" == $cloudEnv_uid'
     if (friend_uid) {
       whereString += `&& "friend_uid" == "${friend_uid}"`
@@ -15,9 +16,9 @@ export default {
     let res = await db.collection(
         db.collection('uni-im-friend').where(whereString).field('friend_uid,mark,class_name')
         .getTemp(),
-        db.collection('uni-id-users').field('_id,nickname,avatar_file').getTemp()
+        db.collection('uni-id-users').field('_id,nickname,avatar_file,realname_auth').getTemp()
       )
-      .limit(500)
+      .limit(limit)
       .get()
     let data = res.result.data
     // console.log('data',data);
@@ -28,7 +29,7 @@ export default {
         $state.users[uid] = item.friend_uid[0]
       }
     })
-    $state.friend.hasMore = data.length == 500
+    $state.friend.hasMore = data.length == limit
     $state.friend.dataList.push(...data)
   },
   remove(friend_uid) {
diff --git a/sdk/methods/group.js b/sdk/methods/group.js
deleted file mode 100644
index 62e6b63ae424091285e58ca56a1dd18e8f6fb2ac..0000000000000000000000000000000000000000
--- a/sdk/methods/group.js
+++ /dev/null
@@ -1,92 +0,0 @@
-const db = uniCloud.database();
-const $ = db.command.aggregate
-import $users from './users.js';
-import state from '../state/index.js';
-export default {
-  get() {
-    return state.group.dataList
-  },
-  /**
-   * @description 加载更多群成员
-   * @param {String} 群id
-   */
-  async loadMember(group_id, before_id) {
-    // console.log('loadMember');
-    let _where = {
-      group_id
-    }
-    if (before_id) {
-      _where._id = db.command.gt(before_id)
-    }
-    let res = await db.collection(
-        db.collection('uni-im-group-member').where(_where).orderBy("_id asc").limit(500).getTemp(),
-        db.collection('uni-id-users').field('_id,nickname,avatar_file').getTemp()
-      )
-      .get()
-    // console.log('loadMember', res);
-    let userInfoObj = {}
-    const group_member = res.result.data
-    const memberObj = {};
-    group_member.forEach(item => {
-      const usersInfo = item.user_id[0];
-      delete item.user_id
-      item.users = usersInfo
-      userInfoObj[usersInfo._id] = usersInfo
-      memberObj[usersInfo._id] = item
-    })
-    // console.log('userInfoObj',userInfoObj);
-    // console.log('memberObj',memberObj);
-    $users.merge(userInfoObj)
-    const conversation = state.conversation.dataList.find(item => item.group_id == group_id)
-    conversation.group_member = Object.assign(conversation.group_member, memberObj)
-    let count = Object.keys(conversation.group_member).length
-    // console.log('查到群成员总数数：',count);
-    if (group_member.length === 500) {
-      // console.log('count 500个一批，直到查完  继续->');
-      await this.loadMember(group_id, group_member[group_member.length - 1]._id)
-    }
-  },
-  async loadMore({
-    group_id
-  } = {}) {
-    let whereString = '"user_id" == $cloudEnv_uid '
-    if (group_id) {
-      whereString += `&& "group_id" == "${group_id}"`
-    }
-    // console.log('whereString',whereString)
-    let res = await db.collection(
-        db.collection('uni-im-group-member').where(whereString).getTemp(),
-        db.collection('uni-im-group').getTemp()
-      )
-      .limit(500)
-      .get()
-    res.result.data
-      .filter(item => item.group_id.length)
-      .map(item => {
-        item.group_info = item.group_id[0]
-        item._id = item.group_info._id
-        // delete item.group_id
-        return item
-      })
-    // 过滤掉已经被删除的群
-    res.result.data = res.result.data.filter(item => item.group_info)
-
-    state.group.hasMore = res.result.data.length == 500
-    if (group_id) {
-      state.group.dataList.push(...res.result.data)
-    } else {
-      state.group.dataList = res.result.data
-    }
-  },
-  remove({
-    group_id
-  }) {
-    let groupList = state.group.dataList
-    let index = groupList.findIndex(i => i.group_info._id == group_id)
-    // console.log('index',group_id,index,groupList)
-    if (index != -1) {
-      groupList.splice(index, 1)
-      // console.log('state.group.dataList',state.group.dataList)
-    }
-  },
-}
diff --git a/sdk/methods/index.js b/sdk/methods/index.js
index 7e132275f46a56246276f59cfd967041348232a6..f0dc4b9391eed78d3497e2228744e158783ddec0 100644
--- a/sdk/methods/index.js
+++ b/sdk/methods/index.js
@@ -1,16 +1,10 @@
-import conversation from './conversation/index.js'
-import group from './group'
 import users from './users'
-import friend from './friend'
 import notification from './notification'
 import extensions from './extensions'
 import msgTypes from './msgTypes'
 
 export default {
-  conversation,
-  group,
   users,
-  friend,
   notification,
   extensions,
   msgTypes,
diff --git a/sdk/methods/users.js b/sdk/methods/users.js
index 94ee38ad559457413b0945d1315d28a7f83aba66..0f7ad77a6ff64de1ee64f62009afdbdb5b6d8f30 100644
--- a/sdk/methods/users.js
+++ b/sdk/methods/users.js
@@ -1,5 +1,10 @@
 import $state from '../state/index.js';
-export default {
+let $users = {
+  system: {
+    _id: 'system',
+    nickname: '系统消息',
+    avatar_file: '/static/uni-im/avatar/system.png',
+  },
   merge(usersInfo) {
     if (Array.isArray(usersInfo)) {
       let obj = {}
@@ -8,7 +13,18 @@ export default {
       })
       usersInfo = obj
     }
-    $state.users = Object.assign({}, $state.users, usersInfo)
+    Object.assign($state.users, usersInfo)
+  },
+  find(param) {
+    param = Array.isArray(param) ? param : [param]
+    let usersInfo = []
+    param.forEach(uid => {
+      const userInfo = $state.users[uid]
+      if (userInfo) {
+        usersInfo.push(userInfo)
+      }
+    })
+    return usersInfo
   },
   async get(param) {
     const uid_list = Array.isArray(param) ? param : [param]
@@ -16,9 +32,9 @@ export default {
     let new_uid_list = [];
     let userInfoList = [];
     uid_list.forEach(uid => {
-      let users = $state.users[uid]
-      if (users) {
-        userInfoList.push(users)
+      let userInfo = $state.users[uid]
+      if (userInfo && !this.loadTask.list.includes(uid)) {
+        userInfoList.push(userInfo)
       } else {
         new_uid_list.push(uid)
       }
@@ -29,11 +45,55 @@ export default {
       let res = await db.collection('uni-id-users').where({
           "_id": db.command.in(new_uid_list)
         })
-        .field('_id,nickname,avatar_file')
+        .field('_id,nickname,avatar_file,realname_auth')
         .get()
       userInfoList.push(...res.result.data)
       $state.users.merge(res.result.data)
+      // console.log('从云端加载本地不存在的用户数据',new_uid_list.length,res.result.data, res,$state.users)
     }
     return Array.isArray(param) ? userInfoList : userInfoList[0]
+  },
+  getNickname(user_id){
+    const nickname = $state.users[user_id]?.nickname
+    if(nickname){
+      return nickname
+    } else {
+      // 如果用户信息不存在，先加入队列
+      $users.loadTask.add(user_id)
+      
+      $state.users[user_id] = {
+        nickname:'[昵称加载中...]',
+        _id:user_id,
+        __loading:true
+      }
+      return $state.users[user_id]?.nickname
+    }
+  },
+  // 设置一个队列加载用户信息避免频繁请求
+  loadTask:{
+    list:[],
+    add(uids){
+      uids = Array.isArray(uids) ? uids : [uids],
+      this.list.push(...uids)
+      this.run()
+    },
+    run(){
+      // console.log('run-loadTask0')
+      if(this.timer){
+        clearTimeout(this.timer)
+      }
+      // console.log('run-loadTask1')
+      this.timer = setTimeout(()=>{
+        this.timer = null
+        if(this.list.length){
+          // console.log('run-loadTask2')
+          // 去重
+          this.list = [...new Set(this.list)]
+          $users.get(this.list)
+          this.list = []
+        }
+      },300)
+    }
   }
-}
\ No newline at end of file
+}
+export default $users;
\ No newline at end of file
diff --git a/sdk/state/Conversation.class.js b/sdk/state/Conversation.class.js
new file mode 100644
index 0000000000000000000000000000000000000000..99498bce9e46bb56ab6e466803991fbc56371d82
--- /dev/null
+++ b/sdk/state/Conversation.class.js
@@ -0,0 +1,274 @@
+import {watch,computed} from 'vue'
+import CloudData from '@/uni_modules/uni-im/sdk/ext/CloudData.class.js'
+import getCloudMsg from '../init/getCloudMsg.js';
+import ConversationItem from './ConversationItem.class.js'
+import $utils from '@/uni_modules/uni-im/sdk/utils/index.js';
+import $state from '../state/index.js';
+import $extensions from '@/uni_modules/uni-im/sdk/methods/extensions.js';
+import $users from '@/uni_modules/uni-im/sdk/methods/users.js';
+
+const uniImCo = uniCloud.importObject("uni-im-co")
+export default class Conversation extends CloudData {
+  constructor() {
+    super()
+    this.inheritedBy = 'conversation'
+    this.indexKey = 'id'
+    // 云端{"未读会话id":未读数}数据
+    this.cloudUnreadCountObj = {}
+    // 定义加载数据的条数
+    this.loadLimit = 15
+    // #ifdef H5
+    this.loadLimit = 30
+    // #endif
+    this.typeList = [
+      {
+        title:'全部',
+        value:'all'
+      },
+      {
+        title:'未读',
+        value:'unread'
+      },
+      // 群聊
+      {
+        title:'群聊',
+        value:'group'
+      },
+      // 单聊
+      {
+        title:'单聊',
+        value:'single'
+      },
+      {
+        title:'星标',
+        value:'is_star'
+      }
+    ]
+  }
+  __beforeFind(param){
+    if (typeof param === 'string'){
+      // 设置为默认按id查找会话，而不是按_id查找
+      return {id:param}
+    }else if(typeof param === 'object' && param !== null && !Array.isArray(param)){
+      if('source' in param){
+        // 本地查找不需要source字段
+        const source = param.source
+        delete param.source
+        setTimeout(()=>{
+          // 在下一个事件循环中执行，加上source
+          /**
+           * 存在source字段的会话，表示此会话基于某个来源而被创建。
+           * 比如：群聊会话，可能是从群聊列表中创建的，此时source字段会记录群聊的id
+           * 用于在云端同步创建会话时的判断依据，比如：限制只能群成员和群管理员才能发起私聊时，确定指的是哪个群
+           */
+          const conversation = this.find(param)
+          if(conversation){
+            conversation.source = source
+          }
+        },0)
+      }
+      if('user_id' in param){
+        // param = {friend_uid:param.user_id}
+        param.friend_uid = param.user_id
+        delete param.user_id
+      }else if('conversation_id' in param){
+        param = {id:param.conversation_id}
+      }
+      return param
+    }
+  }
+  __afterFind({res,param}){
+    const friend_uid = param?.friend_uid || param?.user_id
+     if(!res && friend_uid){
+      // console.error('Conversation __afterFind',res,param)
+      // 会话不存在，创建会话
+      const conversationData = {
+        friend_uid,
+        "user_info": {"nickname": ""},
+        "unread_count": 0,
+        "user_id": $state.currentUser._id,
+        "id": $utils.getConversationId(friend_uid),
+        "type": param.friend_uid ? 1 : 2,
+        "msgList": [],
+        "update_time": Date.now(),
+        "customSortTime": Date.now()
+      }
+      const conversation = this.add(conversationData)
+      $users.get(friend_uid).then(res => {
+        conversation.user_info = res
+      })
+      return conversation
+    }
+    return res
+  }
+  __beforeAdd(datas){
+    // console.log('__beforeAdd',datas)
+    if(!Array.isArray(datas)){
+      datas = [datas]
+    }
+    return datas.reduce((resList, item, index) => {
+      // console.log('resList',resList);
+      // 如果已存在，则直接返回原来的。不需要重复处理
+      let conversation_item = $state.conversation.find(item.id)
+      if (conversation_item) {
+        // console.log('此会话已经存在', conversation_item,conversation_item._update_time)
+        resList.push(conversation_item)
+        return resList
+      }
+      
+      // 把群数据都存到群列表
+      if(item.group_id){
+        $state.group.set(item.group_info)
+        // 删除冗余数据
+        delete item.group_info
+      }
+      
+      // console.log('新增会话', item)
+      // 插入客户端创建此会话的时间
+      item.client_create_time = Date.now()
+      let conversation = new ConversationItem(item)
+      // console.log('新增会话', conversation)
+      const usersInfo = conversation.getUsersInfo()
+      // 把会话相关的用户信息合并到 $users
+      $users.merge(usersInfo)
+      resList.push(conversation)
+      return resList
+    }, [])
+  }
+  __afterAdd(datas){
+    if(!Array.isArray(datas)){
+      datas = [datas]
+    }
+    
+    datas.forEach(conversation => {
+      const {msgList} = conversation
+      if(msgList){
+        // 服务端查找“应当”按消息“更新”时间排序，但显示需要按“创建”时间倒序，所以这里需要重新排序
+        msgList.sort((a,b) => a.create_time - b.create_time)
+        // 将会话数据带的msgList添加到msg中
+        conversation.msg.add(msgList,{canSetIsFull:true})
+        // 删除冗余数据
+        delete conversation.msgList
+      }
+    })
+    
+    
+    // 通过 setTimeout 0，使得在下一次事件循环中执行，避免冲突
+    setTimeout(() => {
+      // console.log('__afterAdd',datas)
+      datas.forEach(conversation => {
+        // init响应式字段
+        const activeProperty = this.find(conversation.id).activeProperty()
+        Object.keys(activeProperty).forEach(key => {
+          const item = activeProperty[key]
+          conversation[key] = computed(item)
+        })
+      })
+    }, 0)
+  }
+  __afterGet(datas){
+    // 获取单个会话时，检查群会话是否已经加载完群成员
+    if(datas && !Array.isArray(datas)){
+      const conversation = datas
+      const member = conversation.group?.member
+      if (member?.needLoadOnce) {
+        member.needLoadOnce = false
+        setTimeout(()=>member.loadMore(),1000)
+      }
+    }
+  }
+  __afterGetMore(datas){
+    if (this.dataList.length === 0 && datas.length >0){
+      // console.log('首次拉取会话')
+      getCloudMsg()
+    }
+  }
+  async __get(param) {
+    const loadMoreType = this.loadMore?.type || 'all'
+    let conversation_id = param
+    if (typeof param === "object"){
+      conversation_id = param.conversation_id
+    }
+    const uniImCo = uniCloud.importObject("uni-im-co",{customUI: true})
+    const limit = this.loadLimit
+    const conversationDatas = this.dataList
+    // 已有会话id的情况下，不设置更新时间条件
+    let maxLastMsgCreateTime = false;
+    let skip = 0;
+    if (!conversation_id) {
+      // 会话列表的总数
+      const conversationCount = conversationDatas.length
+      if(conversationCount !== 0){
+        // 本地除置顶会话之外的普通会话个数
+        const normalConversationCount = conversationDatas.filter(i => !i.pinned).length
+        if(normalConversationCount === 0){
+          // 全部是置顶会话的情况下，当前会话有几个就跳过几个
+          skip = conversationCount
+        }else{
+          // 上一次请求的最后一条会话数据，用于分页查询。如果当前会话列表为空（比如：首次打开/被移除了所有会话/重新登录等），则此字段应当为false
+          maxLastMsgCreateTime = this.loadMore?.lastConversation?.[loadMoreType]?.last_msg_create_time || false
+          // console.log('maxLastMsgCreateTime：'+maxLastMsgCreateTime,'loadMoreType:'+loadMoreType)
+          if(maxLastMsgCreateTime){
+            // 查询时间与 maxLastMsgCreateTime 相同的会话数。（因为某些情况下，多个会话的update_time相同）
+            skip = conversationDatas.filter(i => i.last_msg_create_time === maxLastMsgCreateTime).length
+          }
+        }
+      }
+    }
+    // console.log('maxLastMsgCreateTime', maxLastMsgCreateTime);
+    let res = await uniImCo.getConversationList({
+      maxLastMsgCreateTime,
+      limit,
+      conversation_id,
+      skip,
+      // 是否要区分是否为置顶会话
+      distinguishPinned: loadMoreType === 'all',
+      type:loadMoreType
+    })
+    if (!conversation_id) {
+      this.loadMore.lastConversation = {[loadMoreType]: res.data[res.data.length - 1]}
+    }
+    return res.data
+  }
+  // 统计所有消息的未读数
+  unreadCount() {
+    // console.log('计算 conversation unreadCount')
+    const conversationDatas = $state.conversation.dataList
+    const cloudUnreadCountObj = $state.conversation.cloudUnreadCountObj
+    const localUnreadCountObj = conversationDatas.reduce((sum, item, index, array) => {
+      const {id,mute,unread_count} = item
+      if ( id in cloudUnreadCountObj || !mute && unread_count) {
+        sum[id] = unread_count
+      }
+      return sum
+    }, {})
+    // console.log('localUnreadCountObj n',Object.values(localUnreadCountObj).reduce((sum, item) => sum + item, 0))
+    const unreadCountObj = {
+      ...cloudUnreadCountObj,
+      ...localUnreadCountObj
+    }
+    // console.log('unreadCountObj', unreadCountObj)
+    return Object.values(unreadCountObj).reduce((sum, item) => sum + item, 0)
+  }
+  /**
+   * 清空所有未读消息数
+   */
+  clearUnreadCount(){
+    uniImCo.clearUnreadCount().then(res => {
+      let conversationDatas = $state.conversation.dataList.filter(i => i.unread_count > 0)
+      conversationDatas.forEach(i => {
+        i.unread_count = 0
+        // console.log('i',i)
+      })
+      this.cloudUnreadCountObj = {}
+    }).catch(err => {
+      console.error('clearUnreadCount err',err)
+    })
+  }
+  // 删除会话后，如果当前选中的会话是该会话，则清空当前选中的会话
+  __afterRemove(item){
+    if($state.currentConversationId == item.id){
+      $state.currentConversationId = null
+    }
+  }
+}
\ No newline at end of file
diff --git a/sdk/methods/conversation/Conversation.class.js b/sdk/state/ConversationItem.class.js
similarity index 57%
rename from sdk/methods/conversation/Conversation.class.js
rename to sdk/state/ConversationItem.class.js
index 189266d4789660a43dee74f996f95918a0f47b32..f9c68aca1dea530fed5bb29eab5794027c2b0f4b 100644
--- a/sdk/methods/conversation/Conversation.class.js
+++ b/sdk/state/ConversationItem.class.js
@@ -1,14 +1,13 @@
+import {watch,computed} from 'vue'
 import $state from '@/uni_modules/uni-im/sdk/state/index.js';
 import $utils from '@/uni_modules/uni-im/sdk/utils/index.js';
-import MsgManager from '@/uni_modules/uni-im/sdk/ext/MsgManager.class.js';
-import $extensions from '../extensions.js';
-const uniImCo = uniCloud.importObject("uni-im-co")
-const current_uid = () => uniCloud.getCurrentUserInfo().uid;
+import $extensions from '@/uni_modules/uni-im/sdk/methods/extensions.js';
+import Msg from '@/uni_modules/uni-im/sdk/state/Msg.class.js'
 const db = uniCloud.database();
 /**
  * 会话类，实现会话相关的业务逻辑。
  */
-class Conversation {
+class ConversationItem {
   constructor(data) {
     // 检查是否关联用户/群被删除
     if (!data.group_id && !data.user_info) {
@@ -19,47 +18,42 @@ class Conversation {
     this.chatInputContent = ""
     // @我的消息id列表
     this.call_list = []
-    // 消息列表
-    this.msgList = []
+    
+    this.msg = new Msg(data.id)
+    
     // 客户端创建此会话的时间
     this.client_create_time = Date.now()
     // 是否已离开（退出、被踢出）群聊
     this.leave = false
     // 默认不置顶
     this.pinned = false
+    
+    this.tags = []
 
     // 是否已经初始化。 从缓存中取出的会话数据可能已经初始化，这里需要归零
-    data.isInit = false
+    data.isInit = true
     Object.assign(this, data)
 
     if (this.group_id) {
       // 群聊
-
-      // 1. 将群成员数据转换为对象
-      let group_member_obj = {}
-      if (Array.isArray(this.group_member)) {
-        this.group_member.forEach(item => {
-          let usersInfo = item.user_id[0]
-          group_member_obj[usersInfo._id] = usersInfo
-        })
+      this.group = $state.group.find(this.group_id)
+      if (!this.group) {
+        console.error('群聊本地不存在 this.group_id', this.group_id);
+        // throw new Error('群聊不存在')
       }
-      this.group_member = group_member_obj
 
       // 2. 设置群tag
       // 调用扩展点，扩展程序可以为该会话增加 tag。
-      let tags = $extensions.invokeExts('conversation-tags', this)
-        .reduce((all, target) => {
-          if (Array.isArray(target)) {
-            for (let tag of target) {
-              all[tag] = true
-            }
+      Promise.all($extensions.invokeExts('conversation-tags', this))
+        .then(tags => {
+          tags = tags.filter(tag => tag)
+          if (tags.length === 0) {
+            this.tags = ['群聊']
+          }else{
+            // 需要绕一圈，否则无法触发响应式
+            $state.conversation.find(this.id).tags = tags
           }
-          return all
-        }, {})
-      this.tags = Object.keys(tags)
-      if (this.tags.length == 0) {
-        this.tags = ['群聊']
-      }
+        })
 
       // 3. 初始化字段:群简介、群公告、群头像
       const fieldList = [{
@@ -79,8 +73,8 @@ class Conversation {
       ]
       fieldList.forEach(item => {
         const key = Object.keys(item)[0]
-        if (!this.group_info[key]) {
-          this.group_info[key] = item[key]
+        if (!this.group[key]) {
+          this.group[key] = item[key]
         }
       })
       // 4. 非单聊，不需要用户信息
@@ -88,19 +82,16 @@ class Conversation {
     } else {
       // 单聊
       // 非单聊，不需要群消息
-      this.group_info = false
+      this.group = false
+      const real_name = this.user_info?.realname_auth?.real_name
+      if (real_name){
+        this.tags = [real_name]
+      }
     }
     
     // 初始化响应式属性
     this.activeProperty().init()
-    // 初始化消息管理器
-    this.msgManager = new MsgManager(this)
-    
-    // if( this.update_time != this._last_visible_msg.create_time){
-    //   console.error('update_time != _last_visible_msg.create_time',this.update_time,this._last_visible_msg.create_time,this)
-    // }
   }
-
   /**
    * 会话未读消息数清零。
    */
@@ -114,7 +105,7 @@ class Conversation {
     uniCloud.database()
       .collection('uni-im-conversation')
       .where({
-        user_id: current_uid(),
+        user_id: $state.currentUser._id,
         id: this.id
       })
       .update({
@@ -135,78 +126,40 @@ class Conversation {
    * @param {boolean} [submit=true] -  是否需要提交；操作撤回端需要提交，被动撤回消息端无需提交
    */
   async revokeMsg(msg_id, submit = true) {
-    console.log('revokeMsg_');
-    // 检查此消息是否已经缓存在本地
-    let localMsg = (await this.msgManager.localMsg.get({
-      "_id": msg_id
-    }))[0]
-    if (localMsg) {
-      // 处理本地存储中的
-      localMsg.is_revoke = true
-      localMsg.before_revoke_body = localMsg.body
-      localMsg.body = '[此消息已被撤回]'
-      this.msgManager.localMsg.update(localMsg.unique_id, localMsg)
-    } else {
-      console.log('本地数据库中没有此消息')
-    }
-
-    // 处理显示中的数据
-    let msg = false
-    let index = this.msgList.findIndex(item => item._id == msg_id)
-    if (index != -1) {
-      msg = this.msgList[index]
-      msg.is_revoke = true
-      // 如果是当前用户撤回自己发的消息
-      if (submit && msg.from_uid === current_uid()) {
-        // 保存撤回前的消息内容，用于方便点击重新编辑
-        msg.before_revoke_body = msg.body
-      }
-      msg.body = '[此消息已被撤回]'
-      this.msgList.splice(index, 1, Object.assign({}, msg))
+    // 处理内存中显示中的数据
+    const msg = this.msg.find(msg_id)
+    if (!msg) {
+      return console.warn('内存中没有找到此消息（当前用户可能还没点开相关会话），无需撤回', msg_id)
     }
-
-    // 提交操作到云端
+    // 是否为当前用户触发的撤回
     if (submit) {
-      if (msg) {
-        // ui 界面上显示撤回中
-        msg.revoke_ing = true
-      }
+      // 保存撤回前的消息内容，用于方便点击重新编辑
+      msg.before_revoke_body = msg.body
+      // ui 界面上显示撤回中
+      msg.revoke_ing = true
+      // 提交操作到云端
       try {
-        let res = await uniImCo.sendMsg({
+        const uniImCo = uniCloud.importObject("uni-im-co",{customUI:true})
+        await uniImCo.sendMsg({
           "type": "revoke_msg",
-          "body": {
-            msg_id
-          }
+          "body": {msg_id}
         })
-        // console.log('revoke_msg res', res);
       } catch (err) {
         console.log('err', err);
-        // 撤回失败，还原本地数据
-        if (localMsg) {
-          localMsg.is_revoke = false
-          localMsg.body = localMsg.before_revoke_body
-          delete localMsg.before_revoke_body
-          this.msgManager.localMsg.update(localMsg.unique_id, localMsg)
-        }
-
-        if (msg) {
-          msg.is_revoke = false
-          msg.body = msg.before_revoke_body
-          delete msg.before_revoke_body
-          delete msg.revoke_ing
-          this.msgList.splice(index, 1, Object.assign({}, msg))
-        }
-
+        // 撤回失败，还原数据
+        msg.body = msg.before_revoke_body
+        delete msg.before_revoke_body
+        delete msg.revoke_ing
         return uni.showToast({
           title: err.message,
           icon: 'none'
         });
       }
-      if (msg) {
-        // ui 界面上去掉撤回中
-        delete msg.revoke_ing
-      }
+      // ui 界面上去掉撤回中
+      delete msg.revoke_ing
     }
+    msg.is_revoke = true
+    msg.body = '[此消息已被撤回]'
   }
 
   /**
@@ -214,7 +167,7 @@ class Conversation {
    */
   getUsersInfo() {
     // 群会话返回群成员信息，单聊返回对方用户信息
-    return this.group_id ? this.group_member : {
+    return this.group_id ? this.group.member.dataList : {
       [this.user_info._id]: this.user_info
     }
   }
@@ -225,7 +178,11 @@ class Conversation {
     this.mute = !this.mute
     const db = uniCloud.database();
     db.collection('uni-im-conversation')
-      .doc(this._id)
+      // 因为本地创建的会话没有_id，需通过user_id和id指定要操作的会话
+      .where({
+        user_id: this.user_id,
+        id: this.id
+      })
       .update({
         "mute": this.mute
       })
@@ -245,47 +202,63 @@ class Conversation {
    * @param {Object} data
    */
   activeProperty(data) {
-    this._last_visible_msg = this.last_visible_msg
     this._leave = this.leave
     this._update_time = this.update_time || this.create_time
     const _conversation = this
     const activeProperty = {
       title() {
-        return _conversation.group_id ? _conversation.group_info.name : _conversation.user_info.nickname
+        return _conversation.group_id ? _conversation.group.name : _conversation.user_info.nickname
       },
       avatar_file() {
-        return _conversation.group_id ? _conversation.group_info.avatar_file : _conversation.user_info.avatar_file
+        return _conversation.group_id ? _conversation.group.avatar_file : _conversation.user_info.avatar_file
       },
       leave:{
         get() {
-          if (_conversation.msgList.length === 0) {
+          if (_conversation.msg.dataList.length === 0) {
             return _conversation._leave
           } else {
-            let last_msg = _conversation.msgList[_conversation.msgList.length - 1]
+            let last_msg = _conversation.msg.dataList[_conversation.msg.dataList.length - 1]
             //群被解散，或者被踢出
-            return "group-dissolved" === last_msg.action || ["group-exit", "group-expel"].includes(last_msg.action) && last_msg.body.user_id_list.includes(current_uid())
+            return "group-dissolved" === last_msg.action || ["group-exit", "group-expel"].includes(last_msg.action) && last_msg.body.user_id_list.includes($state.currentUser._id)
           }
         },
         set(value){
-          console.log('set leave value',value)
+          // console.log('set leave value',value)
           _conversation._leave = value
         }
       },
       isMuteAllMembers() {
-        if (!_conversation.group_id) return false
-        const member = _conversation.group_member[current_uid()]
-        // console.log('member',member)
-        return member && !member.role.includes('admin') && _conversation.group_info.mute_all_members
+        try{
+          if (!_conversation.group_id) return false
+          const member = _conversation.group.member.find($state.currentUser._id)
+          // console.log('member',member)
+          return member && !member.role.includes('admin') && _conversation.group.mute_all_members
+        }catch(e){
+          console.error('isMuteAllMembers',e,_conversation)
+          console.error('isMuteAllMembers',1,_conversation.group)
+          console.error('isMuteAllMembers',2,_conversation.group.member)
+          console.error('isMuteAllMembers',3,_conversation.group.member.find)
+          console.error('isMuteAllMembers',4,typeof _conversation.group.member.find)
+        }
+      },
+      // 最后一条可见消息
+      _last_visible_msg() {
+        // 拿到内存中的
+        const visibleMsgList = _conversation.msg.visibleDataList()
+        const vml = visibleMsgList.length
+        return vml > 0 ? visibleMsgList[vml - 1] : false
       },
-      // 最后一条可见消息的时间
+      // 最后一条可见消息的时间，也被用于排序会话
       time() {
-        // 如果存在最后一条可见消息，就用它的时间，否则用会话的更新时间
-        const last_visible_msg = _conversation.last_visible_msg
-        return last_visible_msg ? (last_visible_msg.create_time || last_visible_msg.client_create_time) : _conversation.update_time
+        // 如果存在最后一条可见消息，就用它的时间，否则用会话的更新时间 （注意：不能取最大值，因为消息被已读也会更新会话时间，此时会话无需重新排序）
+       const last_visible_msg = _conversation._last_visible_msg
+       let time = last_visible_msg ? (last_visible_msg.create_time || last_visible_msg.client_create_time) : _conversation.update_time
+       // time 和本地自定义排序时间比较，取最大值。说明：customSortTime 是临时将会话排序提升到最前的时间。比如：在群成员列表/消息列表等 与某个用户起会话，临时将会话提升到最前等
+       return Math.max(time, _conversation.customSortTime || 0)
       },
       // 最后一条可见消息的内容
       note() {
-        let note = _conversation.last_msg_note || "暂无记录"
+        let note = _conversation.last_msg_note || '暂无聊天记录'
         // 如果输入框有文本未发出（草稿），直接覆盖消息
         let chatInputContent = _conversation.chatInputContent
         if (typeof chatInputContent === 'object') {
@@ -295,7 +268,7 @@ class Conversation {
           chatInputContent = chatInputContent.replace(/&nbsp;/g, ' ').trim()
         }
         _conversation.hasDraft = chatInputContent && $state.currentConversationId != _conversation.id
-        let last_visible_msg = _conversation.last_visible_msg
+        let last_visible_msg = _conversation._last_visible_msg
         if (_conversation.hasDraft) {
           note = chatInputContent
           last_visible_msg = {
@@ -306,10 +279,16 @@ class Conversation {
         if (last_visible_msg) { // 如果存在最后一条消息
           const _last_visible_msg = JSON.parse(JSON.stringify(last_visible_msg))
           // console.error('last_visible_msg',_last_visible_msg)
-          note = $utils.getMsgNote(_last_visible_msg)
+          note = $utils.getMsgNote(last_visible_msg)
         }
         // 替换\\n \\r \n \r &nbsp; &lt; &gt; &amp; 为 空格
         note = note.replace(/\\n|\\r|\n|\r|&nbsp;|&lt;|&gt;|&amp;/g, ' ')
+        // 拿到发送消息的用户昵称
+        const {nickname} =last_visible_msg
+        if(_conversation.group_id && nickname){
+          note = nickname + ': ' + note
+        }
+        
         return note.trim()
       },
       // 刷新会话的更新时间
@@ -318,9 +297,9 @@ class Conversation {
           // console.log('refreshUpdateTime');
           // 拿到最后一条消息
           let update_time = _conversation._update_time
-          let msgLength = _conversation.msgList.length
+          let msgLength = _conversation.msg.dataList.length
           if (msgLength > 0) {
-            let last_msg = _conversation.msgList[msgLength - 1]
+            let last_msg = _conversation.msg.dataList[msgLength - 1]
             // 拿到最后一条消息的创建时间，消息发送成功之前没有create_time，用client_create_time
             let last_msg_time = last_msg.create_time || last_msg.client_create_time
             if (last_msg_time > update_time) {
@@ -332,29 +311,6 @@ class Conversation {
         set(value) {
           _conversation._update_time = value
         }
-      },
-      // 刷新最后一条可见消息
-      last_visible_msg:{
-        get() {
-          // 拿到会话中带的
-          let lastVisibleMsg = _conversation._last_visible_msg
-          // 拿到内存中的
-          let visibleMsgList = $utils.filterMsgList(_conversation.msgList)
-          let vml = visibleMsgList.length
-          let lastVisibleMsg2 = vml > 0 ? visibleMsgList[vml - 1] : false;
-          if (lastVisibleMsg2) {
-            // 内存中的存在最后一条可见消息，且比会话中带的新
-            const lvmCreateTime = lastVisibleMsg2.create_time || lastVisibleMsg2.client_create_time
-            // 会话原始带的不存在，或者比内存中的小
-            if(!lastVisibleMsg || lvmCreateTime > lastVisibleMsg.create_time){
-              lastVisibleMsg = lastVisibleMsg2
-            }
-          }
-          return lastVisibleMsg
-        },
-        set(value) {
-          _conversation._last_visible_msg = value
-        }
       }
     }
     
@@ -365,7 +321,7 @@ class Conversation {
           if (typeof activeProperty[key] != 'function') {
             item = activeProperty[key].get
           }
-          this[key] = item()
+          _conversation[key] = item()
         })
       },
       ...activeProperty
@@ -382,7 +338,11 @@ class Conversation {
     console.log('hidden######');
     this.hidden = true
     let res = await db.collection('uni-im-conversation')
-      .doc(this._id)
+      // 因为本地创建的会话没有_id，需通过user_id和id指定要操作的会话
+      .where({
+        user_id: this.user_id,
+        id: this.id
+      })
       .update({
         "hidden": true
       })
@@ -395,7 +355,11 @@ class Conversation {
     const oldCount = this.unread_count
     this.unread_count = count
     let res = await db.collection('uni-im-conversation')
-      .doc(this._id)
+      // 因为本地创建的会话没有_id，需通过user_id和id指定要操作的会话
+      .where({
+        user_id: this.user_id,
+        id: this.id
+      })
       .update({
         "unread_count": count
       })
@@ -408,6 +372,28 @@ class Conversation {
       })
     return res
   }
+  async changeIsStar() {
+    const oldIsStar = this.is_star
+    console.log('setIsStar', oldIsStar);
+    this.is_star = !oldIsStar
+    let res = await db.collection('uni-im-conversation')
+      // 因为本地创建的会话没有_id，需通过user_id和id指定要操作的会话
+      .where({
+        user_id: this.user_id,
+        id: this.id
+      })
+      .update({
+        "is_star": this.is_star
+      })
+      .catch(err => {
+        console.error('setIsStar err', err);
+        this.is_star = oldIsStar
+      })
+      .then(e => {
+        console.log('setUnreadCount updated', e.result.updated);
+      })
+    return res
+  }
 }
 
-export default Conversation
+export default ConversationItem
diff --git a/sdk/state/Friend.class.js b/sdk/state/Friend.class.js
new file mode 100644
index 0000000000000000000000000000000000000000..5352532ac424c6c52dd68b1832b5cff1b629d985
--- /dev/null
+++ b/sdk/state/Friend.class.js
@@ -0,0 +1,39 @@
+import CloudData from '@/uni_modules/uni-im/sdk/ext/CloudData.class.js'
+import $state from '../state/index.js';
+const dbJQL = uniCloud.databaseForJQL()
+const dbJQLCommand = dbJQL.command
+const $ = dbJQL.command.aggregate
+export default class Friend extends CloudData {
+  __beforeAdd(friendList) {
+    // 将好友信息存储到users中
+    friendList.forEach(item => $state.users[item._id] = item)
+    return friendList
+  }
+  async __get(param = {}) {
+    const {friend_uid} = param
+    const limit = this.loadLimit
+    let whereString = '"user_id" == $cloudEnv_uid'
+    if (friend_uid) {
+      whereString += `&& "friend_uid" == "${friend_uid}"`
+      // console.log('whereString',whereString);
+    }
+    let res = await dbJQL.collection(
+        dbJQL.collection('uni-im-friend').where(whereString).field('friend_uid,mark,class_name')
+        .getTemp(),
+        dbJQL.collection('uni-id-users').field('_id,nickname,avatar_file,realname_auth').getTemp()
+      )
+      .limit(limit)
+      .get()
+    const usersList = res.data.map(item => item.friend_uid[0])
+    $state.users.merge(usersList.reduce((obj, item) => {
+      obj[item._id] = item
+      return obj
+    }, {}))
+    return usersList 
+  }
+  remove(friend_uid) {
+    let friendList = $state.friend.dataList
+    let index = friendList.findIndex(i => i._id == friend_uid)
+    friendList.splice(index, 1)
+  }
+}
\ No newline at end of file
diff --git a/sdk/state/Group.class.js b/sdk/state/Group.class.js
new file mode 100644
index 0000000000000000000000000000000000000000..3b2a3711adc773c432c608256fed3e6296ffc2cf
--- /dev/null
+++ b/sdk/state/Group.class.js
@@ -0,0 +1,49 @@
+import CloudData from '@/uni_modules/uni-im/sdk/ext/CloudData.class.js'
+import GroupItem from './GroupItem.class.js'
+import $users from '@/uni_modules/uni-im/sdk/methods/users.js';
+
+const dbJQL = uniCloud.databaseForJQL()
+const dbJQLCommand = dbJQL.command
+const $ = dbJQL.command.aggregate
+
+export default class Group extends CloudData {
+  constructor() {
+    super()
+  }
+  __beforeAdd(groupList) {
+    if(!Array.isArray(groupList)){
+      groupList = [groupList]
+    }
+    return groupList.map(data => new GroupItem(data))
+  }
+  async __get(param = {}) {
+    // console.error('pull Group Data param',param);
+    const {group_id} = param
+    let whereString = '"user_id" == $cloudEnv_uid && "is_delete" != true'
+    if(!this.min_create_time){
+      this.min_create_time = Date.now()
+    }
+    whereString += `&& "create_time" < ${this.min_create_time}`
+    if (group_id) {
+      whereString += `&& "group_id" == "${group_id}"`
+    }
+    // console.log('this.min_create_time',this.min_create_time)
+    // console.log('whereString',whereString)
+    const res = await dbJQL.collection(
+        dbJQL.collection('uni-im-group-member')
+          .where(whereString)
+          .orderBy('create_time', 'desc')
+          .getTemp(),
+        dbJQL.collection('uni-im-group').getTemp()
+      )
+      .limit(this.loadLimit)
+      .get()
+    let groupList = res.data
+    const length = groupList.length
+    if(length){
+      this.min_create_time = groupList[length - 1].create_time
+    }
+    groupList = groupList.map(item => item.group_id[0])
+    return groupList
+  }
+}
\ No newline at end of file
diff --git a/sdk/state/GroupItem.class.js b/sdk/state/GroupItem.class.js
new file mode 100644
index 0000000000000000000000000000000000000000..84d6080a997bf3d9a116848971096fa1104dd6e6
--- /dev/null
+++ b/sdk/state/GroupItem.class.js
@@ -0,0 +1,9 @@
+import GroupMember from '@/uni_modules/uni-im/sdk/state/GroupMember.class.js'
+export default class GroupItem {
+  constructor(data){
+    for (let key in data) {
+      this[key] = data[key]
+    }
+    this.member = new GroupMember({group_id:this._id})
+  }
+}
\ No newline at end of file
diff --git a/sdk/state/GroupMember.class.js b/sdk/state/GroupMember.class.js
new file mode 100644
index 0000000000000000000000000000000000000000..f8b3ce4f8f091e5a4c76a5b48f6420cb69f00535
--- /dev/null
+++ b/sdk/state/GroupMember.class.js
@@ -0,0 +1,68 @@
+import CloudData from '@/uni_modules/uni-im/sdk/ext/CloudData.class.js'
+import $users from '@/uni_modules/uni-im/sdk/methods/users.js';
+import $extensions from '@/uni_modules/uni-im/sdk/methods/extensions.js';
+const dbJQL = uniCloud.databaseForJQL()
+const dbJQLCommand = dbJQL.command
+const $ = dbJQL.command.aggregate
+
+export default class GroupMember extends CloudData {
+  constructor({group_id}={}) {
+    super()
+    this.group_id = group_id
+    this.indexKey = 'users._id'
+    this.needLoadOnce = true
+  }
+  __beforeAdd(datas){
+    // console.log('GroupMember beforeAdd',datas);
+    // 调用扩展点中的方法
+    // $extensions.invokeExts('before-add-group-member', datas)
+    
+    // 为了方便使用，将用户信息缓存到全局
+    const userInfoObj = datas.reduce((obj,item) => {
+      obj[item.users._id] = item.users
+      return obj
+    },{})
+    $users.merge(userInfoObj)
+  }
+  findByUid(uid) {
+    console.warn('member.findByUid 已经过期，去直接member.find(uid)查找');
+    return this.dataList.find(item => item.users._id === uid)
+  }
+  __beforeFind(param){
+    if (typeof param === 'string'){
+      // 设置为默认按users._id查找群成员，而不是按_id查找
+      return {
+        users:{
+          _id:param
+        }
+      }
+    }else{
+      return param
+    }
+  }
+  async __get() {
+    // console.error('pull GroupMember Data param',this.group_id);
+    let _where = `"group_id" == "${this.group_id}"`
+    if (this.lastItem) {
+      const {active_time,_id} = this.lastItem
+      _where += ` && !(role in ["admin"]) && ("active_time" < ${active_time} || ("active_time" == ${active_time} && "_id" < "${_id}"))`
+    }
+    let res = await dbJQL.collection(
+        dbJQL.collection('uni-im-group-member')
+            .where(_where)
+            .orderBy("role desc,active_time desc,_id desc")
+            .limit(this.loadLimit)
+            .getTemp(),
+        dbJQL.collection('uni-id-users').field('_id,nickname,avatar_file,realname_auth').getTemp()
+      )
+      .get()
+    // console.error('拉取到群成员数据',_where,res.data.length,length);
+    this.lastItem = res.data[res.data.length - 1]
+    return res.data.map(item => {
+      const usersInfo = item.user_id[0];
+      delete item.user_id
+      item.users = usersInfo
+      return item
+    })
+  }
+}
\ No newline at end of file
diff --git a/sdk/state/MsgItem.class.js b/sdk/state/MsgItem.class.js
new file mode 100644
index 0000000000000000000000000000000000000000..7e1dae11ee4c01756a5c020ddb130d725d254e32
--- /dev/null
+++ b/sdk/state/MsgItem.class.js
@@ -0,0 +1,40 @@
+import md5 from '@/uni_modules/uni-im/sdk/utils/md5.min.js'
+import $state from '@/uni_modules/uni-im/sdk/state/index.js'
+const __updateAfterTimer = {}
+export default class MsgItem{
+  constructor(msgData) {
+    for (let key in msgData) {
+      this[key] = msgData[key]
+    }
+    const {create_time,client_create_time} = msgData
+    this.unique_id = "u" + (create_time || client_create_time).toString(36) + md5( JSON.stringify(msgData))
+  }
+  __updateAfter(){
+    // 防抖 100ms
+    if(__updateAfterTimer[this.unique_id]){
+      clearTimeout(__updateAfterTimer[this.unique_id])
+    }
+    __updateAfterTimer[this.unique_id] = setTimeout(()=>{
+      const {conversation_id,_id} = this
+      if(_id){
+        const conversation = $state.conversation.find({conversation_id})
+        conversation.msg.dataMap.set(_id,this)
+      }
+      // #ifndef H5
+      return // 仅H5环境下更新本地数据库
+      // #endif
+      const msg = JSON.parse(JSON.stringify(this))
+      // console.error('MsgItem __updateAfter',msg)
+      let request = $state.indexDB.transaction(['uni-im-msg'], 'readwrite')
+        .objectStore("uni-im-msg")
+        .put(msg)
+      request.onsuccess = function(event) {
+        // console.log('event---更新本地数据库记录成功',event);
+      }
+      request.onerror = function(event) {
+        console.error(event);
+      };
+    },100)
+    
+  }
+}
\ No newline at end of file
diff --git a/sdk/state/data.js b/sdk/state/data.js
index 47f952ab42cf4f7c19014700ddc7210e52033f5d..e585a5b401261d7347f167f2219781ab445a332a 100644
--- a/sdk/state/data.js
+++ b/sdk/state/data.js
@@ -1,32 +1,34 @@
+import {computed} from 'vue'
+import { store as uniIdStore } from '@/uni_modules/uni-id-pages/common/store.js';
+import CloudData from '@/uni_modules/uni-im/sdk/ext/CloudData.class.js'
+import Conversation from './Conversation.class.js'
+import Group from './Group.class.js'
+import Friend from './Friend.class.js'
 export default {
-  isDisabled: false,
   // 会话数据
-  conversation: {
-    dataList: [],
-    hasMore: true,
-    loading: false // 加锁防止意外重复请求时出错
-  },
+  conversation: new Conversation(),
+  // 好友列表
+  friend: new Friend(),
+  // 群列表
+  group: new Group(),
+  // 系统通知消息
+  notification: new CloudData(),
+  // 存储所有出现过的用户信息，包括群好友信息
+  users: {},
+  // 当前用户信息
+  currentUser: computed(()=>{
+    const {role,tokenExpired,permission} = uniCloud.getCurrentUserInfo()
+    return {
+      ...uniIdStore.userInfo,
+      role,tokenExpired,permission
+    }
+  }),
+  // 是否禁用（用于全局禁用）
+  isDisabled: false,
   // 正在对话的会话id
   currentConversationId: false,
   // 全局响应式心跳，用于更新消息距离当前时长 等
   heartbeat: '',
-  // 好友列表
-  friend: {
-    dataList: [],
-    hasMore: true
-  },
-  // 群列表
-  group: {
-    dataList: [],
-    hasMore: true
-  },
-  // 系统通知消息
-  notification: {
-    dataList: [],
-    hasMore: true
-  },
-  //存储所有出现过的用户信息，包括群好友信息
-  users: {},
   //是否为pc宽屏
   isWidescreen: false,
   //是否为触摸屏
diff --git a/sdk/state/index.js b/sdk/state/index.js
index fffa057590e2de58f5ccfd62e9da698307859121..0cf78c4617cfd3b1c950e57eb1ea99a62c2a6396 100644
--- a/sdk/state/index.js
+++ b/sdk/state/index.js
@@ -1,8 +1,10 @@
 import {default as createObservable,$watch} from '@/uni_modules/uni-im/sdk/utils/createObservable.js';
 import data from './data';
+
 const observable = createObservable(data);
 
 let lastKey = ''
+// #ifdef VUE2
 $watch(() => observable.conversation.dataList, (conversationDataList) => {
   // 会话数据排序
   const currentKey = sortConversationDataList(conversationDataList.slice()).map(item => item.id).join(',')
@@ -17,6 +19,77 @@ $watch(() => observable.conversation.dataList, (conversationDataList) => {
   deep: true,
   immediate: true
 })
+// #endif
+
+// #ifdef VUE3
+// 监听数据变化
+import {watchEffect} from 'vue'
+let index2 = 0,nnn2 = 0
+watchEffect(() => {
+  const conversationDataList = observable.conversation.dataList
+  index2 ++ 
+  // console.error('watchEffect会话数据变化2222',index2)
+  // 会话数据排序
+  const currentKey = sortConversationDataList(conversationDataList.slice()).map(item => item.id).join(',')
+  if (currentKey !== lastKey) {
+    nnn2 ++
+    // console.log('重新排序2',nnn2)
+    // TODO：优化未知错误需要加setTimeout 0，使得在下一次js引擎的事件循环执行，后续可以考虑优化
+    setTimeout(()=>sortConversationDataList(conversationDataList),0)
+    lastKey = currentKey
+  }else{
+    // console.error('---无需重新排序')
+  }
+})
+// #endif
+
+
+$watch(() => observable.currentConversationId,(currentConversationId,old)=>{
+  // console.log('选中的会话变化',currentConversationId,old)
+  if(old){
+    const oldConversation = observable.conversation.dataList.find(item => item.id === old)
+    // console.log('oldConversation',oldConversation)
+    // 只存储最后10条可见消息
+    const msgList = oldConversation?.msg?.dataList || []
+    const visibleDataList = oldConversation?.msg?.visibleDataList() || []
+    if (visibleDataList.length > 10) {
+      // 拿到倒数第10条可见消息
+      const lastTenMsg = visibleDataList[visibleDataList.length - 10]
+      const lastTenMsgIndex = msgList.findIndex(item => item._id === lastTenMsg._id)
+      oldConversation.msg.hasMore = true
+      // 删掉dataMap中的多余数据
+      for (let i = 0; i < lastTenMsgIndex; i++) {
+        oldConversation.msg.dataMap.delete(msgList[i]._id)
+      }
+      msgList.splice(0, lastTenMsgIndex)
+    }
+  }
+})
+
+$watch(() => observable.networkConnected, (networkConnected,oldNetworkConnected) => {
+  // console.log('网络连接状态变化',networkConnected,oldNetworkConnected)
+  if(networkConnected){
+    // 重新连接
+  }else{
+    // 断开连接
+  }
+  
+  if(oldNetworkConnected === false && networkConnected){
+    uni.showModal({
+      content: "运行期间网络连接被异常中断，请重新加载",
+      showCancel: false,
+      confirmText: '重新加载',
+      success(e) {
+        if (e.confirm) {
+          // console.log('用户点击确定');
+          window.location.reload()
+        }
+      }
+    });
+  }
+  
+})
+
 
 function sortConversationDataList(conversationDataList) {
   return conversationDataList.sort(function(a, b) {
@@ -24,16 +97,19 @@ function sortConversationDataList(conversationDataList) {
       return a.pinned ? -1 : 1;
     }
     if (a.customIndex || b.customIndex) {
-      let aIndex = a.customIndex || a.time
-      let bIndex = b.customIndex || b.time
-      return bIndex - aIndex
+      let aIndex = a.customIndex || 0
+      let bIndex = b.customIndex || 0
+      return bIndex > aIndex ? 1 : -1
+    }
+    if(b.time === a.time){
+      return b.id > a.id ? 1 : -1
     }
-    return b.time - a.time
+    return b.time > a.time ? 1 : -1
   })
 }
 
 // 异步存到storage// TODO 暂时不离线存储会话数据
-/*const {uid} = uniCloud.getCurrentUserInfo();
+/*const {uid} = observable.currentUser
 if (uid) {
   uni.setStorage({
     key: 'uni-im-conversation-list' + '_uid:' + uid,
diff --git a/sdk/state/msg.class.js b/sdk/state/msg.class.js
new file mode 100644
index 0000000000000000000000000000000000000000..350a10918def147311a3d173121960364df00e8f
--- /dev/null
+++ b/sdk/state/msg.class.js
@@ -0,0 +1,384 @@
+import {watch} from 'vue'
+import $state from '../state/index.js'
+import $methods from '@/uni_modules/uni-im/sdk/methods/index.js';
+import $utils from '@/uni_modules/uni-im/sdk/utils/index.js';
+import CloudData from '@/uni_modules/uni-im/sdk/ext/CloudData.class.js'
+import MsgItem from './MsgItem.class.js'
+const dbJQL = uniCloud.databaseForJQL()
+const dbJQLcmd = dbJQL.command;
+
+export default class Msg extends CloudData {
+  constructor(conversation_id) {
+    super()
+    this.loadLimit = 10 //每次拉取的条数
+    this.conversation_id = conversation_id
+    this.isFull = false
+  }
+  // 可见的消息列表（过滤掉不可见的消息，比如：消息撤回指令、更新群头像指令...）
+  visibleDataList(){
+    return this.dataList.filter(msg => $utils.isReadableMsg(msg))
+  }
+  __saveToLocal(datas,{canSetIsFull}){
+    // #ifndef H5
+    return
+    // #endif
+    
+    let transaction = $state.indexDB.transaction('uni-im-msg', 'readwrite')
+    let objectStore = transaction.objectStore('uni-im-msg') // 仓库对象
+    let index = 0
+    let length = datas.length
+    const addData = (data) =>{
+      data.__isLocal = true
+      const res = objectStore.add(data)
+      res.onsuccess = (e) => {
+        // console.log('resolve',e, index, length);
+        index++
+        if (index == length) {
+          // console.log('add - success', e);
+        }
+      }
+      res.onerror = (e) => {
+        console.error('add - failed', e);
+        reject(e)
+      }
+    }
+    // 拷贝一份数据，避免修改原数据
+    const dataList = JSON.parse(JSON.stringify(datas))
+    dataList.forEach(data => {
+      // console.log('data._id',data._id);
+      if(data._id){
+        objectStore.index("_id").get(data._id).onsuccess = event => {
+          // console.log('get',event.target.result);
+          if (event.target.result) {
+            // console.error('canSetIsFull',canSetIsFull)
+            if(canSetIsFull && !this.isFull){
+              // console.log('数据已存在，设置canSetIsFull', canSetIsFull, data.body);
+              this.isFull = true
+            }
+            // console.log('数据已存在', data._id);
+            return
+          }else{
+            // console.log('可以新增', data._id);
+            addData(data)
+          }
+        }
+      }else{
+        addData(data)
+      }
+    })
+  }
+  __beforeAdd(datas){
+    const currentConversation = $state.conversation.find(this.conversation_id)
+    // 如果插入的消息，包含指令（撤回、新用户进群、用户离群、@我 等）则执行指令
+    // 允许插入消息之前，执行一些操作
+    $state.extensions.invokeExts('before-add-msg', datas)
+    datas.forEach(async data => {
+      // console.log('beforeAdd',data);
+      // 如果此消息，创建时间在当前设备创建此会话之前，则无需执行
+      const conversation_time =  currentConversation.update_time || currentConversation.client_create_time || 0
+      if (data.create_time < conversation_time) {
+        return //console.log('消息创建时间早于会话最新时间，不执行',data.create_time,conversation_time);
+      }
+      // 调用扩展程序，使扩展程序可以在消息插入之前执行一些操作
+      $methods.msgTypes.get(data.type)?.beforeLocalAdd?.(data,currentConversation)
+      // 如果收到的是撤回消息指令
+      if (data.type === "revoke_msg") {
+        return currentConversation.revokeMsg(data.body.msg_id, false)
+      }
+      // 订单支付通知
+      if(data.type === 'pay-notify' && data.from_uid === "system"){
+        // console.log('收到订单支付通知',data);
+        const {order_id,group_id,pay_channel,status} = data.body
+        let currentConversation = $state.conversation.find({group_id})
+        if(currentConversation){
+          const msg = currentConversation.msg.find({body:{"order_id":order_id}})
+          if(!msg){
+            console.log('pay-notify 未找到订单消息',data);
+            return
+          }
+          console.log('pay-notify msg',msg);
+          msg.body.pay_channel = pay_channel
+          msg.body.status = status || 1
+          msg.body.pay_time = data.create_time
+          msg.body.pay_notify = data
+        }else{
+          console.log('pay-notify 未找到会话',data);
+        }
+      }
+      const current_uid = $state.currentUser._id
+      //  系统通知
+      if (data.type === "system") {
+        // 用户退出、被踢出群
+        if (["group-exit", "group-expel"].includes(data.action)) {
+          data.body.user_id_list.forEach(uid=>{
+            // 从列表中移除这些用户
+            currentConversation.group.member.remove({"users":{"_id":uid}})
+            currentConversation.group.member_count --
+          })
+          if (data.body.user_id_list.includes(current_uid)) {
+            // 移除相关会话
+            $state.conversation.remove(currentConversation.id)
+            // 删除相关群
+            $state.group.remove(currentConversation.group_id)
+          }
+        } else if (data.action === "group-dissolved") {
+          // 解散群
+          $state.conversation.remove(currentConversation.id)
+          $state.group.remove(currentConversation.group_id)
+        }
+        // 新用户加群
+        else if (data.action === "join-group") {
+          const {new_member_list,user_id_list} = data.body
+          // 如果新加入此群的用户id列表，包括当前用户 
+          if(user_id_list.includes(current_uid)){
+            // 此会话当前设备之前就加载过，需要重新加载群会话和成员列表（因为被踢出群期间可能有其他用户进群、发消息等）
+            if(currentConversation.client_create_time < data.create_time){
+              const uniImCo = uniCloud.importObject("uni-im-co",{customUI: true})
+              let res = await uniImCo.getConversationList({"conversation_id":currentConversation.id})
+              Object.assign(currentConversation, res.data[0])
+              //先清空 群成员
+              currentConversation.msg.reset()
+              currentConversation.group.reset()
+              //重新拉取 群成员
+              await currentConversation.group.loadMore()
+              // 获取群公告
+              currentConversation.has_unread_group_notification = !!currentConversation.group.notification
+            }
+          }else{
+            // 将新成员加入到群成员列表
+            // 获取成员信息 get方法会从云端拉取本地不存在的用户数据
+            await $state.users.get(new_member_list.map(i=>i.user_id))
+            new_member_list.forEach(member=>{
+              // 补全用户信息
+              member.users = $state.users[member.user_id]
+              currentConversation.group.member.add(member)
+              currentConversation.group.member_count ++
+            })
+          }
+        }
+        //更新群资料
+        else if (data.action.indexOf("update-group-info-") === 0) {
+          if(data.action === "update-group-info-mute_all_members" && currentConversation?.group?.mute_all_members != data?.body?.updateData?.mute_all_members){
+            const {mute_all_members} = data.body.updateData
+            currentConversation.group.member.dataList.forEach(member => {
+              member.mute_type += (mute_all_members ? 1 : -1)
+            })
+          }
+          currentConversation.group = Object.assign(currentConversation.group,data.body.updateData)
+          const {notification} = data.body.updateData
+          if(data.action === "update-group-info-notification"){
+            console.log('收到群公告');
+            currentConversation.has_unread_group_notification = true
+          }
+        }
+        else if(data.action === "set-group-admin"){
+          const {user_id,addRole,delRole} = data.body
+          const {role} = currentConversation.group.member.find(user_id)
+          if(addRole.length != 0){
+            role.push(...addRole)
+          }else if(delRole.length != 0){
+            console.log('delRole',delRole);
+            delRole.forEach(r=>{
+              console.log('r',r);
+              console.log('role',role);
+              const index = role.findIndex(i => i === r)
+              console.log('index',index);
+              if(index > -1){
+                role.splice(index,1)
+              }
+            })
+          }
+          // console.log('设置群管理员',currentConversation.group.member.find(user_id));
+        }
+        // 
+        else if(data.action === "set-group-member-ext-plugin-order-info"){
+          const {user_id,group_id,dcloud_plugin_order_info} = data.body
+          const member = currentConversation.group.member.find(user_id)
+          if(!member.ext){
+            member.ext = {}
+          }
+          console.log('设置群成员插件订单信息',member);
+          member.ext.dcloud_plugin_order_info = dcloud_plugin_order_info
+        }
+      }
+      
+      if (
+        // 如果收到的是群聊且带@的消息
+        data.group_id &&
+        data.call_uid && 
+        (
+          // @所有人 或 @我
+          data.call_uid == '__ALL' ||
+          data.call_uid.includes(current_uid)
+        )
+      ) {
+        currentConversation.call_list.push(data._id)
+      }
+    })
+    
+    return datas.map(item => new MsgItem(item))
+  }
+  __afterAdd(datas,{canSetIsFull}){
+    datas.forEach(msg => {
+      watch(msg, (newMsg)=>msg.__updateAfter(newMsg), {deep: true})
+    })
+    // console.log('canSetIsFull',canSetIsFull)
+    // 存到客户端数据库中
+    if(datas[0] && !datas[0].__isLocal){
+      const msgs = datas.filter(data => {
+        let needSave = $utils.isReadableMsg(data)
+        if (needSave) {
+          return true
+        }else{
+          // console.log('不需要保存',data);
+          return false
+        }
+      })
+      this.__saveToLocal(msgs,{canSetIsFull})
+    }
+    return datas
+  }
+  async __getLocalData({
+    minTime = 0,
+    maxTime = Date.now(),
+    limit = this.loadLimit,
+    _id = false,
+    orderBy = {
+      // asc 升序，desc 降序
+      "create_time": "desc"
+    }
+  }){
+    // #ifndef H5
+    return []
+    // #endif
+    
+    // console.log('minTime',minTime,'maxTime',maxTime,'limit',limit,'_id',_id,'orderBy',orderBy)
+    const start = Date.now()
+    let datas = await new Promise((resolve, reject) => {
+      //  根据 id 查询
+      if (_id) {
+        // console.error('$state.indexDB~~~',$state.indexDB)
+        let getRequest = $state.indexDB.transaction("uni-im-msg")
+          .objectStore("uni-im-msg")
+          .index("_id")
+          .get(_id)
+        getRequest.onsuccess = function(event) {
+          if (getRequest.result) {
+            resolve([getRequest.result])
+          } else {
+            resolve([])
+          }
+        };
+        getRequest.onerror = function(event) {
+          console.log('Error getting data');
+          resolve([])
+        };
+        return
+      }
+
+      // 设置查询索引
+      // console.log('kkkkkkkk',[this.conversation_id, minTime], [this.conversation_id,maxTime]);
+      let range = IDBKeyRange.bound([this.conversation_id, minTime], [this.conversation_id, maxTime])
+      // 传入的 prev 表示是降序遍历游标，默认是next表示升序；
+      // $state.indexDB 在im的场景下，查始终是降序遍历游标 orderBy指的是查询结果的排序方式
+      let sort = "prev"
+      // console.log('sortsortsortsortsortsortsort',sort);
+      // console.error('$state.indexDB~~~',$state.indexDB)
+      let task = $state.indexDB.transaction("uni-im-msg")
+        .objectStore("uni-im-msg")
+        .index("conversation_id-create_time")
+        .openCursor(range, sort)
+      
+      let datas = [], index = 0;
+      task.onsuccess = function(event) {
+        let cursor = event.target.result;
+        if (cursor) {
+          // console.log('cursor',cursor.value);
+          // 排除边界值
+          if (![minTime, maxTime].includes(cursor.value.create_time)) {
+            datas.push(cursor.value)
+            index++
+          }else{
+            // console.log('边界值',cursor.value.create_time);
+          }
+          
+          // console.log('index',index,limit);
+          if (limit && index === limit) {
+            resolve(datas)
+          } else {
+            cursor.continue();
+          }
+        } else {
+          resolve(datas)
+        }
+      }
+      task.onerror = function(err) {
+        console.error(err);
+        resolve([])
+      }
+    })
+    // console.log('本地查找耗时',Date.now() - start);
+    datas.sort((a, b) => {
+      if (orderBy.create_time == 'asc') {
+        return a.create_time - b.create_time
+      } else {
+        return b.create_time - a.create_time
+      }
+    })
+    // console.log('本地查到的datas：',datas);
+    return datas
+  }
+  async __get(){
+    //已经拉取的数据中时间最小的值，作为最大
+    let maxTime = this.dataList[0]?.create_time || Date.now()
+    let localData = []
+    if(this.isFull){
+      // 如果云端和本地数据重合了，则可以先从本地查
+      // console.log('如果云端和本地数据重合了，则可以先从本地查',this.isFull);
+      localData = await this.__getLocalData({
+        maxTime: maxTime,
+        limit: this.loadLimit,
+        orderBy: {
+          "create_time": "asc",
+        },
+      })
+      // 如果本地有数据，直接返回
+      if (localData.length === this.loadLimit) {
+        // console.log('本地有数据',localData);
+        return localData
+      }else{
+        // console.error('本地未拉满'+this.loadLimit+'条，从云端拉取 this.isFull',this.isFull);
+      }
+    }else{
+      // console.log('本地数据未与云端重合，需从云端拉取',this.isFull);
+    }
+    
+    maxTime = localData[0]?.create_time || maxTime
+    
+    // 本地没有数据，从云端拉取
+    const where = {
+      "conversation_id": this.conversation_id
+    }
+    if(maxTime){
+      where.update_time = dbJQLcmd.lt(maxTime)
+    }
+    let data;
+    let res = await dbJQL.collection('uni-im-msg')
+      .where(where)
+      .limit(this.loadLimit - localData.length)
+      .orderBy('update_time', 'desc')
+      .get()
+    // console.error('云端查找到', res.data.length ,'条',res.data);
+    
+    // 服务端查找“应当”按消息“更新”时间排序，但显示需要按“创建”时间倒序，所以这里需要重新排序
+    res.data.sort((a,b) => b.create_time - a.create_time)
+    data = res.data.concat(localData)
+    // console.error('合并本地与云端为', data.length ,'条',data);
+    // console.error('where', where,data);
+    return data
+  }
+  __canSeaveToDataMap(msg){
+    // 本地创建的消息，不保存到dataMap中。等发送成功后，服务端回调_id再由__updateAfter方法更新到dataMap中
+    return msg._id?.indexOf('temp_') === -1
+  }
+}
\ No newline at end of file
diff --git a/sdk/utils/index.js b/sdk/utils/index.js
index 6b3dbb605a7f266e37dcf7203a9fade22fbf3ebe..6a63a4817d1b10aafdbf298b7e4c659837b268f6 100644
--- a/sdk/utils/index.js
+++ b/sdk/utils/index.js
@@ -115,11 +115,9 @@ export default {
     if (typeof result !== 'undefined') return result
     return msg.type !== 'revoke_msg' &&
       msg.action !== 'update-group-info-avatar_file' && 
+      msg.action !== 'set-group-member-ext-plugin-order-info' && 
       msg.type !== 'clear-conversation-unreadCount'
   },
-  filterMsgList(msgList) {
-    return msgList.filter(msg => this.isReadableMsg(msg))
-  },
   getMsgNote(_msg) {
     const msg = JSON.parse(JSON.stringify(_msg))
     const type = msg.type;
@@ -143,6 +141,9 @@ export default {
         "code": "[代码]",
         "rich-text": "[富文本消息]",
         "revoke_msg": "[消息已被撤回]",
+        "history": "[转发的聊天记录]",
+        "order": "[订单消息]",
+        "pay-notify": "[支付成功通知]",
       } [type] || `[${type}]`
         
       if (type == "system") {
@@ -158,32 +159,39 @@ export default {
           return getTextNode(nodesList)
           function getTextNode(nodesList) {
             let text = '';
-            nodesList.forEach(item => {
-              if (item.type == "text") {
-                text += item.text.replace(/(\r\n|\n|\r)/gm, "")
-              } else{
-                text += ({
-                  'image': '[图片]',
-                  'link': '[链接]',
-                })[item.type] || ''
-              }
-              if(item.name === 'img'){
-                text += ' [图片] '
-              }
-              if (item.attrs && item.attrs.class === 'nickname' && item.attrs.user_id) {
-                let userInfo = $state.users[item.attrs.user_id]
-                delete item.children
-                if(userInfo){
-                  text += ` @${userInfo.nickname} `
-                }else{
-                  text += '@[昵称加载中...]'
-                  $state.users.get(item.attrs.user_id)
+            try{
+              nodesList.forEach(item => {
+                if (item.type == "text") {
+                  text += item.text.replace(/(\r\n|\n|\r)/gm, "")
+                } else{
+                  text += ({
+                    'image': '[图片]',
+                    'link': '[链接]',
+                  })[item.type] || ''
+                }
+                if(item.name === 'img'){
+                  text += ' [图片] '
+                }
+                if (item.attrs && item.attrs.class === 'nickname' && item.attrs.user_id) {
+                  let userInfo = $state.users[item.attrs.user_id]
+                  delete item.children
+                  if(userInfo){
+                    text += ` @${userInfo.nickname} `
+                  }else if (item.attrs.user_id === "__ALL"){
+                    text += '[@所有人]'
+                  }
+                  else{
+                    text += "@" + $state.users.getNickname(item.attrs.user_id)
+                    
+                  }
                 }
-              }
-              if (Array.isArray(item.children)) {
-                text += getTextNode(item.children)
-              }
-            })
+                if (Array.isArray(item.children)) {
+                  text += getTextNode(item.children)
+                }
+              })
+            }catch(e){
+              console.error('getRichTextText error', e)
+            }
             // 替换换行为空格
             return text || '';
           }
@@ -212,7 +220,7 @@ export default {
   },
   getConversationId(id, type = 'single') { //single,group
     if (type == 'single') {
-      let current_uid = uniCloud.getCurrentUserInfo().uid
+      let current_uid = $state.currentUser._id
       if (!current_uid) {
         console.error('错误current_uid不能为空', current_uid);
       }
@@ -225,12 +233,22 @@ export default {
   async getTempFileURL(fileid) {
     // console.log('getTempFileURL', fileid)
     // 如果不是fileid就直接返回。
-    if (!fileid || fileid.indexOf('blob:') === 0 || fileid.indexOf('data:image/png;base64,') === 0 || fileid.substring(0, 8) != "cloud://") {
+    if (
+      !fileid || 
+      fileid.indexOf('blob:') === 0 || 
+      fileid.indexOf('data:image/png;base64,') === 0 || 
+      fileid.substring(0, 8) != "cloud://" &&
+      fileid.substring(0, 8) != "qiniu://"
+    ) {
       return fileid
     }
-    let res = await uniCloud.getTempFileURL({
-      fileList: [fileid]
-    })
-    return res.fileList[0].tempFileURL
+    try{
+      let res = await uniCloud.getTempFileURL({
+        fileList: [fileid]
+      })
+      return res.fileList[0].tempFileURL
+    }catch(e){
+      console.error('getTempFileURL error', e)
+    }
   }
 }
diff --git a/static/star.png b/static/star.png
new file mode 100644
index 0000000000000000000000000000000000000000..c716e8c9bbdc668420f126cd1b162521332fdd14
Binary files /dev/null and b/static/star.png differ
diff --git a/uniCloud/cloudfunctions/common/uni-im-ext/index.js b/uniCloud/cloudfunctions/common/uni-im-ext/index.js
index d9b81d2a8fe39d6a1eb79c16b7947f5c4f4d2346..8089415df52a06803f51ff0bd045a0086ff22da0 100644
--- a/uniCloud/cloudfunctions/common/uni-im-ext/index.js
+++ b/uniCloud/cloudfunctions/common/uni-im-ext/index.js
@@ -226,9 +226,21 @@ async function invokeExts(extensionPointName, ...args) {
 
   // 找到指定的扩展点并调用
   if (!registeredExtensionPoints[extensionPointName]) return []
+  const AsyncFunction = invokeExts.constructor
   return Promise.all(
     registeredExtensionPoints[extensionPointName]
-      .map(ext => ext.call(null, ...args))
+      .map(ext => {
+        if (ext instanceof AsyncFunction) {
+          return ext.call(null, ...args).catch(() => false)
+        } else {
+          try {
+            return ext.call(null, ...args)
+          } catch(e) {
+            console.error('扩展点抛出的异常',e)
+            return false
+          }
+        }
+      })
   )
 }
 
diff --git a/uniCloud/cloudfunctions/common/uni-im-utils/SymmetricEncryption.class.js b/uniCloud/cloudfunctions/common/uni-im-utils/SymmetricEncryption.class.js
new file mode 100644
index 0000000000000000000000000000000000000000..e7cefb7b6c31fecf03617aa6497f2094001f9054
--- /dev/null
+++ b/uniCloud/cloudfunctions/common/uni-im-utils/SymmetricEncryption.class.js
@@ -0,0 +1,51 @@
+const crypto = require('crypto');
+// 获取 uni-im 配置
+const createConfig = require("uni-config-center");
+const uniImConfig = createConfig({pluginId: 'uni-im'})
+/**
+ * 对称加密
+ * @param {String} password 密码
+ * @param {String} algorithm 算法
+ * @param {String} key 密钥
+ * @param {String} iv 向量
+ * @return {Object} encrypt 加密
+ * @return {
+   *  {String} encrypt(message) 加密
+   *  {String} decrypt(encryptedMessage) 解密
+   * }
+ */
+class SymmetricEncryption {
+    constructor(password) {
+        this.password = password || uniImConfig.config('aes_key');
+        if (!this.password) {
+          return // 未在 uni-im 插件管理后台配置 aes_key
+        }
+        this.algorithm = 'aes-256-cbc';
+        this.key = crypto.createHash('sha256').update(this.password).digest();
+        const fixedIV = crypto.createHash('md5').update(this.password).digest('hex');
+        this.iv = Buffer.from(fixedIV, 'utf8').slice(0, 16);
+    }
+    // 加密
+    encrypt(message) {
+        const cipher = crypto.createCipheriv(this.algorithm, this.key, this.iv);
+        let encrypted = cipher.update(message, 'utf8', 'hex');
+        encrypted += cipher.final('hex');
+        encrypted = "uni-im-encrypt:" + encrypted;
+        return  encrypted;
+    }
+    // 解密
+    decrypt(encryptedMessage) {
+        // 判断是否有前缀，有就去掉。没有则返回原字符串
+        if (encryptedMessage.indexOf("uni-im-encrypt:") === -1) {
+            return encryptedMessage;
+        }else{
+          encryptedMessage = encryptedMessage.slice(15);
+        }
+        // console.error('解密----encryptedMessage',encryptedMessage)
+        const decipher = crypto.createDecipheriv(this.algorithm, this.key, this.iv);
+        let decrypted = decipher.update(encryptedMessage, 'hex', 'utf8');
+        decrypted += decipher.final('utf8');
+        return decrypted;
+    }
+}
+module.exports = SymmetricEncryption;
\ No newline at end of file
diff --git a/uniCloud/cloudfunctions/common/uni-im-utils/index.js b/uniCloud/cloudfunctions/common/uni-im-utils/index.js
index c4a88155b8f44144169ef60536159f5193fedc23..3f4a99df2c6e88d2a19f01779158e791e82abbd2 100644
--- a/uniCloud/cloudfunctions/common/uni-im-utils/index.js
+++ b/uniCloud/cloudfunctions/common/uni-im-utils/index.js
@@ -1,8 +1,9 @@
+const crypto = require('crypto');
+const SymmetricEncryption = require('./SymmetricEncryption.class.js');
 const db = uniCloud.database()
 const dbCmd = db.command
 const $ = dbCmd.aggregate
-
-const md5 = require('./md5');
+const md5 = str => crypto.createHash('md5').update(str).digest('hex')
 
 function getConversationId({
   group_id,
@@ -16,6 +17,15 @@ function getConversationId({
   return 'single' + '_' + md5(arr.sort().toString())
 }
 
+function hideUsernameStr(username) {
+  if (username == undefined) {
+    return false
+  }
+  let length = username.length
+  let n = parseInt(length / 2.5) * 2
+  return username.substr(0, length - n) + '**' + username.substr(-1 * n / 2)
+}
+
 function hideEmailStr(email) {
   if (email == undefined) {
     return ''
@@ -25,6 +35,9 @@ function hideEmailStr(email) {
 }
 
 function hideMobileStr(mobile) {
+  if (mobile == undefined) {
+    return ''
+  }
   return mobile.substr(0, 3) + '****' + mobile.substr(-1 * 4)
 }
 
@@ -50,13 +63,19 @@ function checkParam(params, rule) {
   }
 }
 
+const SEN = new SymmetricEncryption()
+const encrypt = str => SEN.encrypt(str)
+const decrypt = str => SEN.decrypt(str)
 module.exports = {
   db,
   dbCmd,
   $,
   md5,
+  encrypt,
+  decrypt,
   getConversationId,
+  hideUsernameStr,
   hideEmailStr,
   hideMobileStr,
   checkParam
-}
+}
\ No newline at end of file
diff --git a/uniCloud/cloudfunctions/common/uni-im-utils/md5.js b/uniCloud/cloudfunctions/common/uni-im-utils/md5.js
deleted file mode 100644
index fd530e1ec8ad0e9fe3266c46d5cea085fe2889b3..0000000000000000000000000000000000000000
--- a/uniCloud/cloudfunctions/common/uni-im-utils/md5.js
+++ /dev/null
@@ -1,195 +0,0 @@
-function md5(sMessage) {
-	function RotateLeft(lValue, iShiftBits) {
-		return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
-	}
-
-	function AddUnsigned(lX, lY) {
-		var lX4, lY4, lX8, lY8, lResult;
-		lX8 = (lX & 0x80000000);
-		lY8 = (lY & 0x80000000);
-		lX4 = (lX & 0x40000000);
-		lY4 = (lY & 0x40000000);
-		lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);
-		if (lX4 & lY4) return (lResult ^ 0x80000000 ^ lX8 ^ lY8);
-		if (lX4 | lY4) {
-			if (lResult & 0x40000000) return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);
-			else return (lResult ^ 0x40000000 ^ lX8 ^ lY8);
-		} else return (lResult ^ lX8 ^ lY8);
-	}
-
-	function F(x, y, z) {
-		return (x & y) | ((~x) & z);
-	}
-
-	function G(x, y, z) {
-		return (x & z) | (y & (~z));
-	}
-
-	function H(x, y, z) {
-		return (x ^ y ^ z);
-	}
-
-	function I(x, y, z) {
-		return (y ^ (x | (~z)));
-	}
-
-	function FF(a, b, c, d, x, s, ac) {
-		a = AddUnsigned(a, AddUnsigned(AddUnsigned(F(b, c, d), x), ac));
-		return AddUnsigned(RotateLeft(a, s), b);
-	}
-
-	function GG(a, b, c, d, x, s, ac) {
-		a = AddUnsigned(a, AddUnsigned(AddUnsigned(G(b, c, d), x), ac));
-		return AddUnsigned(RotateLeft(a, s), b);
-	}
-
-	function HH(a, b, c, d, x, s, ac) {
-		a = AddUnsigned(a, AddUnsigned(AddUnsigned(H(b, c, d), x), ac));
-		return AddUnsigned(RotateLeft(a, s), b);
-	}
-
-	function II(a, b, c, d, x, s, ac) {
-		a = AddUnsigned(a, AddUnsigned(AddUnsigned(I(b, c, d), x), ac));
-		return AddUnsigned(RotateLeft(a, s), b);
-	}
-
-	function ConvertToWordArray(sMessage) {
-		var lWordCount;
-		var lMessageLength = sMessage.length;
-		var lNumberOfWords_temp1 = lMessageLength + 8;
-		var lNumberOfWords_temp2 = (lNumberOfWords_temp1 - (lNumberOfWords_temp1 % 64)) / 64;
-		var lNumberOfWords = (lNumberOfWords_temp2 + 1) * 16;
-		var lWordArray = Array(lNumberOfWords - 1);
-		var lBytePosition = 0;
-		var lByteCount = 0;
-		while (lByteCount < lMessageLength) {
-			lWordCount = (lByteCount - (lByteCount % 4)) / 4;
-			lBytePosition = (lByteCount % 4) * 8;
-			lWordArray[lWordCount] = (lWordArray[lWordCount] | (sMessage.charCodeAt(lByteCount) << lBytePosition));
-			lByteCount++;
-		}
-		lWordCount = (lByteCount - (lByteCount % 4)) / 4;
-		lBytePosition = (lByteCount % 4) * 8;
-		lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition);
-		lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
-		lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
-		return lWordArray;
-	}
-
-	function WordToHex(lValue) {
-		var WordToHexValue = "",
-			WordToHexValue_temp = "",
-			lByte, lCount;
-		for (lCount = 0; lCount <= 3; lCount++) {
-			lByte = (lValue >>> (lCount * 8)) & 255;
-			WordToHexValue_temp = "0" + lByte.toString(16);
-			WordToHexValue = WordToHexValue + WordToHexValue_temp.substr(WordToHexValue_temp.length - 2, 2);
-		}
-		return WordToHexValue;
-	}
-	var x = Array();
-	var k, AA, BB, CC, DD, a, b, c, d
-	var S11 = 7,
-		S12 = 12,
-		S13 = 17,
-		S14 = 22;
-	var S21 = 5,
-		S22 = 9,
-		S23 = 14,
-		S24 = 20;
-	var S31 = 4,
-		S32 = 11,
-		S33 = 16,
-		S34 = 23;
-	var S41 = 6,
-		S42 = 10,
-		S43 = 15,
-		S44 = 21;
-	x = ConvertToWordArray(sMessage);
-	a = 0x67452301;
-	b = 0xEFCDAB89;
-	c = 0x98BADCFE;
-	d = 0x10325476;
-	for (k = 0; k < x.length; k += 16) {
-		AA = a;
-		BB = b;
-		CC = c;
-		DD = d;
-		a = FF(a, b, c, d, x[k + 0], S11, 0xD76AA478);
-		d = FF(d, a, b, c, x[k + 1], S12, 0xE8C7B756);
-		c = FF(c, d, a, b, x[k + 2], S13, 0x242070DB);
-		b = FF(b, c, d, a, x[k + 3], S14, 0xC1BDCEEE);
-		a = FF(a, b, c, d, x[k + 4], S11, 0xF57C0FAF);
-		d = FF(d, a, b, c, x[k + 5], S12, 0x4787C62A);
-		c = FF(c, d, a, b, x[k + 6], S13, 0xA8304613);
-		b = FF(b, c, d, a, x[k + 7], S14, 0xFD469501);
-		a = FF(a, b, c, d, x[k + 8], S11, 0x698098D8);
-		d = FF(d, a, b, c, x[k + 9], S12, 0x8B44F7AF);
-		c = FF(c, d, a, b, x[k + 10], S13, 0xFFFF5BB1);
-		b = FF(b, c, d, a, x[k + 11], S14, 0x895CD7BE);
-		a = FF(a, b, c, d, x[k + 12], S11, 0x6B901122);
-		d = FF(d, a, b, c, x[k + 13], S12, 0xFD987193);
-		c = FF(c, d, a, b, x[k + 14], S13, 0xA679438E);
-		b = FF(b, c, d, a, x[k + 15], S14, 0x49B40821);
-
-		a = GG(a, b, c, d, x[k + 1], S21, 0xF61E2562);
-		d = GG(d, a, b, c, x[k + 6], S22, 0xC040B340);
-		c = GG(c, d, a, b, x[k + 11], S23, 0x265E5A51);
-		b = GG(b, c, d, a, x[k + 0], S24, 0xE9B6C7AA);
-		a = GG(a, b, c, d, x[k + 5], S21, 0xD62F105D);
-		d = GG(d, a, b, c, x[k + 10], S22, 0x2441453);
-		c = GG(c, d, a, b, x[k + 15], S23, 0xD8A1E681);
-		b = GG(b, c, d, a, x[k + 4], S24, 0xE7D3FBC8);
-		a = GG(a, b, c, d, x[k + 9], S21, 0x21E1CDE6);
-		d = GG(d, a, b, c, x[k + 14], S22, 0xC33707D6);
-		c = GG(c, d, a, b, x[k + 3], S23, 0xF4D50D87);
-		b = GG(b, c, d, a, x[k + 8], S24, 0x455A14ED);
-		a = GG(a, b, c, d, x[k + 13], S21, 0xA9E3E905);
-		d = GG(d, a, b, c, x[k + 2], S22, 0xFCEFA3F8);
-		c = GG(c, d, a, b, x[k + 7], S23, 0x676F02D9);
-		b = GG(b, c, d, a, x[k + 12], S24, 0x8D2A4C8A);
-
-		a = HH(a, b, c, d, x[k + 5], S31, 0xFFFA3942);
-		d = HH(d, a, b, c, x[k + 8], S32, 0x8771F681);
-		c = HH(c, d, a, b, x[k + 11], S33, 0x6D9D6122);
-		b = HH(b, c, d, a, x[k + 14], S34, 0xFDE5380C);
-		a = HH(a, b, c, d, x[k + 1], S31, 0xA4BEEA44);
-		d = HH(d, a, b, c, x[k + 4], S32, 0x4BDECFA9);
-		c = HH(c, d, a, b, x[k + 7], S33, 0xF6BB4B60);
-		b = HH(b, c, d, a, x[k + 10], S34, 0xBEBFBC70);
-		a = HH(a, b, c, d, x[k + 13], S31, 0x289B7EC6);
-		d = HH(d, a, b, c, x[k + 0], S32, 0xEAA127FA);
-		c = HH(c, d, a, b, x[k + 3], S33, 0xD4EF3085);
-		b = HH(b, c, d, a, x[k + 6], S34, 0x4881D05);
-		a = HH(a, b, c, d, x[k + 9], S31, 0xD9D4D039);
-		d = HH(d, a, b, c, x[k + 12], S32, 0xE6DB99E5);
-		c = HH(c, d, a, b, x[k + 15], S33, 0x1FA27CF8);
-		b = HH(b, c, d, a, x[k + 2], S34, 0xC4AC5665);
-
-		a = II(a, b, c, d, x[k + 0], S41, 0xF4292244);
-		d = II(d, a, b, c, x[k + 7], S42, 0x432AFF97);
-		c = II(c, d, a, b, x[k + 14], S43, 0xAB9423A7);
-		b = II(b, c, d, a, x[k + 5], S44, 0xFC93A039);
-		a = II(a, b, c, d, x[k + 12], S41, 0x655B59C3);
-		d = II(d, a, b, c, x[k + 3], S42, 0x8F0CCC92);
-		c = II(c, d, a, b, x[k + 10], S43, 0xFFEFF47D);
-		b = II(b, c, d, a, x[k + 1], S44, 0x85845DD1);
-		a = II(a, b, c, d, x[k + 8], S41, 0x6FA87E4F);
-		d = II(d, a, b, c, x[k + 15], S42, 0xFE2CE6E0);
-		c = II(c, d, a, b, x[k + 6], S43, 0xA3014314);
-		b = II(b, c, d, a, x[k + 13], S44, 0x4E0811A1);
-		a = II(a, b, c, d, x[k + 4], S41, 0xF7537E82);
-		d = II(d, a, b, c, x[k + 11], S42, 0xBD3AF235);
-		c = II(c, d, a, b, x[k + 2], S43, 0x2AD7D2BB);
-		b = II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
-
-		a = AddUnsigned(a, AA);
-		b = AddUnsigned(b, BB);
-		c = AddUnsigned(c, CC);
-		d = AddUnsigned(d, DD);
-	}
-	var temp = WordToHex(a) + WordToHex(b) + WordToHex(c) + WordToHex(d);
-	return temp.toLowerCase();
-}
-
-module.exports = md5
diff --git a/uniCloud/cloudfunctions/common/uni-im-utils/package-lock.json b/uniCloud/cloudfunctions/common/uni-im-utils/package-lock.json
deleted file mode 100644
index 715d2001c1ccc9410db006043d5b3b4d8ee7423d..0000000000000000000000000000000000000000
--- a/uniCloud/cloudfunctions/common/uni-im-utils/package-lock.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"name": "uni-im-utils",
-	"version": "1.0.0",
-	"lockfileVersion": 2,
-	"requires": true,
-	"packages": {
-		"": {
-			"name": "uni-im-utils",
-			"version": "1.0.0",
-			"license": "ISC"
-		}
-	}
-}
diff --git a/uniCloud/cloudfunctions/common/uni-im-utils/package.json b/uniCloud/cloudfunctions/common/uni-im-utils/package.json
index 35797bd4d0fcebedbc49b7b8fd0077ffc76b9ec1..b1d61819bc00b97c0dac9da31ca3f4a42ecea141 100644
--- a/uniCloud/cloudfunctions/common/uni-im-utils/package.json
+++ b/uniCloud/cloudfunctions/common/uni-im-utils/package.json
@@ -1,13 +1,15 @@
 {
-	"name": "uni-im-utils",
-	"version": "1.0.0",
-	"description": "",
-	"main": "index.js",
-	"scripts": {
-		"test": "echo \"Error: no test specified\" && exit 1"
-	},
-	"keywords": [],
-	"author": "",
-	"license": "ISC",
-	"dependencies": {}
-}
+  "name": "uni-im-utils",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
+  }
+}
\ No newline at end of file
diff --git a/uniCloud/cloudfunctions/uni-im-co/conversation.js b/uniCloud/cloudfunctions/uni-im-co/conversation.js
index fe6c612fc351de3540b3c232e13d2f90c89d9458..b8c37752cb6b7b283b54e82886aee265720621c3 100644
--- a/uniCloud/cloudfunctions/uni-im-co/conversation.js
+++ b/uniCloud/cloudfunctions/uni-im-co/conversation.js
@@ -7,50 +7,119 @@ const {
 // 获取会话列表
 async function getConversationList({
   // 会话条数
-  limit = 500,
+  limit = 15,
+  // 跳过的会话条数，主要用于跳过会话更新时间相等的会话
+  skip = 0,
+  // 最大的会话的最后一条消息的创建时间
+  maxLastMsgCreateTime = false,
   // 最大的会话更新时间
   maxUpdateTime = false,
   // 最小的会话更新时间
   minUpdateTime = false,
   // 不为false则表示获取指定的会话
   conversation_id = false,
+  // 是否要区分是否为置顶
+  distinguishPinned = false,
   sort = {
-    update_time: -1
-  }
+    pinned: -1,
+    last_msg_create_time: -1,
+    _id: -1
+  },
+  type = false
 }) {
   
   let matchObj = {
     // 限制只能查询当前用户自己的会话记录
     user_id: this.current_uid,
     // group_id: dbCmd.exists(false), //是否查询群聊会话
+    // unread_count: dbCmd.gt(0)
+  }
+  if(type){
+    const action = {
+      unread: () => {
+        matchObj.unread_count = dbCmd.gt(0)
+      },
+      group: () => {
+        matchObj.group_id = dbCmd.exists(true)
+      },
+      single: () => {
+        matchObj.friend_uid = dbCmd.exists(true)
+      },
+      todo: () => {
+        matchObj.is_todo = dbCmd.exists(true)
+      },
+      is_star: () => {
+        matchObj.is_star = dbCmd.exists(true)
+      }
+    }
+    if(typeof type === 'object'){
+      if(Object.keys(type)[0] === 'group_type'){
+        matchObj.group_type = type.group_type
+      }
+    }else{
+      action[type]?.()
+    }
+    
+    // console.error('action========',type,'group_type:'+matchObj?.group_type);
   }
+  
+  // 如果指定了会话id，则只查询指定的会话
   if (conversation_id) {
     matchObj.id = conversation_id
   } else {
+    // 默认不查询置顶会话
+    if (distinguishPinned) {
+      matchObj.pinned = dbCmd.neq(true)
+    }
+    matchObj.leave = dbCmd.neq(true)
+    matchObj.hidden = dbCmd.neq(true)
+    
     if (maxUpdateTime) {
-      matchObj.update_time = dbCmd.lt(maxUpdateTime)
+      sort = {
+        pinned: -1,
+        update_time: -1,
+        _id: -1
+      }
+      if(skip){
+        matchObj.update_time = dbCmd.lte(maxUpdateTime)
+      }else{
+        matchObj.update_time = dbCmd.lt(maxUpdateTime)
+      }
     } else if (minUpdateTime) {
+      sort = {
+        pinned: -1,
+        update_time: -1,
+        _id: -1
+      }
       matchObj.update_time = dbCmd.gt(minUpdateTime)
+    } else if (maxLastMsgCreateTime) {
+      if(skip){
+        matchObj.last_msg_create_time = dbCmd.lte(maxLastMsgCreateTime)
+      }else{
+        matchObj.last_msg_create_time = dbCmd.lt(maxLastMsgCreateTime)
+      }
+    } else{
+      if (distinguishPinned) {
+        // 没有指定时间范围时(应用刚启动时第一次加载)，把所有置顶会话都查出来
+        matchObj = dbCmd.or([
+          {
+            ...matchObj,
+            pinned: true
+          },
+          matchObj
+        ])
+      }
     }
-    matchObj.leave = dbCmd.neq(true)
-    matchObj.hidden = dbCmd.neq(true)
-    // TODO：临时方案解决，因历史问题，造成的last_msg_note为空的问题
-    // matchObj = dbCmd.or({
-    //   ...matchObj,
-    //   last_msg_note: dbCmd.neq(null)
-    // }, {
-    //   ...matchObj,
-    //   unread_count: dbCmd.neq(0)
-    // }, )
   }
   
-  // console.error('getConversationList matchObj', matchObj,'limit：'+limit)
+  console.log('getConversationList matchObj', matchObj,sort,'limit：'+limit,'skip：'+skip);
   
   // 计算请求时间
   let startTime = Date.now()
   let res = await db.collection('uni-im-conversation').aggregate()
     .match(matchObj)
     .sort(sort)
+    .skip(skip)
     .limit(limit)
     // 联查获得最新的对话记录
     .lookup({
@@ -61,42 +130,13 @@ async function getConversationList({
       pipeline: $.pipeline()
         .match(dbCmd.expr($.eq(['$conversation_id', '$$id'])))
         .sort({update_time: -1})
-        .limit(1)
+        .limit(10)
         .project({
-          _id: 1,
-          type: 1,
-          body: 1,
-          to_uid: 1,
-          is_read: 1,
-          is_revoke: 1,
-          from_uid: 1,
-          create_time: 1,
-          update_time: 1,
-          conversation_id: 1,
-          action: 1
+          __text: 0,
         })
         .done(),
-      as: 'visible_msgs'
+      as: 'msgList'
     })
-    // 联查获得对话的用户信息
-    // .lookup({
-    // 	from: "uni-id-users",
-    // 	let: {
-    // 		friend_uid: '$friend_uid'
-    // 	},
-    // 	pipeline: $.pipeline()
-    // 		.match(
-    // 			dbCmd.expr($.eq(['$_id', '$$friend_uid']))
-    // 		)
-    // 		.limit(1)
-    // 		.project({
-    // 			_id: 1,
-    // 			avatar_file: 1,
-    // 			nickname: 1
-    // 		})
-    // 		.done(),
-    // 	as: 'user_info'
-    // })
     // 联查获得对话的群信息
     .lookup({
       from: "uni-im-group",
@@ -115,7 +155,13 @@ async function getConversationList({
           avatar_file: 1,
           join_option: 1,
           mute_all_members: 1,
-          type: 1
+          member_count: 1,
+          type: 1,
+          notification: 1,
+          create_time: 1,
+          update_time: 1,
+          last_update_time: 1,
+          ext: 1
         })
         .done(),
       as: 'group_info'
@@ -160,7 +206,8 @@ async function getConversationList({
   startTime = Date.now()
   let usersInfoRes = await dbJQL.collection('uni-id-users')
     .where(`_id in ${JSON.stringify(friend_uids)}`)
-    .field('_id,avatar_file,nickname')
+    .field('_id,avatar_file,nickname,realname_auth')
+    .limit(friend_uids.length)
     .get()
   // log请求时间
   // console.error('get user耗时', Date.now() - startTime,startTime)
@@ -176,17 +223,14 @@ async function getConversationList({
   res.data.forEach(item => {
     item.user_info = usersInfoObj[item.friend_uid]
     item.group_info = item.group_info[0]
-
     // 处理特殊情况
-    item.last_visible_msg = item.visible_msgs[0];
-    delete item.visible_msgs;
-    // console.error('item.last_visible_msg',item.last_visible_msg);
-    if (item.last_visible_msg) {
-      if (item.last_visible_msg.is_revoke) {
-        item.last_visible_msg.body = "消息已经被撤回"
+    item.msgList.map(msg => {
+      if(msg.is_revoke){
+        msg.body = '消息已经被撤回'
       }
-    }
+    })
   })
+  
   // log请求时间
   // console.error('forEach user_info耗时', Date.now() - startTime,startTime)
   return {
diff --git a/uniCloud/cloudfunctions/uni-im-co/group.js b/uniCloud/cloudfunctions/uni-im-co/group.js
index 5fab1dc52bf76e628924f1b398ac21cef191581a..43b9916374944ff2641a9307fdc6f12dd6a58b0b 100644
--- a/uniCloud/cloudfunctions/uni-im-co/group.js
+++ b/uniCloud/cloudfunctions/uni-im-co/group.js
@@ -8,8 +8,13 @@ async function chooseUserIntoGroup(params) {
     group_id = false,
     groupInfo = {},
     user_ids = [],
-    admin_uids = []
+    admin_uids = [],
+    // 是否静默加群，会话未读数不显示1
+    is_mute = false,
+    welcome_message
   } = params
+  
+  console.error('is_mute', is_mute);
 
   // 校验参数是否合法
   checkParam(params, {
@@ -19,10 +24,12 @@ async function chooseUserIntoGroup(params) {
       groupInfo: ["Object"],
       user_ids: ["Array"],
       admin_uids: ["Array"],
+      is_mute: ["Boolean"],
+      welcome_message: ["Object"]
     }
   })
 
-  if (user_ids.length > 499) {
+  if ( (user_ids.length + admin_uids.length)  > 499) {
     return {
       errSubject: 'uni-im',
       errCode: 2000,
@@ -63,31 +70,48 @@ async function chooseUserIntoGroup(params) {
 
   // 存在群 id是拉用户进群，否则是创建新的群并拉新用户进群
   if (!group_id) {
+    
+    // todo：为兼容旧版本。这里先去除再插入创建者id到头部
+    // 如果 admin_uids 中有创建者，移除
+    if (admin_uids.includes(this.current_uid)) {
+      admin_uids = admin_uids.filter(uid => uid !== this.current_uid)
+    }
+    // 如果 user_ids 中有创建者，移除
+    if (user_ids.includes(this.current_uid)) {
+      user_ids = user_ids.filter(uid => uid !== this.current_uid)
+    }
+    
     // 创建群时，需要把创建者（群主）也拉进群
-    user_ids.unshift(this.current_uid)
+    admin_uids.unshift(this.current_uid)
 
     // 调用扩展点 before-create-group，允许扩展程序添加群成员
     const { invokeExts } = require('uni-im-ext')
-    await invokeExts('before-create-group', user_ids, this)
+    await invokeExts('before-create-group', admin_uids, this)
   }
-
+  
+  const newMemberCount = user_ids.length + admin_uids.length
+  
+  // 验证用户是否存在
   const dbJQL = uniCloud.databaseForJQL({
     clientInfo: this.clientInfo
   })
-
   let {
     data: userList
   } = await dbJQL.collection('uni-id-users')
-    .where(`"_id" in ${JSON.stringify(user_ids)}`)
+    .where(`"_id" in ${JSON.stringify([...admin_uids,...user_ids])}`)
     .field('_id,nickname,avatar_file')
     .limit(500)
     .get()
 
-  if (userList.length != user_ids.length) {
-    return {
+  if (userList.length != (admin_uids.length + user_ids.length) ) {
+    console.log('userList.length',userList.length);
+    console.log('admin_uids.length',admin_uids.length,admin_uids);
+    console.log('user_ids.length',user_ids.length,user_ids);
+    console.log('this.current_uid',this.current_uid);
+    throw {
       errSubject: 'uni-im:chooseUserIntoGroup',
       errCode: 2000,
-      errMsg: "参数user_ids错误，用户不存在"
+      errMsg: "参数user_ids或admin_uids错误，用户不存在"
     }
   }
 
@@ -103,7 +127,7 @@ async function chooseUserIntoGroup(params) {
     if(groupInfo.user_id === undefined){
       groupInfo.user_id = this.current_uid
     }else if(this.clientInfo.source != "function" && groupInfo.user_id != this.current_uid){
-      throw new Error('触发器限制，user_id的值必须为当前操作者')
+      throw new Error('非系统内部调用，群主（groupInfo.user_id）的值必须为当前操作者')
     }
     
     dbJQL.setUser({
@@ -111,31 +135,62 @@ async function chooseUserIntoGroup(params) {
       role: ['admin'],
       permission: []
     })
+    groupInfo.member_count = newMemberCount
     let res = await dbJQL.collection('uni-im-group').add(groupInfo)
     group_id = res.id
+    
+    // 把欢迎信息插到uni-im-msg中
+    if(welcome_message){
+      await db.collection('uni-im-msg').add({
+        ...welcome_message,
+        create_time: Date.now(),
+        conversation_id: 'group_' + group_id
+      })
+    }
   } else {
     let res = await db.collection('uni-im-group').doc(group_id).get()
+    const source = this.getClientInfo().source
     if (!res.data[0]) {
       throw new Error('群id不存在')
-    } else if (admin_uids.length > 0 && res.data[0].user_id != this.current_uid) {
+    } else if (
+      admin_uids.length > 0 && 
+      // 群创建者 或 通过云函数中间件调用，才能传递参数admin_uids
+      source != 'function' &&
+      res.data[0].user_id != this.current_uid
+    ) {
       throw new Error("非群创建者，不可传递参数参数admin_uids")
     }
   }
+  
+  // TODO：由于支付宝云版uniCloud，唯一索引插入数据并不会抛出异常，所以这里要先查询是否已经在群里
+  let hasInGroup = await db.collection('uni-im-group-member')
+    .where({
+      group_id,
+      user_id: db.command.in([...admin_uids, ...user_ids])
+    })
+    .get()
+  if (hasInGroup.data.length > 0) {
+    let hasInGroupUserIds = hasInGroup.data.map(item => item.user_id)
+    throw {
+      errSubject: 'uni-im',
+      errCode: 2000,
+      errMsg: '用户' + hasInGroupUserIds.join(',') + '已经在群里'
+    }
+  }
 
   const now_timestamp = Date.now()
   // 1. 设为群成员
-  let that = this;
   let groupMemberList = []
-  groupMemberList.push(...createMemberList(user_ids, false))
-  groupMemberList.push(...createMemberList(admin_uids, ['admin']))
+  groupMemberList.push(...createMemberList.call(this,admin_uids, ['admin']))
+  groupMemberList.push(...createMemberList.call(this,user_ids))
 
-  function createMemberList(userIdList, role = false) {
+  function createMemberList(userIdList, role = []) {
     return userIdList.map(user_id => {
       return {
         group_id,
         user_id,
-        // 设置群创建者角色
-        role: role || (user_id === that.current_uid ? ['creator', 'admin'] : []),
+        // 设置群成员角色：创建者为群主，其他看传入的角色
+        role: user_id === this.current_uid ? ['creator', 'admin'] : role,
         create_time: now_timestamp
       }
     })
@@ -144,12 +199,14 @@ async function chooseUserIntoGroup(params) {
   let res;
   try {
     res = await db.collection('uni-im-group-member').add(groupMemberList)
-    // 补充群成员id
+    // 补充群成员id，方便客户端收到消息后，可直接更新本地的群成员列表
     groupMemberList.forEach((item,index) => {
       item._id = res.ids[index]
     })
     console.log('uni-im-group-member-  res', res);
   } catch (error) {
+    console.error('error.message', error.message);
+    // 靠数据库的唯一索引，避免重复加群
     if (error.message.includes("index: user_id_group_id dup")) {
       throw new Error('用户已经在群里')
     } else {
@@ -157,6 +214,20 @@ async function chooseUserIntoGroup(params) {
     }
   }
   // console.log('uni-im-group-member-  res', res);
+  
+  
+  if(params.group_id){
+    // 如果入参有group_id，表示是拉人进群，不是创建群
+    // 给群成员总数字段+n
+    await db.collection('uni-im-group')
+      .where({
+        _id: group_id
+      })
+      .update({
+        member_count: db.command.inc(newMemberCount)
+      })
+  }
+  
 
   // 2.给新群成员加上会话表
   let conversationList = groupMemberList.map(({ user_id }) => {
@@ -165,9 +236,15 @@ async function chooseUserIntoGroup(params) {
       id: 'group_' + group_id,
       user_id: user_id,
       type: 2,
-      unread_count: 0,
       create_time: now_timestamp,
-      update_time: now_timestamp
+      update_time: now_timestamp,
+      last_msg_create_time: now_timestamp,
+      pinned: false,
+      hidden: false,
+      mute: false,
+      has_unread_group_notification: null,
+      unread_count: is_mute ? 0 : 1,
+      group_type: groupInfo.type
     }
   })
   res = await db.collection('uni-im-conversation').add(conversationList)
@@ -176,7 +253,8 @@ async function chooseUserIntoGroup(params) {
   const msgData = {
     body: {
       user_id_list: groupMemberList.map(item => item.user_id),
-      new_member_list: groupMemberList
+      new_member_list: groupMemberList,
+      group_type: groupInfo.type,
     },
     action: "join-group",
     type: "system",
@@ -197,6 +275,7 @@ async function chooseUserIntoGroup(params) {
     })
     .update({
       update_time: msgData.create_time,
+      last_msg_create_time: msgData.create_time,
       last_msg_note: "新用户加群通知"
     })
 
diff --git a/uniCloud/cloudfunctions/uni-im-co/index.obj.js b/uniCloud/cloudfunctions/uni-im-co/index.obj.js
index b94bfc2f37a1d60be96ad419bac15bc2a580829b..074217fa0eb71cabf9353013ff9d208b967ae2ea 100644
--- a/uniCloud/cloudfunctions/uni-im-co/index.obj.js
+++ b/uniCloud/cloudfunctions/uni-im-co/index.obj.js
@@ -39,6 +39,17 @@ module.exports = {
           // 如果token校验出错，则抛出错误
           throw res
         }
+        
+        // 用于临时禁用IM的用户，临时方案用于突发情况。当用户二次登录时，role会自动带disable_im
+        const tmpBlackUid = []
+        if (res.role.includes('disable_im') || tmpBlackUid.includes(res.uid)) {
+          // 如果用户被禁用IM，则抛出错误
+          throw {
+            errSubject: 'uni-im-co',
+            errCode: 'USER_DISABLED_IM',
+            errMsg: '你的账号，已被禁止使用uni-im'
+          }
+        }
 
         // token 有效，取出 id 和角色
         this.current_uid = res.uid
@@ -61,15 +72,21 @@ module.exports = {
     // console.error('请求完成时间', Date.now() - this.requestStartTime, 'ms')
     
     if (error) {
-      // console.log({
-      // 	error,
-      // 	result
-      // });
+      console.error( '云对象_after发现错误' + error.message,JSON.stringify({error,result}) );
+      console.error({
+        "getMethodName":this.getMethodName(),
+        "getParams":this.getParams(),
+        "getClientInfo":this.getClientInfo()
+      });
       if (error.errCode && error.errMsg) {
         // 符合响应体规范的错误，直接返回
         return error
       } else {
-        throw error // 直接抛出异常
+        return {
+          errSubject: "uni-im-co",
+          errCode: "unicloud throw error",
+          errMsg: error.message
+        }
       }
     }
 
diff --git a/uniCloud/cloudfunctions/uni-im-co/msg.js b/uniCloud/cloudfunctions/uni-im-co/msg.js
index ba5c383d8bfe7794315b7bf86140e0e83414452b..678a3d36fa8ff606d76d5a2f9c0f353c66524de6 100644
--- a/uniCloud/cloudfunctions/uni-im-co/msg.js
+++ b/uniCloud/cloudfunctions/uni-im-co/msg.js
@@ -11,21 +11,30 @@ const dbUniImConversation = db.collection('uni-im-conversation')
 const dbUniImGroupMember = db.collection('uni-im-group-member')
 const dbUniImFriend = db.collection('uni-im-friend')
 
-// 获取uni-im配置
+// 获取 uni-im 配置
 const createConfig = require("uni-config-center");
 const uniImConfig = createConfig({
-  pluginId: 'uni-im', // 插件id
+  pluginId: 'uni-im', // 插件 id
 })
 const conversation_grade = uniImConfig.config('conversation_grade')
-
+const { invokeExts } = require('uni-im-ext')
 // 发送消息方法（含：单聊和群聊）
 async function sendMsg(params) {
+  
+  // 执行扩展点 beforeSendMsg
+  let [beforeSendMsgRes] = await invokeExts('before-send-msg', params, this)
+  // console.error('beforeSendMsgRes:', beforeSendMsgRes)
+  if (beforeSendMsgRes === false) {
+    throw new Error('扩展点 beforeSendMsgRes 出错')
+  }
+
+
   await _beforeSendMsgActions.call(this, params)
 
   let {
-    // 指定接收消息的用户id
+    // 指定接收消息的用户 id
     to_uid,
-    // 指定接收消息的群id
+    // 指定接收消息的群 id
     group_id,
     // 消息内容
     body,
@@ -33,17 +42,17 @@ async function sendMsg(params) {
     type,
     // 是否为失败 重试
     isRetries,
-    // 接收消息的客户端的DCloud appid
+    // 接收消息的客户端的 DCloud appid
     appId,
-    // 回复关联的消息的id
+    // 回复关联的消息的 id
     about_msg_id,
     call_uid,
     action,
     // 是否为静默消息
     is_mute
   } = params
-  
-  // 清除旧版三方系统客户端直传的call_uid参数
+
+  // 清除旧版三方系统客户端直传的 call_uid 参数
   call_uid = []
 
   // 校验参数是否合法
@@ -63,35 +72,34 @@ async function sendMsg(params) {
     }
   })
 
-  // 存在action时，如果不是其他云函数或者触发器调用时，且调用者也不是系统时，拦截非法操作。
+  // 存在 action 时，如果不是其他云函数或者触发器调用时，且调用者也不是系统时，拦截非法操作。
   if (action && this.getClientInfo().source != 'function' && this.current_uid != 'system') {
     throw new Error('非法操作')
   }
 
   // 调用扩展点 valid-msg
-  const { invokeExts } = require('uni-im-ext')
   let result = await invokeExts('validate-msg', params, this)
   let isValid = result.find(valid => typeof valid !== 'undefined')
-  
-  if(!isValid && is_mute !== undefined && this.current_uid !== 'system'){
+
+  if (!isValid && is_mute !== undefined && this.current_uid !== 'system') {
     throw new Error('非法操作')
   }
 
   // 补充特殊校验
   if (!to_uid && !group_id) {
-    throw new Error('接收消息的用户id和群id最少指定一个') // alert：否则表示将消息群发
+    throw new Error('接收消息的用户 id 和群 id 最少指定一个') // alert：否则表示将消息群发
   }
 
-  // 其他云函数或者触发器调用时，消息类型才能用system
+  // 其他云函数或者触发器调用时，消息类型才能用 system
   if (this.getClientInfo().source != 'function' && type == 'system') {
     throw new Error('非法消息类型')
   }
 
   if (type == 'text' && typeof body != 'string') {
-    throw new Error('错误：type为text类型，但body的类型确不是string')
+    throw new Error('错误：type 为 text 类型，但 body 的类型确不是 string')
   }
 
-  //发送者身份id
+  // 发送者身份 id
   const from_uid = this.current_uid
 
   await _checkConversationGrade.call(this, {
@@ -118,8 +126,19 @@ async function sendMsg(params) {
     }
   }
 
-  // 生成会话id
-  const conversation_id = getConversationId({ group_id, from_uid, to_uid })
+  let nickname = "系统消息",avatar_file = "";
+  if (from_uid && from_uid != 'system') {
+    const { data: [userInfo] } = await db.collection('uni-id-users').doc(from_uid).get()
+    if (userInfo) {
+      nickname = userInfo.nickname
+      avatar_file = userInfo.avatar_file
+    } else {
+      console.error('用户信息不存在',from_uid);
+    }
+  }
+
+  // 生成会话 id
+  const conversation_id = getConversationId({group_id,from_uid,to_uid})
   // 现在的时间戳
   const nowTimestamp = Date.now()
   // 构建基本消息内容
@@ -127,29 +146,33 @@ async function sendMsg(params) {
     body,
     type,
     from_uid,
+    // 消息发送者昵称
+    nickname,
+    // 消息发送者头像文件
+    avatar_file,
     to_uid,
-    //是否已读，默认为：false
+    // 是否已读，默认为：false
     is_read: false,
-    //创建时间
+    // 创建时间
     create_time: nowTimestamp,
     // 更新时间，默认为创建时间
     update_time: nowTimestamp,
     conversation_id,
     group_id,
-    appid: appId, //接收消息的appid（撤回消息时会用到）
+    appid: appId, // 接收消息的 appid（撤回消息时会用到）
     about_msg_id,
     call_uid, // @某些人
     action,
     reader_list: [], // 已读消息的用户列表
     is_mute // 是否为静默消息
   }
-  
+
 
   if (type === 'rich-text') {
     let callUid = []
     for (let node of msgData.body) {
       if (node.name == 'span' && node.attrs && node.attrs.class == 'nickname' && node.attrs.user_id) {
-        // 保护用户昵称，移除。客户端将通过node.attrs.user_id，获取用户昵称
+        // 保护用户昵称，移除。客户端将通过 node.attrs.user_id，获取用户昵称
         delete node.children
         callUid.push(node.attrs.user_id)
       }
@@ -157,11 +180,14 @@ async function sendMsg(params) {
     if (callUid.length) {
       msgData.call_uid = callUid
     }
+  } else if (type === 'order') {
+    // 发送订单消息时，需要 call 此订单的用户
+    msgData.call_uid = msgData.body.user_id || []
   }
 
   // 创建新会话或者更新已有会话。
-  // 拿到消息接收者的isMute状态（仅私聊有效）
-  let {isMute} = await _createOrUpdateConversation.call(this,conversation_id, msgData,params.chat_source)
+  // 拿到消息接收者的 isMute 状态（仅私聊有效）
+  let {isMute} = await _createOrUpdateConversation.call(this, conversation_id, msgData, params.chat_source)
   // console.log({
   // 	...msgData,
   // 	conversation_id
@@ -175,8 +201,18 @@ async function sendMsg(params) {
     noPersistent = msgType.noPersistent(msgData)
   }
 
+  // todo:临时增加私有代码逻辑，后续会迁移到扩展模块中
+  if (type === 'system' && action === 'set-group-member-ext-plugin-order-info') {
+    // 群成员设置插件排序信息，不需要保存至数据库
+    noPersistent = true
+  }
+
+  // 如果是无需保存至数据库的消息，因缺失 _id ，将影响客户端对该消息接收状态的判断，所以这里需要创建临时 _id
+  if (noPersistent) {
+    msgData._id = 'temp_' + Math.random().toString(36).substr(2) + Date.now()
+  }
   // 将消息内容存到数据库，“点击重发按钮的”和“不需要保存的扩展消息”除外
-  if (!isRetries && !noPersistent) {
+  else if (!isRetries || !msgData._id) {
     const __text = _extractTextFromMsg(msgData)
     if (__text) {
       msgData.__text = __text
@@ -187,29 +223,28 @@ async function sendMsg(params) {
       ...msgData,
       conversation_id
     })
-    
+
     msgData._id = res.id
     // console.error('uni-im-msg msgData:',msgData, res);
 
     // 调用扩展点 send-msg
-    const { invokeExts } = require('uni-im-ext')
     // 这里需要 clone，因为是异步调用，而下面的代码马上就要修改 msgData
     let { ...clonedMsg } = msgData
     this.addPromise(invokeExts('send-msg', clonedMsg, this))
-    
-    // 客户端不需要返回__text字段
+
+    // 客户端不需要返回__text 字段
     delete msgData.__text
   } else {
-    // console.error('跳过添加 msg到数据库！～～～～～～～～～')
+    // console.error('跳过添加 msg 到数据库！～～～～～～～～～')
   }
-  
-  // 不可见的消息一定是 isMute
-  if(!_isReadableMsg(msgData)){
+
+  // 不可见/静音消息一定是 isMute
+  if (!_isReadableMsg(msgData) || msgData.is_mute) {
     isMute = true
   }
 
   // 处理产生的推送
-  let res = await _processPush.call(this, { msgData, isMute, appId })
+  let res = await _processPush.call(this, {msgData,isMute,appId})
 
   if (!res.data) {
     res.data = {}
@@ -217,7 +252,7 @@ async function sendMsg(params) {
 
   // 返回云端消息记录创建的时间
   res.data.create_time = msgData.create_time
-  // 返回云端消息记录的id
+  // 返回云端消息记录的 id
   res.data._id = msgData._id
   return res
 }
@@ -241,8 +276,9 @@ async function _beforeSendMsgActions(params) {
   // 如果是扩展的消息类型，由扩展模块执行前置操作
   const { msgTypes } = require('uni-im-ext')
   let msgType = await msgTypes.get(params.type)
-  if (msgType && msgType.beforeSendMsg) {
+  if (msgType?.beforeSendMsg) {
     await msgType.beforeSendMsg(params, this.current_uid)
+    console.error('############----->beforeSendMsg', params)
     return
   }
 }
@@ -252,7 +288,7 @@ async function _checkConversationGrade({
   to_uid,
   group_id,
 }) {
-  // 客服模式下，如果配置的客服id。则只能向客服发起会话
+  // 客服模式下，如果配置的客服 id。则只能向客服发起会话
   let chatToCustomerService = async () => {
     const customer_service_uids = uniImConfig.config('customer_service_uids_uids')
     if (customer_service_uids) {
@@ -262,7 +298,7 @@ async function _checkConversationGrade({
       if (
         !(customer_service_uids.includes(from_uid) || customer_service_uids.includes(to_uid))
       ) {
-        throw new Error('非法通讯，会话双方用户id，均不属于uni-im-co中配置的customer_service_uids')
+        throw new Error('非法通讯，会话双方用户 id，均不属于 uni-im-co 中配置的 customer_service_uids')
       }
     }
     return true
@@ -305,24 +341,24 @@ async function _checkConversationGrade({
    *	200	-	必须是好友或者群成员
    **/
   switch (conversation_grade) {
-  case 0:
-    //任何人可以发起会话，不校验
-    break;
-  case 100:
-    // 客服 or 好友或者群成员
-    try {
-      await chatToCustomerService()
-    } catch (error) {
-      console.error(error)
+    case 0:
+      // 任何人可以发起会话，不校验
+      break;
+    case 100:
+      // 客服 or 好友或者群成员
+      try {
+        await chatToCustomerService()
+      } catch (error) {
+        console.error(error)
+        await chatToFriendOrGroupMember()
+      }
+      break;
+    case 200:
+      // 必须是好友或者群成员
       await chatToFriendOrGroupMember()
-    }
-    break;
-  case 200:
-    // 必须是好友或者群成员
-    await chatToFriendOrGroupMember()
-    break;
-  default:
-    break;
+      break;
+    default:
+      break;
   }
 }
 
@@ -331,7 +367,7 @@ function _getLastMsgNote({
   type,
   action,
 }) {
-  // 文本 => 文本的前30个字
+  // 文本 => 文本的前 30 个字
   // 其他 => 消息类型
   let last_msg_note = '[多媒体]'
   if (type == 'text') {
@@ -342,22 +378,22 @@ function _getLastMsgNote({
     last_msg_note = `${body.name} 的名片`
   } else if (type === 'system') {
     switch (action) {
-    case 'group-join':
-      last_msg_note = '加入群聊'
-      break;
-    case 'group-exit':
-      last_msg_note = '退出群聊'
-      break;
-    case 'group-expel':
-      last_msg_note = '被踢出群聊'
-      break;
-    default:
-      // 更新群资料
-      if (action.includes("update-group-info-")) {
-        const { fieldsName } = body;
-        last_msg_note = `[${fieldsName + '更新'}]`;
-      }
-      break;
+      case 'group-join':
+        last_msg_note = '加入群聊'
+        break;
+      case 'group-exit':
+        last_msg_note = '退出群聊'
+        break;
+      case 'group-expel':
+        last_msg_note = '被踢出群聊'
+        break;
+      default:
+        // 更新群资料
+        if (action.includes("update-group-info-")) {
+          const { fieldsName } = body;
+          last_msg_note = `[${fieldsName + '更新'}]`;
+        }
+        break;
     }
   } else {
     last_msg_note = {
@@ -384,10 +420,10 @@ async function _createOrUpdateConversation(conversation_id, msgData, chat_source
   } = await dbUniImConversation
     .where(
       dbCmd.and([
-        {id: conversation_id},
+        { id: conversation_id },
         dbCmd.or([
-          {user_id: msgData.from_uid},
-          {group_id: dbCmd.exists(false)}
+          { user_id: msgData.from_uid },
+          { group_id: dbCmd.exists(false) }
         ])
       ])
     )
@@ -398,75 +434,78 @@ async function _createOrUpdateConversation(conversation_id, msgData, chat_source
   // 消息接收者的会话（此数据仅私聊时存在）
   let receiverConversation = conversationList.find(item => item.user_id == msgData.to_uid)
   const isMute = (receiverConversation ? receiverConversation.mute : false)
-  
+  if (msgData.type === 'read_msg'){
+    // todo:临时方案，拦截已读动作更新会话
+   // console.error('已读动作无需更新会话') 
+  }
   // 不存在，需要先创建会话记录
-  if (!senderConversation) {
+  else if (!senderConversation) {
     // 除了云函数之间（包括触发器）调用 和 特殊角色用户，需验证是否绑定了手机号码
-    if(
+    if (
       this.getClientInfo().source != 'function' &&
       !this.current_user_role.includes('uni-im-admin') &&
       !this.current_user_role.includes('staff')
-    ){
+    ) {
       // 验证账号是否绑定了手机号
       let getUserInfoRes = await db.collection('uni-id-users')
-                                    .doc(this.current_uid)
-                                    .field({
-                                      mobile_confirmed:1
-                                    })
-                                    .get()
-      if(!getUserInfoRes.data[0].mobile_confirmed){
-        throw new Error('账号未绑定手机号，无法发送消息')
+        .doc(this.current_uid)
+        .field({
+          mobile_confirmed: 1
+        })
+        .get()
+      if (!getUserInfoRes.data[0].mobile_confirmed) {
+        throw new Error('账号未绑定手机号无法发送消息，请完成绑定后退出并重新登录本系统后重试。')
       }
     }
     const clientInfo = this.getClientInfo()
     if( conversation_grade === 300 && msgData.to_uid && clientInfo.source != 'function' && this.current_uid != 'system'){
       // console.error('createOrUpdateConversation conversation_grade 300~~~~~',clientInfo.appVersionCode);
       // TODO：用于向下兼容
-      if(clientInfo.appVersionCode < 24042501){
+      if (clientInfo.appVersionCode < 24042501) {
         throw new Error('你的客户端版本过旧,不能发起新会话。请刷新后重试')
       }
       // 仅限：系统管理员参与的 或 群成员向群管理员 发起私聊
       let check = false
       // 消息发送者是系统管理员
-      if(this.current_user_role.includes('staff')){
+      if (this.current_user_role.includes('staff')) {
         check = true
         // console.error('createOrUpdateConversation staff~~~~~');
-      } else if(chat_source && chat_source.group_id){
+      } else if (chat_source && chat_source.group_id) {
         // console.error('createOrUpdateConversation group_id~~~~~');
         // 临时会话来源群，判断双方是否有一个是群管理员
         let {
           data: [member],
         } = await dbUniImGroupMember
-                    .where({
-                      group_id: chat_source.group_id,
-                      user_id: dbCmd.in([msgData.from_uid, msgData.to_uid]),
-                      role: dbCmd.in(['admin'])
-                    })
-                    .get()
-        if(member){
+          .where({
+            group_id: chat_source.group_id,
+            user_id: dbCmd.in([msgData.from_uid, msgData.to_uid]),
+            role: dbCmd.in(['admin'])
+          })
+          .get()
+        if (member) {
           check = true
           // console.error('createOrUpdateConversation member~~~~~', member);
         }
-      }else {
+      } else {
         // 判断消息接收者是否为系统管理员（staff）
         let {
           data: [receiver],
         } = await db.collection('uni-id-users')
-                    .doc(msgData.to_uid)
-                    .field({
-                      role:1,
-                      nickname:1,
-                      avatar_file:1,
-                    })
-                    .get()
+          .doc(msgData.to_uid)
+          .field({
+            role: 1,
+            nickname: 1,
+            avatar_file: 1,
+          })
+          .get()
         // console.error('createOrUpdateConversation receiver~~~~~', receiver);
-        if(receiver && receiver.role && receiver.role.includes('staff')){
+        if (receiver && receiver.role && receiver.role.includes('staff')) {
           // console.error('createOrUpdateConversation receiver.staff~~~~~');
           check = true
         }
       }
-      
-      if(!check){
+
+      if (!check) {
         let {
           data: [has]
         } = await dbUniImFriend
@@ -475,12 +514,12 @@ async function _createOrUpdateConversation(conversation_id, msgData, chat_source
             user_id: this.current_uid
           })
           .get()
-        if(has){
+        if (has) {
           check = true
         }
       }
-      
-      if(!check){
+
+      if (!check) {
         throw new Error('仅限：好友之间、系统管理员参与的、群成员与群管理员，发起私聊')
       }
     }
@@ -495,10 +534,23 @@ async function _createOrUpdateConversation(conversation_id, msgData, chat_source
       unread_count: 0,
       last_msg_note,
       update_time: msgData.create_time,
-      create_time: msgData.create_time
+      create_time: msgData.create_time,
+      last_msg_create_time: msgData.create_time,
+      pinned: false,
+      hidden: false,
+      mute: false
     }
     if (msgData.group_id) {
       senderConversation.leave = false
+      senderConversation.has_unread_group_notification = null
+      // 拿到group_type
+      let {data:[groupInfo]} = await db.collection('uni-im-group')
+        .doc(msgData.group_id)
+        .field({
+          type: true,
+        })
+        .get()
+      senderConversation.group_type = groupInfo?.type
       // 群聊只为当前用户创建会话
       await dbUniImConversation.add(senderConversation)
     } else {
@@ -524,21 +576,21 @@ async function _createOrUpdateConversation(conversation_id, msgData, chat_source
     if (msgData.from_uid != msgData.to_uid) {
       updateObj.unread_count = dbCmd.inc(1)
     }
-    
+
     // TODO：部分情况下不需要更新未读消息数，后续会改成都通过is_mute字段来判断
-    if(
+    if (
       // 加群消息
-      msgData.action === "join-group" 
+      msgData.action === "join-group"
       ||
       // 禁言通知
-      msgData.action === 'update-group-info-mute_all_members' 
+      msgData.action === 'update-group-info-mute_all_members'
       ||
       // 本身是一条静默消息
       msgData.is_mute === true
-    ){
+    ) {
       delete updateObj.unread_count
     }
-
+    
     if (!(await _isReadableMsg(msgData))) {
       // “非可见消息”不更新“最后一次对话消息概述”
       delete updateObj.last_msg_note
@@ -547,6 +599,11 @@ async function _createOrUpdateConversation(conversation_id, msgData, chat_source
       // “静音消息”不更新“未读消息数”
       delete updateObj.unread_count
     }
+    
+    // 如果有last_msg_note，增加一个last_msg_create_time字段
+    if (updateObj.last_msg_note) {
+      updateObj.last_msg_create_time = msgData.create_time
+    }
 
     // 所有接收者的会话表更新
     let res = await dbUniImConversation
@@ -568,7 +625,7 @@ async function _createOrUpdateConversation(conversation_id, msgData, chat_source
       .update(updateObj)
     // console.log(res);
   }
-  
+
   // 返回消息接收者的isMute状态（仅私聊有效）
   return {
     isMute
@@ -576,561 +633,577 @@ async function _createOrUpdateConversation(conversation_id, msgData, chat_source
 }
 
 function _extractTextFromMsg(msgData) {
-  let __text = null
-  if (["text", "code"].includes(msgData.type)) {
-    __text = msgData.body.replace(/[\s\n]+/g, " ")
-  } else if (["image", "video", "file"].includes(msgData.type)) {
-    __text = msgData.body.name
-  } else if (msgData.type == "rich-text") {
-    let getTextOfNodeList = (nodesList) => {
-      let text = ''
-      nodesList.forEach(item => {
-        if (item.type == "text") {
-          text += item.text
-        }
-        if (Array.isArray(item.children)) {
-          text += " " + getTextOfNodeList(item.children)
-          if (item.attrs && item.attrs.class === 'nickname') {
-            // 增加空格，用于区分昵称和消息内容
-            text += " "
-          }
+    let __text = null
+    if (["text", "code"].includes(msgData.type)) {
+        __text = msgData.body.replace(/[\s\n]+/g, " ")
+    } else if (["image", "video", "file"].includes(msgData.type)) {
+        __text = msgData.body.name
+    } else if (msgData.type == "rich-text") {
+        let getTextOfNodeList = (nodesList) => {
+            let text = ''
+            nodesList.forEach(item => {
+                if (item.type == "text") {
+                    text += item.text
+                }
+                if (Array.isArray(item.children)) {
+                    text += " " + getTextOfNodeList(item.children)
+                    if (item.attrs && item.attrs.class === 'nickname') {
+                        // 增加空格，用于区分昵称和消息内容
+                        text += " "
+                    }
+                }
+            })
+            return text
         }
-      })
-      return text
+        __text = getTextOfNodeList(msgData.body).replace(/[\s\n]+/g, " ")
     }
-    __text = getTextOfNodeList(msgData.body).replace(/[\s\n]+/g, " ")
-  }
 
-  if (__text) {
-    // 全部转成小写，以便进行大小写不敏感的匹配
-    __text = __text.toLowerCase()
-    // 24 位 hex 会被 mongodb 自动转换成 ObjectId，需阻止
-    if (__text.match(/^[0-9a-f]{24}$/)) {
-      __text = __text + ' '
+    if (__text) {
+        // 全部转成小写，以便进行大小写不敏感的匹配
+        __text = __text.toLowerCase()
+        // 24 位 hex 会被 mongodb 自动转换成 ObjectId，需阻止
+        if (__text.match(/^[0-9a-f]{24}$/)) {
+            __text = __text + ' '
+        }
     }
-  }
 
-  return __text
+    return __text
 }
 
 function _checkForLongMsg(msgData) {
-  let bodyStr = JSON.stringify(msgData.body)
-  if (bodyStr > 50000) {
-    throw new Error('单次消息最长字符长度不得超过50000')
-  }
-  if (bodyStr.length > 250) {
-    switch (msgData.type) {
-    case 'rich-text':
-      msgData.body = "富文本消息"
-      break;
-    case 'history':
-      msgData.body = "转发的聊天记录"
-      break;
-    case 'text':
-      // 截断，但标识消息为长文本消息，客户端收到此标识，会从数据库中拉取完整消息内容
-      msgData.body = msgData.body.slice(0, 50)
-      break;
-    default:
-      msgData.body = `[${msgData.type}]类型消息`
-      break;
+    let bodyStr = JSON.stringify(msgData.body)
+    if (bodyStr > 50000) {
+        throw new Error('单次消息最长字符长度不得超过 50000')
     }
+    if (bodyStr.length > 250) {
+        switch (msgData.type) {
+            case 'rich-text':
+                msgData.body = "富文本消息"
+                break;
+            case 'history':
+                msgData.body = "转发的聊天记录"
+                break;
+            case 'text':
+                // 截断，但标识消息为长文本消息，客户端收到此标识，会从数据库中拉取完整消息内容
+                msgData.body = msgData.body.slice(0, 50)
+                break;
+            default:
+                msgData.body = `[${msgData.type}]类型消息`
+                break;
+        }
 
-    msgData.LongMsg = true
-  }
+        msgData.LongMsg = true
+    }
 }
 
 async function _checkForReplyMsg(msgData) {
-  if (!msgData.about_msg_id) return
+    if (!msgData.about_msg_id) return
 
-  let {
+    let { 
     data: [aboutMsg]
-  } = await dbUniImMsg.doc(msgData.about_msg_id).get()
-  if (!aboutMsg) {
-    throw new Error('方法的about_msg_id')
-  }
-  if (!Array.isArray(msgData.call_uid)) {
-    msgData.call_uid = []
-  }
-  msgData.call_uid.push(aboutMsg.from_uid)
-  // console.log(987,aboutMsg,msgData.call_uid);
-}
-
-async function _getSenderInfo(from_uid) {
-  const dbJQL = uniCloud.databaseForJQL({
-    clientInfo: this.clientInfo
-  })
-  let res, userInfo;
-  if (from_uid === 'system') {
-    userInfo = {
-      nickname: "系统消息",
-      avatar_file: {}
+    } = await dbUniImMsg.doc(msgData.about_msg_id).get()
+    if (!aboutMsg) {
+        throw new Error('方法的 about_msg_id')
     }
-  } else {
-    res = await dbJQL.collection('uni-id-users')
-      .doc(from_uid)
-      .field('_id,nickname,avatar_file')
-      .get()
-    userInfo = res.data[0]
-  }
-  return userInfo
+    if (!Array.isArray(msgData.call_uid)) {
+        msgData.call_uid = []
+    }
+    msgData.call_uid.push(aboutMsg.from_uid)
+    // console.log(987,aboutMsg,msgData.call_uid);
 }
 
 async function _processPush({ msgData, isMute, appId }) {
-  // 处理超长文本，push发送不了的问题
-  _checkForLongMsg(msgData)
+    // 处理超长文本，push 发送不了的问题
+    _checkForLongMsg(msgData)
+
+    // 处理 消息回复 @某人的
+    await _checkForReplyMsg(msgData)
+
+    const { nickname, avatar_file } = msgData
+    const title = msgData.type == 'system'? '系统消息' : nickname.slice(0, 20)
+    const content = msgData.type == 'text'? msgData.body : '[多媒体]'
+    // 定义推送参数
+    const pushParam = {
+        payload: {
+            type: "uni-im",
+            data: msgData,
+            title, // "收到 im 消息，在线时显示的标题",
+            content, // "在线时显示的副标题",
+            avatar_file, // 头像文件对象,
+            device_id: this.clientInfo.deviceId // 发送消息的设备（客户端）id，阻止当前用户收到自己发的消息
+        },
+        title: title.slice(0, 20), // "收到 im 消息，离线时显示的标题",
+        content: content.slice(0, 50) //"离线时显示的内容"
+    }
 
-  // 处理 消息回复 @某人的
-  await _checkForReplyMsg(msgData)
+    let res
+
+    if (msgData.from_uid!= 'system' && (msgData.to_uid || msgData.group_id)) {
+        // 以"非离线"且免打扰的消息（避免系统通知栏出现消息）同步给当前用户的其他设备（比如 web 和 app、小程序同时登录时；注：发送此消息的“设备”在客户端通过业务代码过滤，这里不排除）
+        this.addPromise(
+            this.sendPushMsg({
+               ...pushParam,
+                user_id: msgData.from_uid,
+                settings: {
+                    strategy: {
+                        default: 3
+                    }
+                }
+            }, appId)
+        )
+    }
 
-  // 查询消息发送者的头像和昵称
-  let {
-    nickname,
-    avatar_file
-  } = await _getSenderInfo(msgData.from_uid)
-
-  let title = msgData.type == 'system' ? '系统消息' : nickname.slice(0, 20)
-  let content = msgData.type == 'text' ? msgData.body : '[多媒体]'
-
-  // 定义推送参数
-  let pushParam = {
-    payload: {
-      type: "uni-im",
-      data: msgData,
-      title, // "收到im消息，在线时显示的标题",
-      content, // "在线时显示的副标题",
-      avatar_file, //头像文件对象,
-      device_id: this.clientInfo.deviceId // 发送消息的设备（客户端）id，阻止当前用户收到自己发的消息
-    },
-    title: title.slice(0, 20), // "收到im消息，离线时显示的标题",
-    content: content.slice(0, 50) //"离线时显示的内容"
-  }
+    if (msgData.to_uid) {
+        // WS 推送：单聊消息推送给接收方
+        if (!isMute &&!_isMuteMsg(msgData) && (await _isReadableMsg(msgData))) {
+          this.addPromise(
+            new Promise(resolve => {
+              // 给500毫秒时间，确保请求大概率能发出去，但不接收响应，防止请求异常导致的等待时间过长
+                setTimeout(()=>{
+                  invokeExts('push-msg-notify', {
+                    to_uids: [msgData.to_uid],
+                    msg: {
+                      type: 'incr-conversation',
+                      conversation_id: msgData.conversation_id,
+                    }
+                  })
+                  resolve()
+                }, 500)
+            })
+          )
+        }
 
-  let res
-  
-  if( msgData.from_uid != 'system' && (msgData.to_uid || msgData.group_id) ){
-    // 以"非离线"消息（避免系统通知栏出现消息）同步给当前用户的其他设备（比如web和app、小程序同时登录时；注：发送此消息的“设备”在客户端通过业务代码过滤，这里不排除）
-    this.addPromise(
-      this.sendPushMsg({
-        ...pushParam,
-        user_id: msgData.from_uid,
-        settings: {
-          strategy: {
-            default: 3
-          }
+        // 单聊，直接调用 before 中封装好的消息推送方法
+        pushParam.user_id = msgData.to_uid
+        if (isMute) {
+            console.log('消息接收者设置了免打扰，或本身就是一条静音消息，应用离线时，此消息不会有系统通知')
+            pushParam.settings = {
+                strategy: {
+                    default: 3
+                }
+            }
         }
-      }, appId)
-    )
-  }
-  
-  if (msgData.to_uid) {
-    // WS 推送：单聊消息推送给接收方
-    if (!isMute && !_isMuteMsg(msgData) && (await _isReadableMsg(msgData))) {
-      const { invokeExts } = require('uni-im-ext')
-      await invokeExts('push-msg-notify', {
-        to_uids: [msgData.to_uid],
-        msg: {
-          type: 'incr-conversation',
-          conversation_id: msgData.conversation_id,
+        res = await this.sendPushMsg(pushParam, appId)
+        // console.log('sendMessage', JSON.stringify(res))
+        /*
+        //判断是否已经有客户端接收到消息，注意：收到不等于已读
+        let taskData = res.data[Object.keys(res.data)]
+        let state = false;
+        for (let key in taskData) {
+            if (taskData[key] == 'successed_online') {
+                state = true
+                break
+            }
         }
-      })
-    }
-
-    //单聊，直接调用before中封装好的消息推送方法
-    pushParam.user_id = msgData.to_uid
-    if(isMute){
-      console.log('消息接收者设置了免打扰，应用离线时，此消息不会有系统通知')
-      pushParam.settings = {
-        strategy: {
-          default: 3
+        console.log('state : ============> ' + state);*/
+        res.data = {} // 不返回给客户端发送结果
+    } else if (msgData.group_id) {
+        this.addPromise(
+            // 把当前发消息的用户的，在群成员中的活跃时间更新
+            db.collection('uni-im-group-member').where({
+                group_id: msgData.group_id,
+                user_id: msgData.from_uid
+            }).update({
+                active_time: Date.now()
+            })
+        )
+
+        // 如果是群聊则调用 sendMsgToGroup 云方法，此方法内部会递归发送（500 个为用户一批）
+        if (this.getClientInfo().clientIP == "127.0.0.1") {
+            // 如果是本地调试，直接 await 调用（因为本地调试下，云函数互调“不是调用新实例”，必须等待执行结束，注：相比生产环境的速度会更慢。）
+            const start = Date.now() // 计时
+            let sendMsgToGroupRes = await sendMsgToGroup()
+            console.error(
+                'sendMsgToGroupRes', sendMsgToGroupRes,
+                'sendMsgToGroup 耗时：', Date.now() - start, 'ms',
+                '因为本地调试下，云函数互调“不是调用新实例”，必须等待执行结束，注：相比生产环境的速度会更慢。'
+            )
+        } else {
+            sendMsgToGroup()
+            // 等待 500 毫秒，给一个请求发出去的时间
+            this.addPromise(
+                new Promise(resolve => {
+                    setTimeout(resolve, 500)
+                })
+            )
         }
-      }
-    }
-    res = await this.sendPushMsg(pushParam, appId)
-    // console.log('sendMessage', JSON.stringify(res))
-    /*
-    //判断是否已经有客户端接收到消息，注意：收到不等于已读
-    let taskData = res.data[Object.keys(res.data)]
-    let state = false;
-    for (let key in taskData) {
-      if (taskData[key] == 'successed_online') {
-        state = true
-        break
-      }
-    }
-    console.log('state : ============> ' + state);*/
-	res.data = {} // 不返回给客户端发送结果
-  } else if (msgData.group_id) {
-    // console.error('群聊消息*-----------------',pushParam);
-    // 如果是群聊则调用sendMsgToGroup云方法，递归发送（500个为用户一批）
-    uniCloud.importObject('uni-im-co').sendMsgToGroup({
-      pushParam,
-      appId
-    })
-    this.addPromise(
-      // 等待500毫秒，给一个请求发出去的时间
-      new Promise(resolve => {
-        setTimeout(resolve, 500)
-      })
-    )
-    res = {
-      errCode: 0
+        function sendMsgToGroup() {
+            return uniCloud.importObject('uni-im-co').sendMsgToGroup({
+                pushParam,
+                appId
+            })
+        }
+        res = {
+            errCode: 0
+        }
+    } else {
+        throw new Error('接受者标识，不能为空')
     }
-  } else {
-    throw new Error('接受者标识，不能为空')
-  }
-  return res
+    return res
 }
 
 async function sendMsgToGroup({
-  pushParam,
-  before_id,
-  push_clientids = [],
-  member = [],
-  appId,
-  // 默认先给未设置消息免打扰的用户发消息
-  mute = false
+    pushParam,
+    before_id,
+    push_clientids = [],
+    member = [],
+    appId,
+    // 默认先给未设置消息免打扰的用户发消息
+    mute = false
 }) {
-  // 注意：这是一个递归云对象，用递归的方式处理批量任务
-  const limit = 500 //腾讯云收费版服务空间可以改成 1000
-  if (this.getClientInfo().source != 'function') {
-    return {
-      errSubject: 'uni-im-co',
-      errCode: 0,
-      errMsg: '该方法仅支持云对象的方法，或者触发器调用'
+    // 注意：这是一个递归云对象，用递归的方式处理批量任务
+    const limit = 1000
+    if (this.getClientInfo().source!= 'function') {
+        return {
+            errSubject: 'uni-im-co',
+            errCode: 0,
+            errMsg: '该方法仅支持云对象的方法，或者触发器调用'
+        }
     }
-  }
-
-  // console.log('sendMsgToGroup=========', {
-  // 	pushParam,
-  // 	before_id,
-  // 	push_clientids
-  // });
 
-  if (before_id || push_clientids) {
-    // console.log({
+    // console.log('sendMsgToGroup=========', {
+    // 	pushParam,
     // 	before_id,
     // 	push_clientids
     // });
-    // return 123
-  }
 
-  if (push_clientids.length === 0) {
-    // console.log('开始查库', push_clientids.length, push_clientids);
-    let group_id = pushParam.payload.data.group_id
-    if (!group_id) {
-      throw new Error('群id不能为空')
-    }
-    let getMemberwhere = {
-      group_id,
-      mute: mute ? true : dbCmd.neq(true),
-      leave:dbCmd.neq(true),
-      // 需要排除自己
-      user_id: dbCmd.neq(pushParam.payload.data.from_uid)
+    if (before_id || push_clientids) {
+        // console.log({
+        // 	before_id,
+        // 	push_clientids
+        // });
+        // return 123
     }
-    
-    if (before_id) {
-      getMemberwhere._id = dbCmd.gt(before_id)
-    }
-    // console.log({
-    // 	getMemberwhere
-    // });
-    let res = await dbUniImConversation
-      .aggregate()
-      .match(getMemberwhere)
-      .sort({
-        _id: 1
-      })
-      .limit(limit)
-      .project({
-        user_id: 1,
-        mute: 1
-      })
-      .lookup({
-        from: "uni-id-device",
-        let: {
-          user_id: '$user_id'
-        },
-        pipeline: $.pipeline()
-          .match(
-            dbCmd.expr(
-              $.and([
-                $.eq(['$user_id', '$$user_id']),
-                $.gt(['$token_expired', Date.now()])
-              ])
-            )
-          ).project({
-            push_clientid: 1
-          })
-          .done(),
-        as: 'push_clientids',
-      })
-      .end()
-    member = res.data
-    console.error('符合条件的'+ (mute?'【设置消息免打扰的用户】':'') +'用户数', member.length); //,member
-    push_clientids = member.reduce((sum, item) => {
-      sum.push(...item.push_clientids.map(i => i.push_clientid))
-      return sum
-    }, [])
-    console.log('查到需要接收消息的设备数：', push_clientids.length);
-    
-    // 消息接收者用户id
-    const receiverUids = member.map(user => user.user_id)
-    const msgData = pushParam.payload.data
-    
-    // console.error('###########msgData.action', msgData.action);
-    // 更新：退群、解散群、被踢出群 相关的用户会话
-    if(receiverUids.length && ["group-exit","group-expel","group-dissolved"].includes(msgData.action)){
-      const updateUids = []
-      if (msgData.action == 'group-exit') {
-        // 主动退群时，仅退群用户所在“消息推送批次”时更新会话即可
-        if(receiverUids.includes(msgData.from_uid)){
-          updateUids.push(msgData.from_uid)
+
+    if (push_clientids.length === 0) {
+        // console.log('开始查库', push_clientids.length, push_clientids);
+        let group_id = pushParam.payload.data.group_id
+        if (!group_id) {
+            throw new Error('群 id 不能为空')
         }
-      } else {
-        // 群解散、被踢出群时，所有“本批次”的用户会话都需要更新（注：分批 解散/退出群 的设计模式）
-        updateUids.push(...receiverUids)
-        // 解散群时，在第一批次时，增加更新操作者（群主）的会话
-        if(!before_id && msgData.action == 'group-dissolved'){
-          updateUids.push(msgData.from_uid)
+        let getMemberwhere = {
+            group_id,
+            mute: mute? true : dbCmd.neq(true),
+            leave: dbCmd.neq(true),
+            // 需要排除自己
+            user_id: dbCmd.neq(pushParam.payload.data.from_uid)
         }
-      }
-      if(updateUids.length){
+
+        if (before_id) {
+            getMemberwhere._id = dbCmd.gt(before_id)
+        }
+        // console.log({
+        // 	getMemberwhere
+        // });
         let res = await dbUniImConversation
-          .where({
-            id: msgData.conversation_id,
-            user_id: dbCmd.in(updateUids)
-          })
-          .update({"leave":true})
-        // console.error('###########更新退群或者被踢出群的用户会话', res);
-      }
-    }
+           .aggregate()
+           .match(getMemberwhere)
+           .sort({
+                _id: 1
+            })
+           .limit(limit)
+           .project({
+                user_id: 1,
+                mute: 1
+            })
+           .lookup({
+                from: "uni-id-device",
+                let: {
+                    user_id: '$user_id'
+                },
+                pipeline: $.pipeline()
+                   .match(
+                        dbCmd.expr(
+                            $.and([
+                                $.eq(['$user_id', '$$user_id']),
+                                $.gt(['$token_expired', Date.now()])
+                            ])
+                        )
+                    ).project({
+                        push_clientid: 1
+                    })
+                   .done(),
+                as: 'push_clientids',
+            })
+           .end()
+        member = res.data
+        console.error('符合条件的' + (mute? '【设置消息免打扰的用户】' : '') + '用户数', member.length); //,member
+        push_clientids = member.reduce((sum, item) => {
+            sum.push(...item.push_clientids.map(i => i.push_clientid))
+            return sum
+        }, [])
+        console.log('查到需要接收消息的设备数：', push_clientids.length);
+
+        // 消息接收者用户 id
+        const receiverUids = member.map(user => user.user_id)
+        const msgData = pushParam.payload.data
+
+        // console.error('###########msgData.action', msgData.action);
+        // 更新：退群、解散群、被踢出群 相关的用户会话
+        if (receiverUids.length && ["group-exit", "group-expel", "group-dissolved"].includes(msgData.action)) {
+            const updateUids = []
+            if (['group-exit', 'group-expel'].includes(msgData.action)) {
+                // 主动退群/被踢出群 时，仅退群用户所在“消息推送批次”时更新会话即可
+                msgData.body.user_id_list.forEach(uid => {
+                    if (receiverUids.includes(uid)) {
+                        updateUids.push(uid)
+                    }
+                })
+            } else {
+                // 群解散时，所有“本批次”的用户会话都需要更新（注：分批 解散/退出群 的设计模式）
+                updateUids.push(...receiverUids)
+                // 解散群时，在第一批次时，增加更新操作者（群主）的会话
+                if (!before_id) {
+                    updateUids.push(msgData.from_uid)
+                }
+            }
+
+            if (updateUids.length) {
+                let res = await dbUniImConversation
+                   .where({
+                        id: msgData.conversation_id,
+                        user_id: dbCmd.in(updateUids)
+                    })
+                   .update({ "leave": true })
+                // console.error('###########更新退群或者被踢出群的用户会话', res,updateUids);
+            }
+        }
 
-    // WS 推送：群聊消息推送给相关用户
-    if (!mute && !_isMuteMsg(msgData) && (await _isReadableMsg(msgData))) {
-      const { invokeExts } = require('uni-im-ext')
-      await invokeExts('push-msg-notify', {
-        to_uids: receiverUids,
-        msg: {
-          type: 'incr-conversation',
-          conversation_id: msgData.conversation_id,
+        // WS 推送：群聊消息推送给相关用户
+        if (!mute &&!_isMuteMsg(msgData) && (await _isReadableMsg(msgData))) {
+          this.addPromise(
+            new Promise(resolve => {
+              // 给500毫秒时间，确保请求大概率能发出去，但不接收响应，防止请求异常导致的等待时间过长
+                setTimeout(()=>{
+                  invokeExts('push-msg-notify', {
+                    to_uids: receiverUids,
+                    msg: {
+                      type: 'incr-conversation',
+                      conversation_id: msgData.conversation_id,
+                    }
+                  })
+                  resolve()
+                }, 500)
+            })
+          )
         }
-      })
+    } else {
+        console.log('不需要查库，继续发送任务', push_clientids.length);
     }
-  } else {
-    console.log('不需要查库，继续发送任务', push_clientids.length);
-  }
 
-  if (push_clientids.length === 0) {
-    if(mute){
-      // console.log('已没有设置了免打扰的用户需要接收消息');
-      return {
-        errCode: 0,
-        errMsg: '',
-      }
-    }else{
-      // console.log('已没有未设置免打扰的用户需要接收消息，继续查询设置免打扰的用户');
+    if (push_clientids.length === 0) {
+        if (mute) {
+            // console.log('已没有设置了免打扰的用户需要接收消息');
+            return {
+                errCode: 0,
+                errMsg: '',
+            }
+        } else {
+            // console.log('已没有未设置免打扰的用户需要接收消息，继续查询设置免打扰的用户');
+        }
     }
-  }
-  
-  // 下一批推送的设备id
-  let next_push_clientids = push_clientids.slice(limit)
-  // 当前这一批要推送的设备id
-  push_clientids = push_clientids.slice(0, limit)
-  if(push_clientids.length > 0){
-    pushParam.push_clientid = push_clientids
-    // console.log("pushParam", pushParam);
-    // 如果是给免打扰的用户发消息，需要设置策略，只通过个推通道下发，不考虑设备是否在线
-    if(mute){
-      pushParam.settings = {
-        strategy:{
-          default:3
+
+    // 下一批推送的设备 id
+    let next_push_clientids = push_clientids.slice(limit)
+    // 当前这一批要推送的设备 id
+    push_clientids = push_clientids.slice(0, limit)
+    if (push_clientids.length > 0) {
+        pushParam.push_clientid = push_clientids
+        // console.log("pushParam", pushParam);
+        // 如果是给免打扰的用户发消息，需要设置策略，只通过个推通道下发，不考虑设备是否在线
+        if (mute || pushParam.payload.data.is_mute) {
+            pushParam.settings = {
+                strategy: {
+                    default: 3
+                }
+            }
         }
-      }
+        // 执行推送
+        let sendPushMsgRes = await this.sendPushMsg(pushParam, appId)
+        // console.error(sendPushMsgRes)
     }
-    // 执行推送
-    let sendPushMsgRes = await this.sendPushMsg(pushParam, appId)
-    // console.error(sendPushMsgRes)
-  }
-  
-  if (next_push_clientids.length !== 0) {
-    // 发起下一批数据的推送
-    uniCloud.importObject('uni-im-co').sendMsgToGroup({
-      pushParam,
-      push_clientids: next_push_clientids,
-      member,
-      mute
-    }, appId)
-    // 等待500毫秒，给一个请求发出去的时间
-    return await new Promise((resolve, reject) => {
-      setTimeout(() => {
-        resolve({
-          errCode: 0,
-          errMsg: ''
+
+    if (next_push_clientids.length!== 0) {
+        // 发起下一批数据的推送
+        uniCloud.importObject('uni-im-co').sendMsgToGroup({
+            pushParam,
+            push_clientids: next_push_clientids,
+            member,
+            mute
+        }, appId)
+        // 等待 500 毫秒，给一个请求发出去的时间
+        return await new Promise((resolve, reject) => {
+            setTimeout(() => {
+                resolve({
+                    errCode: 0,
+                    errMsg: ''
+                })
+            }, 500)
         })
-      }, 500)
-    })
-  } else if (member.length == limit) {
-    // 成员数等于分页数，则处于递归翻页进行中，且当前批次的数据已经全部推送完毕，继续查询下一批数据
-    // console.log('member---*--*', member);
-    before_id = member[member.length - 1]._id
-    uniCloud.importObject('uni-im-co').sendMsgToGroup({
-      pushParam,
-      before_id,
-      mute
-    }, appId)
-    // 等待500毫秒，给一个请求发出去的时间
-    return await new Promise((resolve, reject) => {
-      setTimeout(() => {
-        resolve({
-          errCode: 0,
-          errMsg: ''
+    } else if (member.length == limit) {
+        // 成员数等于分页数，则处于递归翻页进行中，且当前批次的数据已经全部推送完毕，继续查询下一批数据
+        // console.log('member---*--*', member);
+        before_id = member[member.length - 1]._id
+        uniCloud.importObject('uni-im-co').sendMsgToGroup({
+            pushParam,
+            before_id,
+            mute
+        }, appId)
+        // 等待 500 毫秒，给一个请求发出去的时间
+        return await new Promise((resolve, reject) => {
+            setTimeout(() => {
+                resolve({
+                    errCode: 0,
+                    errMsg: ''
+                })
+            }, 500)
         })
-      }, 500)
-    })
-  } else {
-    if(!mute){
-      // 如果之前不是给设置了免打扰的用户发消息，接下来需要给设置了免打扰的用户发消息
-      uniCloud.importObject('uni-im-co').sendMsgToGroup({
-        pushParam,
-        mute:true
-      }, appId)
-      // 等待500毫秒，给一个请求发出去的时间
-      return await new Promise((resolve, reject) => {
-        setTimeout(() => {
-          resolve({
-            errCode: 0,
-            errMsg: ''
-          })
-        }, 500)
-      })
-    }else{
-      // console.log('没有更多用户需要接收消息');
-      return {
-        errCode: 0,
-        errMsg: ''
-      }
+    } else {
+        if (!mute) {
+            // 如果之前不是给设置了免打扰的用户发消息，接下来需要给设置了免打扰的用户发消息
+            uniCloud.importObject('uni-im-co').sendMsgToGroup({
+                pushParam,
+                mute: true
+            }, appId)
+            // 等待 500 毫秒，给一个请求发出去的时间
+            return await new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    resolve({
+                        errCode: 0,
+                        errMsg: ''
+                    })
+                }, 500)
+            })
+        } else {
+            // console.log('没有更多用户需要接收消息');
+            return {
+                errCode: 0,
+                errMsg: ''
+            }
+        }
     }
-  }
 }
 
 async function getMsgList({
-  conversation_ids,
-  minUpdateTime,
-  limit
+    conversation_ids,
+    minUpdateTime,
+    limit
 }) {
-  // 校验conversation_ids是否为当前用户
-  let {
-    data: conversationList
-  } = await dbUniImConversation.where({
-    id: dbCmd.in(conversation_ids),
-    user_id: this.current_uid,
-    leave: dbCmd.neq(true)
-  }).get()
-  if (conversationList.length !== conversation_ids.length) {
-    throw new Error('无效的会话id')
-  }
-  
-  // 查询消息列表
-  let res = await dbUniImMsg.where({
-    conversation_id: dbCmd.in(conversation_ids),
-    update_time: dbCmd.gt(minUpdateTime)
-  })
-  .orderBy('update_time', 'asc')
-  .limit(limit)
-  .get()
+    // 校验 conversation_ids 是否为当前用户
+    let {
+      data: conversationList
+    } = await dbUniImConversation.where({
+        id: dbCmd.in(conversation_ids),
+        user_id: this.current_uid,
+        leave: dbCmd.neq(true)
+    }).get()
+    if (conversationList.length!== conversation_ids.length) {
+        throw new Error('无效的会话 id')
+    }
 
-  return res
+    // 查询消息列表
+    let res = await dbUniImMsg.where({
+        conversation_id: dbCmd.in(conversation_ids),
+        update_time: dbCmd.gt(minUpdateTime)
+    })
+    .orderBy('update_time', 'asc')
+    .limit(limit)
+    .get()
+
+    return res
 }
 
 async function _revokeMsg(msgId) {
-  //1. 先查到这条消息
-  let {
-    data: [msgData]
-  } = await dbUniImMsg.doc(msgId).get()
-  if (!msgData) {
-    throw new Error('无效的消息id')
-  }
-  // 如果不是 im 产品的管理员
-  if (!this.current_user_role.includes('uni-im-admin')) {
+    //1. 先查到这条消息
     let {
-      conversation_id,
-      from_uid,
-      appid: appId,
-      group_id,
-      create_time
-    } = msgData
-
-    // 判断是不是群主
-    let isGroupAdmin = false
-    if (group_id) {
-      let res = await dbUniImGroupMember
-        .where({
-          group_id,
-          user_id: this.current_uid
-        })
-        .get()
-      let role = res.data[0].role || []
-      isGroupAdmin = res.data[0] && role.includes('admin')
+      data: [msgData]
+    } = await dbUniImMsg.doc(msgId).get()
+    if (!msgData) {
+        throw new Error('无效的消息 id')
     }
-    // console.error('isGroupAdmin',isGroupAdmin)
-
-    //如果不是群主，且消息不是发送者的就无权撤回
-    if (!isGroupAdmin) {
-      if (from_uid != this.current_uid) {
-        throw new Error('你不是消息的发送者或群管理员，无权操作')
-      } else {
-        // 消息发送者为“当前用户”时，消息创建时间需要时间小于2分钟
-        if (Date.now() - create_time > 1000 * 60 * 2) {
-          throw {
-            errSubject: 'uni-im-co',
-            errCode: 10004,
-            errMsg: '消息已超过2分钟不能撤回'
-          }
+    // 如果不是 im 产品的管理员
+    if (!this.current_user_role.includes('uni-im-admin') && this.getClientInfo().source!= 'function') {
+        let {
+          conversation_id,
+          from_uid,
+          appid: appId,
+          group_id,
+          create_time
+        } = msgData
+
+        // 判断是不是群主
+        let isGroupAdmin = false
+        if (group_id) {
+            let res = await dbUniImGroupMember
+            .where({
+                group_id,
+                user_id: this.current_uid
+            })
+            .get()
+            let role = res.data[0].role || []
+            isGroupAdmin = res.data[0] && role.includes('admin')
+        }
+        // console.error('isGroupAdmin',isGroupAdmin)
+
+        // 如果不是群主，且消息不是发送者的就无权撤回
+        if (!isGroupAdmin) {
+            if (from_uid!= this.current_uid) {
+                throw new Error('你不是消息的发送者或群管理员，无权操作')
+            } else {
+                // 消息发送者为“当前用户”时，消息创建时间需要时间小于 2 分钟
+                if (Date.now() - create_time > 1000 * 60 * 2) {
+                    throw {
+                        errSubject: 'uni-im-co',
+                        errCode: 10004,
+                        errMsg: '消息已超过 2 分钟不能撤回'
+                    }
+                }
+            }
         }
-      }
     }
-  }
 
-  // 改变云数据库中此消息的撤回状态
-  let res = await dbUniImMsg
+    // 改变云数据库中此消息的撤回状态
+    let res = await dbUniImMsg
     .doc(msgId)
     .update({
-      is_revoke: true,
-      update_time: Date.now()
+        is_revoke: true,
+        update_time: Date.now()
     })
-  return msgData
+    return msgData
 }
 
 function _isMuteMsg(msg) {
-  return (
-    // 加群消息
-    msg.action === "join-group" 
-    || 
-    // 禁言通知
-    msg.action === 'update-group-info-mute_all_members' 
-    ||
-    // 消息本身是静默消息
-    msg.is_mute === true
-  )
+    return (
+        // 加群消息
+        msg.action === "join-group"
+        ||
+        // 禁言通知
+        msg.action === 'update-group-info-mute_all_members'
+        ||
+        // 消息本身是静默消息
+        msg.is_mute === true
+    )
 }
 
 async function _isReadableMsg(msg) {
-  if (msg.type === 'revoke_msg') return false
-  if (msg.action === 'update-group-info-avatar_file') return false
-  if (msg.type === 'clear-conversation-unreadCount') return false
-
-  // 如果是扩展的消息类型，由扩展模块决定消息是否可见
-  const { msgTypes } = require('uni-im-ext')
-  let msgType = await msgTypes.get(msg.type)
-  if (msgType && msgType.isReadable) {
-    return msgType.isReadable(msg)
-  }
+    if (msg.type === 'revoke_msg') return false
+    if (msg.action === 'update-group-info-avatar_file') return false
+    if (msg.type === 'clear-conversation-unreadCount') return false
+
+    // 如果是扩展的消息类型，由扩展模块决定消息是否可见
+    const { msgTypes } = require('uni-im-ext')
+    const msgTypesGetSatrt = Date.now()
+    let msgType = await msgTypes.get(msg.type)
+    // console.error('msgTypes.get', Date.now() - msgTypesGetSatrt)
+    if (msgType && msgType.isReadable) {
+        return msgType.isReadable(msg)
+    }
 
-  return true
+    return true
 }
 
 module.exports = {
-  sendMsg,
-  sendMsgToGroup,
-  getMsgList
-}
+    sendMsg,
+    sendMsgToGroup,
+    getMsgList
+}
\ No newline at end of file
diff --git a/uniCloud/cloudfunctions/uni-im-co/package-lock.json b/uniCloud/cloudfunctions/uni-im-co/package-lock.json
deleted file mode 100644
index 855e2e954e5c55f2c3a2d4469bcf8385c84a4ac0..0000000000000000000000000000000000000000
--- a/uniCloud/cloudfunctions/uni-im-co/package-lock.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "name": "uni-im-co",
-  "version": "1.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "uni-im-co",
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "common-uni-cloud-push": "file:../../../../../uniCloud-aliyun/cloudfunctions/common/common-uni-cloud-push",
-        "uni-config-center": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
-        "uni-id-common": "file:../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common",
-        "uni-im-utils": "file:../common/uni-im-utils"
-      }
-    },
-    "../../../../../uniCloud-aliyun/cloudfunctions/common/common-uni-cloud-push": {
-      "version": "1.1.18"
-    },
-    "../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center": {
-      "version": "0.0.3",
-      "license": "Apache-2.0"
-    },
-    "../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common": {
-      "version": "1.0.16",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
-      }
-    },
-    "../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/node_modules/uni-config-center": {
-      "resolved": "../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
-      "link": true
-    },
-    "../common/uni-im-utils": {
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "md5": "^2.3.0"
-      }
-    },
-    "node_modules/common-uni-cloud-push": {
-      "resolved": "../../../../../uniCloud-aliyun/cloudfunctions/common/common-uni-cloud-push",
-      "link": true
-    },
-    "node_modules/uni-config-center": {
-      "resolved": "../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
-      "link": true
-    },
-    "node_modules/uni-id-common": {
-      "resolved": "../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common",
-      "link": true
-    },
-    "node_modules/uni-im-utils": {
-      "resolved": "../common/uni-im-utils",
-      "link": true
-    }
-  },
-  "dependencies": {
-    "common-uni-cloud-push": {
-      "version": "file:../../../../../uniCloud-aliyun/cloudfunctions/common/common-uni-cloud-push"
-    },
-    "uni-config-center": {
-      "version": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
-    },
-    "uni-id-common": {
-      "version": "file:../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common",
-      "requires": {
-        "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
-      },
-      "dependencies": {
-        "uni-config-center": {
-          "version": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
-        }
-      }
-    },
-    "uni-im-utils": {
-      "version": "file:../common/uni-im-utils",
-      "requires": {
-        "md5": "^2.3.0"
-      }
-    }
-  }
-}
diff --git a/uniCloud/cloudfunctions/uni-im-co/push.js b/uniCloud/cloudfunctions/uni-im-co/push.js
index da0374044a1c464cfee3c1ad1694d7ef991e096a..f29f11d1ffb0eeaa333b62cf404bfdeab6589f2b 100644
--- a/uniCloud/cloudfunctions/uni-im-co/push.js
+++ b/uniCloud/cloudfunctions/uni-im-co/push.js
@@ -39,7 +39,7 @@ async function sendPushMsg(param, appId) {
         "/message/android/category": "IM"
       },
       "VV": {
-        "/category": "NORMAL", //二级分类。
+        "/category": "IM", //二级分类。
       },
       "OP": {
         "/channel_id": "114240"
@@ -104,6 +104,12 @@ async function sendPushMsg(param, appId) {
   // console.log('pushParam', pushParam)
   // console.log('pushParam.channel', pushParam.channel)
   
+  // 解决没有购买个推vip套餐，设置推送策略为3无效的问题
+  if (pushParam?.settings?.strategy === 3) {
+    delete pushParam.title
+    delete pushParam.content
+  }
+  
   // 如果是im通知消息（比如：加好友申请，用户请求加群，用户退群等），则记录到数据表uni-im-notification中
   if (param.payload.type == "uni-im-notification") {
     let {
@@ -163,6 +169,7 @@ async function sendPushMsg(param, appId) {
     appId,
     debug: false,
   }).sendMessage(pushParam)
+  console.log('sendPushMsg res', res,pushParam)
   if (res.errCode) {
     console.error(res.errCode);
     console.error(res.errMsg);
diff --git a/uniCloud/database/uni-id-users.schema.ext.js b/uniCloud/database/uni-id-users.schema.ext.js
index 9268332993305896d580e44e6d49694bbc22ce39..7a4cac7d9fc3f765cdb50ce3dc26aeac41dc584a 100644
--- a/uniCloud/database/uni-id-users.schema.ext.js
+++ b/uniCloud/database/uni-id-users.schema.ext.js
@@ -1,6 +1,7 @@
 // schema扩展相关文档请参阅：https://uniapp.dcloud.net.cn/uniCloud/jql-schema-ext.html
 const db = uniCloud.database();
 const dbCmd = db.command
+const {hideUsernameStr,hideEmailStr,hideMobileStr,encrypt,decrypt} = require('uni-im-utils')
 module.exports = {
 	trigger: {
 		async afterReadAsSecondaryCollection(e) {
@@ -18,112 +19,97 @@ async function afterReadAction({
 	userInfo: currentUserInfo,
 	primaryCollection
 } = {}, asSecondaryCollection = false) {
-  let isAdmin = currentUserInfo.role.includes('uni-im-admin') || currentUserInfo.role.includes('admin') || currentUserInfo.role.includes('staff')
-  
-  // 非管理员，只能查看自己的邮箱
-  if(
-    field.includes("email") && !isAdmin &&
-    (result.data.length != 1 || result.data[0]._id != currentUserInfo.uid)
-  ){
-    result.data = result.data.map(item => {
-      item.email = ""
-      return item
+  const { data } = result
+  if (!Array.isArray(data)) {
+  	data = [data]
+  }
+  if(!data?.length) return
+  const isAdmin = currentUserInfo.role.includes('uni-im-admin') || currentUserInfo.role.includes('admin') || currentUserInfo.role.includes('staff')
+  // 处理当前表被作为联查时的副表的情况
+  let userInfos = data
+  if (asSecondaryCollection && typeof(data[0]) == "object" && data[0] != null) {
+    // 完全列举主表表名的值
+  	const foreignKeysObj = {
+  		"uni-im-group-member":"user_id",
+  		"uni-im-friend":"friend_uid"
+  	}
+  	const foreignKey = foreignKeysObj[primaryCollection]
+  	if(foreignKey in data[0]){
+      userInfos = data.map(item => item[foreignKey][0])
+  	}else{
+      throw new Error('触发器uni-id-users.schema.ext.js，未在当前操作生效。请补充：主表表名及其foreignKey的值，到触发器uni-id-users.schema.ext.js的变量foreignKeysObj内');
+  	}
+  }
+ 
+  // 如果不是管理员，且不是仅查自己的信息
+  if (!isAdmin && (userInfos.length != 1 || userInfos[0]._id != currentUserInfo.uid) ){
+    let needHideFields = []
+    if(field.includes("email")){
+      needHideFields.push('email')
+      console.log('非管理员，只能查看自己的邮箱')
+    }
+    if(field.includes("realname_auth")){
+      needHideFields.push('realname_auth')
+      console.log('非管理员，只能查看自己的认证信息')
+    }
+    userInfos.forEach(item => {
+      needHideFields.forEach(field => {
+        delete item[field]
+      })
     })
-    console.log('非管理员，只能查看自己的邮箱')
   }
   
-	if (result && field && field.includes("nickname")) {
-		//uni-im 处理查询nickname，但值为空的情况
-		let {
-			data
-		} = result
-		// 为联查 且为副表时的字段
-    // console.log('data',data);
-		if (asSecondaryCollection && typeof(data[0]) == "object") {
-			let foreignKeysObj = {
-				"uni-im-group-member":"user_id",
-				"uni-im-friend":"friend_uid"
-			}
-			let foreignKey = foreignKeysObj[primaryCollection]
-			
-			if(foreignKey in data[0]){
-				data = data.map(item => item[foreignKey][0])
-        data = data.filter(item => item != undefined)
-			}else{
-				return console.log('触发器uni-id-users.schema.ext.js，未在当前操作生效。如需应用此触发器，请补充：主表表名及其foreignKey的值，到触发器uni-id-users.schema.ext.js的变量foreignKeysObj内');
-			}
-		}
-
-		// console.log('data',data);
-		if (!Array.isArray(data)) {
-			data = [data]
-		}
-		// 记录没有nickname的用户id
-		let user_ids = [],
-			usersInfo = {};
-		data.forEach(item => {
-			if (item && !item.nickname) {
-				user_ids.push(item._id)
-			}
-		})
-		if (user_ids.length) {
-			console.info('注意：uni-im项目用户数据依赖nickname。有' + user_ids.length +
-				`个用户数据 nickname 的值为空，已多执行一次数据库查询：将此用户的“用户名”或“邮箱”或“手机号”脱敏后，作为nickname输出。请引导用户完善nickname，减少查库次数`)
-			let res = await db.collection('uni-id-users')
-				.where({
-					_id: dbCmd.in(user_ids)
-				})
-				.field({
-					username: true,
-					email: true,
-					mobile: true
-				})
-				.limit(1000)
-				.get()
-			usersInfo = res.data.reduce((sum, current) => {
-				sum[current._id] = current
-				return sum
-			}, {})
-		}
+  userInfos.forEach(item => {
+    const real_name = item?.realname_auth?.real_name
+    // 如果real_name以uni-im-encrypt:开头
+    if (real_name?.startsWith('uni-im-encrypt:')) {
+      // console.error('解密real_name',real_name,item._id)
+      item.realname_auth.real_name = decrypt(real_name)
+      // console.error('解密后real_name',item.realname_auth.real_name)
+    }
+  })
+  
+  if (field?.includes("nickname")) {
+  	//uni-im 处理查询nickname，但值为空的情况
+  	// 记录没有nickname的用户id
+  	const user_ids = userInfos.filter(item => !item.nickname).map(item => item._id)
+  	let	usersInfo = {};
+  	if (user_ids.length) {
+  		console.info('注意：uni-im项目用户数据依赖nickname。有' + user_ids.length +
+  			`个用户数据 nickname 的值为空，已多执行一次数据库查询：将此用户的“用户名”或“邮箱”或“手机号”脱敏后，作为nickname输出。请引导用户完善nickname，减少查库次数`)
+  		let res = await db.collection('uni-id-users')
+  			.where({
+  				_id: dbCmd.in(user_ids)
+  			})
+  			.field({
+  				username: true,
+  				email: true,
+  				mobile: true
+  			})
+  			.limit(1000)
+  			.get()
+  		usersInfo = res.data.reduce((sum, current) => {
+  			sum[current._id] = current
+  			return sum
+  		}, {})
+      console.error('---usersInfo',usersInfo)
+  	}
     
-		data.forEach(item => {
-			if (!item.nickname) {
-				let userInfo = usersInfo[item._id]
-				// 管理员可以看到不打码的
-				if (isAdmin) {
-					item.nickname = userInfo.username || userInfo.email || userInfo.mobile
-				}else{
-					item.nickname = hideUsernameStr(userInfo.username) || hideEmailStr(userInfo.email) ||
-											hideMobileStr(userInfo.mobile)
-				}
-			}else if(!isAdmin && item.nickname.includes('@')){
-				// 禁止昵称用邮箱 脱敏处理
-				item.nickname = hideEmailStr(item.nickname)
-			}
-		})
-
-		function hideUsernameStr(username) {
-			if (username == undefined) {
-				return false
-			}
-			let length = username.length
-			let n = parseInt(length / 2.5) * 2
-			return username.substr(0, length - n) + '**' + username.substr(-1 * n / 2)
-		}
-
-		function hideEmailStr(email) {
-			if (email == undefined) {
-				return false
-			}
-			const content = email.split("@")
-			return content[0].substr(0, content[0].length - 2) + '**' + content[1]
-		}
-
-		function hideMobileStr(mobile) {
-			if (mobile == undefined) {
-				return false
-			}
-			return mobile.substr(0, 3) + '****' + mobile.substr(-1 * 4)
-		}
-	}
+  	userInfos.forEach(item => {
+  		if (!item.nickname) {
+  			const userInfo = usersInfo[item._id]
+  			// 管理员可以看到不打码的
+  			if (isAdmin) {
+          console.log('userInfo',userInfo,'item',item)
+  				item.nickname = userInfo?.username || userInfo?.email || userInfo?.mobile
+  			}else{
+  				item.nickname = hideUsernameStr(userInfo.username) || hideEmailStr(userInfo.email) ||
+  										hideMobileStr(userInfo.mobile)
+  			}
+  		}else if(!isAdmin && item.nickname.includes('@')){
+  			// 如果昵称为邮箱则脱敏处理
+  			item.nickname = hideEmailStr(item.nickname)
+  		}
+  	})
+  }
 }
\ No newline at end of file
diff --git a/uniCloud/database/uni-im-conversation.index.json b/uniCloud/database/uni-im-conversation.index.json
index d1d93b6ee86005f5151ac33544d0cdbd390b780c..f9cf6808ca2fdf902acba97527b4c33f18a7fd34 100644
--- a/uniCloud/database/uni-im-conversation.index.json
+++ b/uniCloud/database/uni-im-conversation.index.json
@@ -1,57 +1,47 @@
-[
-  {
+[{
     "IndexName": "user_id_1",
     "MgoKeySchema": {
-      "MgoIndexKeys": [
-        {
-          "Name": "user_id",
-          "Direction": "1"
-        }
-      ],
+      "MgoIndexKeys": [{
+        "Name": "user_id",
+        "Direction": "1"
+      }],
       "MgoIsUnique": false
     }
   },
   {
     "IndexName": "friend_uid_1",
     "MgoKeySchema": {
-      "MgoIndexKeys": [
-        {
-          "Name": "friend_uid",
-          "Direction": "-1"
-        }
-      ],
+      "MgoIndexKeys": [{
+        "Name": "friend_uid",
+        "Direction": "-1"
+      }],
       "MgoIsUnique": false
     }
   },
   {
     "IndexName": "group_id_1",
     "MgoKeySchema": {
-      "MgoIndexKeys": [
-        {
-          "Name": "group_id",
-          "Direction": "-1"
-        }
-      ],
+      "MgoIndexKeys": [{
+        "Name": "group_id",
+        "Direction": "-1"
+      }],
       "MgoIsUnique": false
     }
   },
   {
     "IndexName": "update_time_1",
     "MgoKeySchema": {
-      "MgoIndexKeys": [
-        {
-          "Name": "update_time",
-          "Direction": "-1"
-        }
-      ],
+      "MgoIndexKeys": [{
+        "Name": "update_time",
+        "Direction": "-1"
+      }],
       "MgoIsUnique": false
     }
   },
   {
     "IndexName": "id_1_user_id_1",
     "MgoKeySchema": {
-      "MgoIndexKeys": [
-        {
+      "MgoIndexKeys": [{
           "Name": "user_id",
           "Direction": "-1"
         },
@@ -66,33 +56,64 @@
   {
     "IndexName": "id_1",
     "MgoKeySchema": {
-      "MgoIndexKeys": [
-        {
-          "Name": "id",
-          "Direction": "-1"
-        }
-      ],
+      "MgoIndexKeys": [{
+        "Name": "id",
+        "Direction": "-1"
+      }],
       "MgoIsUnique": false
     }
   },
   {
     "IndexName": "leave_1",
     "MgoKeySchema": {
-      "MgoIndexKeys": [
-        {
-          "Name": "leave",
-          "Direction": "-1"
-        }
-      ],
+      "MgoIndexKeys": [{
+        "Name": "leave",
+        "Direction": "-1"
+      }],
       "MgoIsUnique": false
     }
   },
   {
     "IndexName": "unread_count_1",
     "MgoKeySchema": {
-      "MgoIndexKeys": [
+      "MgoIndexKeys": [{
+        "Name": "unread_count",
+        "Direction": "-1"
+      }],
+      "MgoIsUnique": false
+    }
+  },
+  {
+    "IndexName": "leave_1",
+    "MgoKeySchema": {
+      "MgoIndexKeys": [{
+        "Name": "leave",
+        "Direction": "-1"
+      }],
+      "MgoIsUnique": false
+    }
+  },
+  {
+    "IndexName": "loadMoreConversation_1",
+    "MgoKeySchema": {
+      "MgoIndexKeys": [{
+          "Name": "user_id",
+          "Direction": "-1"
+        },
         {
-          "Name": "unread_count",
+          "Name": "pinned",
+          "Direction": "-1"
+        },
+        {
+          "Name": "leave",
+          "Direction": "-1"
+        },
+        {
+          "Name": "hidden",
+          "Direction": "-1"
+        },
+        {
+          "Name": "update_time",
           "Direction": "-1"
         }
       ],
@@ -100,12 +121,27 @@
     }
   },
   {
-    "IndexName": "leave_1",
+    "IndexName": "loadMoreConversation_2",
     "MgoKeySchema": {
-      "MgoIndexKeys": [
+      "MgoIndexKeys": [{
+          "Name": "user_id",
+          "Direction": "-1"
+        },
+        {
+          "Name": "pinned",
+          "Direction": "-1"
+        },
         {
           "Name": "leave",
           "Direction": "-1"
+        },
+        {
+          "Name": "hidden",
+          "Direction": "-1"
+        },
+        {
+          "Name": "last_msg_create_time",
+          "Direction": "-1"
         }
       ],
       "MgoIsUnique": false
diff --git a/uniCloud/database/uni-im-conversation.schema.ext.js b/uniCloud/database/uni-im-conversation.schema.ext.js
index 4ab1402d7487153251d3dbf47db443fbaa5be79b..5b89a780fb40e5e80550cd84ebbaeb73cc6c1a69 100644
--- a/uniCloud/database/uni-im-conversation.schema.ext.js
+++ b/uniCloud/database/uni-im-conversation.schema.ext.js
@@ -57,7 +57,7 @@ module.exports = {
 		},
 		async beforeUpdate({where,updateData,userInfo}){
       //只开放部分字段
-      let canUpdateField = ["unread_count","pinned","hidden","mute","has_unread_group_notification"]
+      let canUpdateField = ["unread_count","pinned","hidden","mute","has_unread_group_notification","is_star"]
       Object.keys(updateData).forEach(field=>{
         if(!canUpdateField.includes(field)){
           throw new Error('uni-im-conversation.schema.ext.js beforeUpdate:限制只能更新的字段：'+canUpdateField.join('，'))
diff --git a/uniCloud/database/uni-im-conversation.schema.json b/uniCloud/database/uni-im-conversation.schema.json
index e54953d0ab05d009c8d95006413c972ed9337c95..e5674b75798daabd1454afe2230e4b68a1d502d2 100644
--- a/uniCloud/database/uni-im-conversation.schema.json
+++ b/uniCloud/database/uni-im-conversation.schema.json
@@ -53,6 +53,13 @@
 		"last_msg_note": {
 			"description": "最后一条消息概述（文本消息的前n个字，消息为多媒体时只描述类型）"
 		},
+    "last_msg_create_time": {
+      "bsonType": "timestamp",
+      "description": "最后一条消息的创建时间",
+      "defaultValue":{
+        "$env":"now"
+      }
+    },
 		"update_time": {
 			"bsonType": "timestamp",
 			"description": "最后一次会话时间",
@@ -77,6 +84,11 @@
       "description": "是否固定在顶部",
       "defaultValue": false
     },
+    "is_star":{
+      "bsonType": "bool",
+      "description": "是否标星",
+      "defaultValue": false
+    },
     "hidden":{
       "bsonType": "bool",
       "description": "是否隐藏（右键移除会话）",
diff --git a/uniCloud/database/uni-im-friend.schema.ext.js b/uniCloud/database/uni-im-friend.schema.ext.js
index ce213c8988235c6fe87493ab3b5a3e550ea97616..21f5e94eae72064453e197ad1db01b6b1939df45 100644
--- a/uniCloud/database/uni-im-friend.schema.ext.js
+++ b/uniCloud/database/uni-im-friend.schema.ext.js
@@ -2,7 +2,6 @@ const { getConversationId } = require('uni-im-utils')
 
 // schema扩展相关文档请参阅：https://uniapp.dcloud.net.cn/uniCloud/jql-schema-ext.html
 const db = uniCloud.database();
-const dbCmd = db.command
 module.exports = {
 	trigger: {
 		async afterCreate({
@@ -24,7 +23,7 @@ module.exports = {
 				})
 				
 				let {data:userList} = await dbJQL.collection('uni-id-users').where({
-					"_id":dbCmd.in([friend_uid,user_id])
+					"_id":dbJQL.command.in([friend_uid,user_id])
 				})
 				.field('_id,nickname,avatar_file')
 				.get()
@@ -110,7 +109,7 @@ module.exports = {
 						clientInfo
 					})
 					let {data:userList} = await dbJQL.collection('uni-id-users').where({
-						"_id":dbCmd.in([friend_uid,user_id])
+						"_id":dbJQL.command.in([friend_uid,user_id])
 					})
 					.field('_id,nickname,avatar_file')
 					.get()
@@ -176,7 +175,6 @@ module.exports = {
 			}
 		},
 		async afterRead({result}){
-			// 数据脱敏处理
 			result.data.forEach(item=>{
 				let friendInfo = item.friend_uid[0]
 			})
diff --git a/uniCloud/database/uni-im-group-join.schema.ext.js b/uniCloud/database/uni-im-group-join.schema.ext.js
index 93c8c8215086892f726ccad30be590257c618e59..dbd02a899ed427007fd2dc0dc4215ac8fa83ceac 100644
--- a/uniCloud/database/uni-im-group-join.schema.ext.js
+++ b/uniCloud/database/uni-im-group-join.schema.ext.js
@@ -1,42 +1,50 @@
-// schema扩展相关文档请参阅：https://uniapp.dcloud.net.cn/uniCloud/jql-schema-ext.html
-const db = uniCloud.database()
-let t = Date.now() + parseInt(Math.random() * 999999)
-
-module.exports = {
-	trigger: {
-		async beforeCreate({
-			addDataList,
+// schema扩展相关文档请参阅：https://uniapp.dcloud.net.cn/uniCloud/jql-schema-ext.html
+const db = uniCloud.database()
+let t = Date.now() + parseInt(Math.random() * 999999)
+
+module.exports = {
+	trigger: {
+		async beforeCreate({
+			addDataList,
 			clientInfo,
       triggerContext,
-      userInfo
-		}) {
-			const dbJQL = uniCloud.databaseForJQL({clientInfo})
-			if (addDataList.length === 1) {
-				let [{
-					group_id
-				}] = addDataList
-				// 1. 群是否存在，并获取群信息
-				let res = await db.collection('uni-im-group').doc(group_id).get()
-				if (res.data.length == 0) {
-					throw new Error('非法群id')
-				}
-				// console.log('res.data', res.data);
+      userInfo
+		}) {
+			const dbJQL = uniCloud.databaseForJQL({clientInfo})
+			if (addDataList.length === 1) {
+				let [{
+					group_id
+				}] = addDataList
+        
+        // 1. 如果用户已经加群，直接抛出 new Error('已经是群成员')
+        let res = await dbJQL.collection('uni-im-group-member')
+        	.where(`"group_id" == "${group_id}" && "user_id" == $cloudEnv_uid && is_delete != true`)
+        	.get()
+        if (res.data.length != 0) {
+          const errorObj = new Error()
+          errorObj.message = '已经是群成员'
+          errorObj.code = 10001
+        	throw errorObj
+        }
+        
+				// 2. 拉取群资料，同时验证了群id的合法性
+				res = await db.collection('uni-im-group').doc(group_id).get()
+				if (res.data.length == 0) {
+					throw new Error('非法群id')
+				}else if (res.data[0].is_delete) {
+          throw new Error('此群已解散')
+        }
+        
+				// console.log('res.data', res.data);
 				const groupInfo = res.data[0]
-        triggerContext.group_info = groupInfo
-				
-				if (groupInfo.join_option == "disableApply") {
-					throw new Error('此群禁止任何人申请加入')
-				}else{
-					//到after中处理
-				}
-
-				// 2. 判断是不是本身已经是群成员
-				res = await dbJQL.collection('uni-im-group-member')
-					.where(`"group_id" == "${group_id}" && "user_id" == $cloudEnv_uid`)
-					.get()
-				if (res.data.length != 0) {
-					throw new Error('已经是群成员')
+        triggerContext.group = groupInfo
+				
+				if (groupInfo.join_option == "disableApply") {
+					throw new Error('此群禁止任何人申请加入')
+				}else{
+					//到after中处理
 				}
+				
         // 3. 判断用户是否被拉黑
         let res2 = await db.collection('uni-im-group-member-black')
         									.where({
@@ -47,163 +55,163 @@ module.exports = {
         if(res2.data.length > 0){
           throw new Error('你已被拉黑，不能加入此群')
         }
-        // 4. uni-ad群特殊判断
-        if(groupInfo._id === "65d85fc09847e92db03ff81a"){
-          const uniImAd = uniCloud.importObject("uni-im-ad")
-          let res = await uniImAd.beforeJoinUniAdGroup(userInfo.uid)
-          if(res.code){
-            throw new Error(res.errMsg)
-          }
-        }
-        // 5. 判断用户是否已经绑定手机号，系统管理员除外
+        // 4. 判断用户是否已经绑定手机号，系统管理员除外
         console.log('userInfo',userInfo);
         if(!userInfo.role.includes('uni-im-admin') && !userInfo.role.includes('staff')){
           let res3 = await db.collection('uni-id-users').where({_id:userInfo.uid}).get()
           if(!res3.data[0].mobile_confirmed){
-            throw new Error('你的账号未绑定手机号，不能加入群聊')
+            throw new Error('账号未绑定手机号无法加入群聊。请完成绑定后退出本系统并重新登录，再尝试加入群聊。')
           }
         }
-			} else {
-				throw new Error('非法参数')
-			}
-		},
-		async afterCreate({
-			addDataList,
-			clientInfo,
+			} else {
+				throw new Error('非法参数')
+			}
+		},
+		async afterCreate({
+			addDataList,
+			clientInfo,
 			result,
-      triggerContext
-		}) {
-			let [{
-				_id,user_id,group_id,message
-			}] = addDataList
-			// console.log('addDataList',addDataList);
-			// console.log('clientInfo',clientInfo);
-			const groupInfo = triggerContext.group_info
+      triggerContext
+		}) {
+			let [{
+				_id,user_id,group_id,message
+			}] = addDataList
+			// console.log('addDataList',addDataList);
+			// console.log('clientInfo',clientInfo);
+			const groupInfo = triggerContext.group
 			const dbJQL = uniCloud.databaseForJQL({clientInfo})
       // 是否已经通过
-      result.isPass = false
+      result.isPass = false
 			if (groupInfo.join_option == "freeAccess") {
-        result.isPass = true
-				dbJQL.setUser({
-					uid: user_id,
-					role: ['admin'],
-					permission: []
-				})
-				//直接给通过
-				await dbJQL.collection('uni-im-group-join').where({
-					user_id,group_id
-				}).update({
-					state: 100
+        result.isPass = true
+				dbJQL.setUser({
+					uid: user_id,
+					role: ['admin'],
+					permission: []
+				})
+				//直接给通过
+				await dbJQL.collection('uni-im-group-join').where({
+					user_id,group_id
+				}).update({
+					state: 100
+				})
+        result.isPass = true
+			} else if(groupInfo.join_option == "needPermission"){
+				let {
+					data: [userInfo]
+				} = await dbJQL.collection('uni-id-users')
+					.where(`"_id" == $cloudEnv_uid`)
+					.field('nickname,_id,avatar_file')
+					.get()
+				console.log(userInfo);
+				let title = userInfo.nickname,
+					content = "申请加入 "+groupInfo.name +	"\n" + message
+				let pushParam = {
+					"user_id": groupInfo.user_id, //群创建人id，后续升级为所有群管理员id
+					"payload": {
+						type: "uni-im-notification", // im消息通知，比如加好友请求，有用户退群等
+						subType: "uni-im-group-join-request", // 通知子类型（可选）
+						confirmText: "同意", // 确认按钮的文字（可选）
+						cancelText: "拒绝", // 取消按钮的文字（可选）
+						state: false, // 是否已经处理过 false 未处理，confirm：已确认，cancel：已拒绝（可选）
+						unique: userInfo._id + '_' + groupInfo._id, // 去重字段，比如同一个用户重复申请加好友，通知数据始终只显示一条，但是会通知多次（可选）
+						data: { // 自定义的其他参数（可选）
+							userInfo,
+							groupInfo,
+							doc_id:result.id
+						},
+						avatar_file: userInfo.avatar_file, // 头像或图标的图片地址，支持Base64
+					},
+					title,
+					content
+				}
+				// console.log(123, pushParam);
+				//发消息通知群主，有用户申请加入群聊
+				const uniImCo = uniCloud.importObject("uni-im-co")
+				res = await uniImCo.sendPushMsg(pushParam,clientInfo.appId)
+				// console.log(8989989, res);
+				
+				// 删除之前提交的
+				// res = await db.collection('uni-im-group-join')
+				// 	.where({
+				// 		group_id,
+				// 		user_id: userInfo._id
+				// 	})
+				// 	.remove()
+				// console.log('res 把旧的删了',res);
+			}
+		},
+		async beforeRead({
+			where,
+			clientInfo
+		}) {
+			//获取自己的加群列表不走clientDB
+
+			/*
+			// let {group_id} = where
+			console.log('where:',where)
+			let {data:[item]} = await db.collection('uni-im-group-member').where({group_id}).get()
+			if(!item.role.includes('admin')){
+				throw new Error('仅群管理员可见')
+			}
+			where.group_id*/
+		},
+		async beforeUpdate({
+			where,
+			updateData,
+			clientInfo,
+			userInfo
+		}) {
+			// console.log(123,'where',where)
+			if (updateData.state == 100) {
+				let {
+					data: [item]
+				} = await db.collection('uni-im-group-join').where(where).get()
+				// console.log(item,clientInfo);
+				const {
+					user_id,
+					group_id
+				} = item
+				// console.log({group_id,user_id});
+				// 判断操作者，必须是应用管理员（可由触发器触发时会设置role为admin）或者是群的管理员
+				if(!userInfo.role.includes('admin') ){
+					let res = await db.collection('uni-im-group-member')
+													.where({group_id,user_id:userInfo.uid})
+													.get()
+					console.log('---',res.data);
+					if( !(res.data[0] && res.data[0].role.includes('admin')) ){
+						throw Error('没有权限')
+					}
+				}
+        
+        // TODO：由于支付宝云版uniCloud，唯一索引插入数据并不会抛出异常，所以这里要先查询是否已经在群里
+        let hasInGroup = await db.collection('uni-im-group-member')
+          .where({group_id,user_id})
+          .get()
+        if (hasInGroup.data.length !== 0) {
+          return console.error('用户已经在群里')
+        }
+				
+				const dbJQL = uniCloud.databaseForJQL({
+					clientInfo,
+					// skipTrigger: 
+				})
+				// 添加操作权限
+				dbJQL.setUser({
+					uid: userInfo.uid, // 建议此处使用真实uid
+					role: ['admin'], // 指定当前执行用户的角色为admin。如果只希望指定为admin身份，可以删除uid和permission节点
+					permission: []
+				})
+				//成为群成员
+				let res = await dbJQL.collection('uni-im-group-member').add({
+					group_id,
+					user_id,
 				})
-        result.isPass = true
-			} else if(groupInfo.join_option == "needPermission"){
-				let {
-					data: [userInfo]
-				} = await dbJQL.collection('uni-id-users')
-					.where(`"_id" == $cloudEnv_uid`)
-					.field('nickname,_id,avatar_file')
-					.get()
-				console.log(userInfo);
-				let title = userInfo.nickname,
-					content = "申请加入 "+groupInfo.name +	"\n" + message
-				let pushParam = {
-					"user_id": groupInfo.user_id, //群创建人id，后续升级为所有群管理员id
-					"payload": {
-						type: "uni-im-notification", // im消息通知，比如加好友请求，有用户退群等
-						subType: "uni-im-group-join-request", // 通知子类型（可选）
-						confirmText: "同意", // 确认按钮的文字（可选）
-						cancelText: "拒绝", // 取消按钮的文字（可选）
-						state: false, // 是否已经处理过 false 未处理，confirm：已确认，cancel：已拒绝（可选）
-						unique: userInfo._id + '_' + groupInfo._id, // 去重字段，比如同一个用户重复申请加好友，通知数据始终只显示一条，但是会通知多次（可选）
-						data: { // 自定义的其他参数（可选）
-							userInfo,
-							groupInfo,
-							doc_id:result.id
-						},
-						avatar_file: userInfo.avatar_file, // 头像或图标的图片地址，支持Base64
-					},
-					title,
-					content
-				}
-				// console.log(123, pushParam);
-				//发消息通知群主，有用户申请加入群聊
-				const uniImCo = uniCloud.importObject("uni-im-co")
-				res = await uniImCo.sendPushMsg(pushParam,clientInfo.appId)
-				// console.log(8989989, res);
-				
-				// 删除之前提交的
-				// res = await db.collection('uni-im-group-join')
-				// 	.where({
-				// 		group_id,
-				// 		user_id: userInfo._id
-				// 	})
-				// 	.remove()
-				// console.log('res 把旧的删了',res);
-			}
-		},
-		async beforeRead({
-			where,
-			clientInfo
-		}) {
-			//获取自己的加群列表不走clientDB
-
-			/*
-			// let {group_id} = where
-			console.log('where:',where)
-			let {data:[item]} = await db.collection('uni-im-group-member').where({group_id}).get()
-			if(!item.role.includes('admin')){
-				throw new Error('仅群管理员可见')
-			}
-			where.group_id*/
-		},
-		async beforeUpdate({
-			where,
-			updateData,
-			clientInfo,
-			userInfo
-		}) {
-			// console.log(123,'where',where)
-			if (updateData.state == 100) {
-				let {
-					data: [item]
-				} = await db.collection('uni-im-group-join').where(where).get()
-				// console.log(item,clientInfo);
-				const {
-					user_id,
-					group_id
-				} = item
-				// console.log({group_id,user_id});
-				// 判断操作者，必须是应用管理员（可由触发器触发时会设置role为admin）或者是群的管理员
-				if(!userInfo.role.includes('admin') ){
-					let res = await db.collection('uni-im-group-member')
-													.where({group_id,user_id:userInfo.uid})
-													.get()
-					console.log('---',res.data);
-					if( !(res.data[0] && res.data[0].role.includes('admin')) ){
-						throw Error('没有权限')
-					}
-				}
-				
-				const dbJQL = uniCloud.databaseForJQL({
-					clientInfo,
-					// skipTrigger: 
-				})
-				// 添加操作权限
-				dbJQL.setUser({
-					uid: userInfo.uid, // 建议此处使用真实uid
-					role: ['admin'], // 指定当前执行用户的角色为admin。如果只希望指定为admin身份，可以删除uid和permission节点
-					permission: []
-				})
-				//成为群成员
-				let res = await dbJQL.collection('uni-im-group-member').add({
-					group_id,
-					user_id,
-				})
-				// console.log('next', {
-				// 	res,
-				// 	updateData
-				// });
-			}
-		}
-	}
-}
+				// console.log('next', {
+				// 	res,
+				// 	updateData
+				// });
+			}
+		}
+	}
+}
diff --git a/uniCloud/database/uni-im-group-member.schema.ext.js b/uniCloud/database/uni-im-group-member.schema.ext.js
index 32002576c69072a4d7c8e035ba4c6f590980ce36..9420064d444f54fe2cbc233a22fa5ffe02f95feb 100644
--- a/uniCloud/database/uni-im-group-member.schema.ext.js
+++ b/uniCloud/database/uni-im-group-member.schema.ext.js
@@ -52,32 +52,55 @@ module.exports = {
       if (res.data.length == 0) {
       	throw new Error('非法群id')
       }
+      triggerContext.groupInfo = res.data[0]
     },
 		async afterCreate({
 			addDataList,
 			clientInfo,
       userInfo,
       result,
+      triggerContext
 		}) {
       // before中已校验： jql方式创建uni-im-group-member，️只能创建一条数据 
 			let [addData] = addDataList
       addData._id = result.id
+      const {user_id,group_id} = addData
       // 通知所有群成员，有用户加入群聊
       console.log('通知所有群成员，有用户加入群聊')
       const msgData = {
       	body:{
           new_member_list:[addData],
           // 冗余字段记录成员id，方便客户端显示
-          user_id_list:[addData.user_id]
+          user_id_list:[user_id]
         },
         action:"join-group",
       	type:"system",
       	create_time: Date.now(),
-      	conversation_id:"group_" + addData.group_id,
-      	group_id:addData.group_id,
+      	conversation_id:"group_" + group_id,
+      	group_id,
         appId:clientInfo.appId
       }
-      await uniImCo.sendMsg(msgData,addData.user_id)
+      // 更新群成员数量
+      await db.collection('uni-im-group')
+              .doc(group_id)
+              .update({
+                member_count:db.command.inc(1)
+              })
+      await uniImCo.sendMsg(msgData,user_id)
+      if(triggerContext.groupInfo?.type === "dcloud-plugin"){
+        // 刷新记录在im系统中的 插件订单信息
+        try{
+          console.error('加入了dcloud-plugin',triggerContext.groupInfo)
+          const uniImRobot = uniCloud.importObject("uni-im-robot")
+          await uniImRobot.refreshPluginOrder({
+            plugin_id:triggerContext.groupInfo.ext.dcloud_plugin_id,
+            user_id,
+            group_id
+          })
+        }catch(e){
+          console.error('刷新记录在im系统中的 插件订单信息 错误',e)
+        }
+      }
 		},
 		async beforeDelete({
 			where,
@@ -158,6 +181,12 @@ module.exports = {
 				user_id
 			}).remove()
 			// console.error('Delete uni-im-conversation:', res, where);
+      // 更新群成员数量
+      await db.collection('uni-im-group')
+              .doc(group_id)
+              .update({
+                member_count:db.command.inc(-1)
+              })
 		},
     async beforeUpdate({where,updateData,userInfo,docId,clientInfo}){
       
diff --git a/uniCloud/database/uni-im-group-member.schema.json b/uniCloud/database/uni-im-group-member.schema.json
index 34168cd3962d40bfeb9091d0cb9d84d20797186c..0b15173a8bf5a3dd0755ff614a51aeb903d69ffa 100644
--- a/uniCloud/database/uni-im-group-member.schema.json
+++ b/uniCloud/database/uni-im-group-member.schema.json
@@ -52,6 +52,10 @@
     "active_time": {
       "bsonType": "timestamp",
       "description": "活跃时间（最后一场发消息时间）"
+    },
+    "ext":{
+      "bsonType": "object",
+      "description": "扩展字段"
     }
 	}
 }
\ No newline at end of file
diff --git a/uniCloud/database/uni-im-group-type.schema.json b/uniCloud/database/uni-im-group-type.schema.json
new file mode 100644
index 0000000000000000000000000000000000000000..877ea4ccac71b6a4848c5b87f30be911240bc834
--- /dev/null
+++ b/uniCloud/database/uni-im-group-type.schema.json
@@ -0,0 +1,45 @@
+// 文档教程: https://uniapp.dcloud.net.cn/uniCloud/schema
+{
+	"bsonType": "object",
+	"required": ["code","description"],
+	"permission": {
+		"read": true,
+		"create": false,
+		"update": false,
+		"delete": false
+	},
+	"properties": {
+		"_id": {
+			"description": "ID，系统自动生成"
+		},
+    "code": {
+      "description": "编码",
+      "bsonType": "string"
+    },
+    "description": {
+      "bsonType": "string",
+      "description": "描述"
+    },
+    "create_time": {
+      "bsonType": "timestamp",
+      "description": "创建时间",
+      "forceDefaultValue": {
+        "$env": "now"
+      }
+    },
+    "update_time": {
+      "bsonType": "timestamp",
+      "description": "更新时间",
+      "forceDefaultValue": {
+        "$env": "now"
+      }
+    },
+    "create_uid": {
+      "description": "创建人",
+      "bsonType": "string",
+      "forceDefaultValue": {
+        "$env": "uid"
+      }
+    }
+	}
+}
\ No newline at end of file
diff --git a/uniCloud/database/uni-im-group.schema.ext.js b/uniCloud/database/uni-im-group.schema.ext.js
index 33ee9007443e7033dcfbc80e9607ddecaf5e294b..3f8001375b94ee02a5adb0c0f5de49c4c0c4983d 100644
--- a/uniCloud/database/uni-im-group.schema.ext.js
+++ b/uniCloud/database/uni-im-group.schema.ext.js
@@ -9,17 +9,19 @@ module.exports = {
         throw new Error('jql方式更新uni-im-group，️必须传入群ID')
       }
       
-      // 判断是不是此群的管理员
-      let getGroupMemberRes = await db.collection('uni-im-group-member').where({
-        group_id,
-        user_id:userInfo.uid
-      }).get()
-      console.log('getGroupMemberRes',getGroupMemberRes)
-      const [groupMember] = getGroupMemberRes.data
-      if(!groupMember){
-        throw Error('非法操作，不是群成员')
-      }else if(!groupMember.role.includes('admin')){
-        throw Error('非法操作，不是管理员')
+      if(userInfo.uid != 'system'){
+        // 判断是不是此群的管理员
+        let getGroupMemberRes = await db.collection('uni-im-group-member').where({
+          group_id,
+          user_id:userInfo.uid
+        }).get()
+        console.log('getGroupMemberRes',getGroupMemberRes)
+        const [groupMember] = getGroupMemberRes.data
+        if(!groupMember){
+          throw Error('非法操作，不是群成员')
+        }else if(!groupMember.role.includes('admin')){
+          throw Error('非法操作，不是管理员')
+        }
       }
      
       let field = Object.keys(updateData)[0]
@@ -110,6 +112,11 @@ module.exports = {
         }
       }
       await uniImCo.sendMsg(msgData,userInfo.uid)
+      // 临时方案 加一条被软删除的群记录
+      await db.collection('uni-im-group').add({
+        ...triggerContext.groupInfo,
+        is_delete:true
+      })
 		}
 	}
 }
diff --git a/uniCloud/database/uni-im-group.schema.json b/uniCloud/database/uni-im-group.schema.json
index 5c4db80d884b522c1e3bd2ee552a93bd69e38022..16bad6ae593cd84f52f501b2439443985fb12aeb 100644
--- a/uniCloud/database/uni-im-group.schema.json
+++ b/uniCloud/database/uni-im-group.schema.json
@@ -82,6 +82,11 @@
     "ext":{
       "bsonType": "object",
       "description": "自定义数据"
+    },
+    // 群成员总数
+    "member_count": {
+      "bsonType": "int",
+      "description": "群成员总数"
     }
 	}
 }
\ No newline at end of file
diff --git a/uniCloud/database/uni-im-msg.schema.json b/uniCloud/database/uni-im-msg.schema.json
index 5397c466d3e2b545ba33ab74cbeef6a4d24c8cbe..9d16c674abc5aee7655bb8ace9072c5288d1a53d 100644
--- a/uniCloud/database/uni-im-msg.schema.json
+++ b/uniCloud/database/uni-im-msg.schema.json
@@ -23,6 +23,14 @@
         "$env": "uid"
       }
     },
+    "nickname": {
+    	"bsonType": "string",
+    	"description": "冗余的消息发送者昵称"
+    },
+    "avatar_file": {
+    	"bsonType": "file",
+    	"title": "冗余的消息发送者头像文件"
+    },
     "to_uid": {
       "bsonType": "string",
       "description": "消息接收方 UserID"