From 846031a5cb7caecb1c2079c7f79d1efe63c7047b Mon Sep 17 00:00:00 2001
From: Phoenix <64720302+Concur-max@users.noreply.github.com>
Date: Tue, 20 May 2025 10:21:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=84=E4=BB=B6=E5=A3=B0?=
 =?UTF-8?q?=E6=98=8E=EF=BC=8C=E6=96=B0=E5=A2=9ENTag=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=EF=BC=9B=E8=B0=83=E6=95=B4ContactModal.vue=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E5=96=84=E4=BC=9A=E8=AF=9D=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=9B=E6=B3=A8=E9=87=8A=E6=8E=89vite.conf?=
 =?UTF-8?q?ig.ts=E4=B8=AD=E7=9A=84vueDevTools=E9=85=8D=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                      |  1 +
 src/components/user/ContactModal.vue | 15 +++++++++++----
 vite.config.ts                       |  6 +++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 41918d5..e34b33b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -62,6 +62,7 @@ declare module 'vue' {
     NotificationApi: typeof import('./src/components/common/NotificationApi.vue')['default']
     NRadio: typeof import('naive-ui')['NRadio']
     NSpin: typeof import('naive-ui')['NSpin']
+    NTag: typeof import('naive-ui')['NTag']
     NVirtualList: typeof import('naive-ui')['NVirtualList']
     RevokeMessage: typeof import('./src/components/talk/message/RevokeMessage.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/user/ContactModal.vue b/src/components/user/ContactModal.vue
index 44c4215..27b071b 100644
--- a/src/components/user/ContactModal.vue
+++ b/src/components/user/ContactModal.vue
@@ -185,7 +185,7 @@ if(newVal){
                   </div>
                   <div class="mr-10px">
                     
-                    <avatarModule class="mr-10px"   :mode="item.talk_type"
+                    <avatarModule class="mr-10px" showGroupType   :mode="item.talk_type"
               :avatar="item.avatar"
               :groupType="item.group_type"
               :customStyle="{width:'42px',height:'42px'}"></avatarModule>
@@ -213,7 +213,10 @@ if(newVal){
                 <template #default="{ item }">
                   <div class="flex items-center border-b-2px border-b-solid h-65px border-b-#FBFBFB pr-20px">
                     <div class="mr-10px">
-                      <n-image class="w-42px h-42px rounded-full" :src="item.avatar" />
+                      <avatarModule class="mr-10px" showGroupType   :mode="item.talk_type"
+              :avatar="item.avatar"
+              :groupType="item.group_type"
+              :customStyle="{width:'42px',height:'42px'}"></avatarModule>
                     </div>
                     <div class="flex items-center">
                       <span class="text-ellipsis">{{ item.name }}</span>
@@ -238,8 +241,12 @@ if(newVal){
             <div class="text-14px text-#999999 mb-23px">
               <span>[{{ forwardMode === 2 ? '合并转发' : '逐条转发' }}]</span> 
               <span v-if="checkedFilter.length > 0">
-                {{ checkedFilter.map(item => item.name).join('、') }}的会话记录
-              </span>
+  {{
+    checkedFilter.length > 2
+      ? checkedFilter.slice(0, 2).map(item => item.name).join('、') + ' 等'
+      : checkedFilter.map(item => item.name).join('、')
+  }}会话记录
+</span>
               <span v-else>请选择联系人</span>
             </div>
             <div class="flex justify-center items-center">
diff --git a/vite.config.ts b/vite.config.ts
index dd4857f..5072a7e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -46,9 +46,9 @@ export default defineConfig(({ mode }) => {
       vueJsx({}), 
       compressPlugin(), 
       UnoCSS(),
-      vueDevTools({
-        launchEditor: 'cursor',
-      })
+      // vueDevTools({
+      //   launchEditor: 'cursor',
+      // })
     ],
     define: {
       __APP_ENV__: env.APP_ENV