From ed0737b5e3c35543ddf7fa7c72b6708b264eac5f Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Wed, 14 May 2025 17:22:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BC=B9=E7=AA=97=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8D=95=E8=81=8A=E7=9A=84=E8=81=8A=E5=A4=A9=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=9B=E6=96=B0=E5=A2=9E=E6=90=9C=E7=B4=A2=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E5=BC=B9=E7=AA=97=EF=BC=8C=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/search.js                             |  11 ++
 src/assets/image/chatList/chat-settings.png   | Bin 0 -> 657 bytes
 src/assets/image/chatList/search-empty.png    | Bin 0 -> 6901 bytes
 src/assets/image/icon/close-btn-grey-line.png | Bin 0 -> 286 bytes
 src/components/group/GroupPanel.vue           |  66 ++++++--
 src/components/search/searchItem.vue          |   4 +
 src/components/search/searchList.vue          |  33 +++-
 src/utils/auth.js                             |   2 +-
 src/views/message/inner/IndexContent.vue      |  19 ++-
 src/views/message/inner/IndexSider.vue        | 158 ++++++++++++++++--
 src/views/message/inner/panel/PanelHeader.vue |   6 +-
 11 files changed, 254 insertions(+), 45 deletions(-)
 create mode 100644 src/api/search.js
 create mode 100644 src/assets/image/chatList/chat-settings.png
 create mode 100644 src/assets/image/chatList/search-empty.png
 create mode 100644 src/assets/image/icon/close-btn-grey-line.png

diff --git a/src/api/search.js b/src/api/search.js
new file mode 100644
index 0000000..ee3654e
--- /dev/null
+++ b/src/api/search.js
@@ -0,0 +1,11 @@
+import { post, get, upload } from '@/utils/request'
+
+//ES搜索-主页搜索什么都有、指定用户、指定群、群与用户概览
+export const ServeSeachQueryAll = (data = {}) => {
+  return post('/api/v1/elasticsearch/query-all', data)
+}
+
+//ES搜索聊天记录-主页搜索什么都有、聊天记录
+export const ServeQueryTalkRecord = (data = {}) => {
+  return post('/api/v1/elasticsearch/query-talk-record', data)
+}
diff --git a/src/assets/image/chatList/chat-settings.png b/src/assets/image/chatList/chat-settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a3a55c2550ed084fe22d9b6c73b6e36ba21297f
GIT binary patch
literal 657
zcmeAS@N?(olHy`uVBq!ia0vp^T0pG9!3-q#U!9Qzq!^2X+?^QKos)S9<b((Kgt!9f
zgoK2QjEt<Ttjx?zAR|3J9mqgt0|kKqA_8IHX9H!w%=S$N8ZA>2<QL2!pkQF{;2#j5
zkY7;W&_7}Rg7q8rA2@&E{)6`)oL2Ar0(8~^PZ!4!i_=p>Z%=Dh;4z7~RxLVp)q(%@
z&!zHsld8)qZ@3!woaFKBZqiwiZrps^JS#u)W1{2wGdt6MA1KUT_DL)<QX$EIlbMZ;
z;_^9X|K3`E<W1^*ZapQp&yKf!Cp(4LsBh$v-_CDvBllGI$Ail+=?3-L#UwST2TYXx
z<~^@*%O*wZH{#1C?US^3G*1rEx;n4+`1+@Z7=wSwCS?@6g{)w@#c6psG9xg_l=Vj<
z@0;8!o%wF!4-W=@Rw=SvX5<)l<dWvWc@2F3_5Z!*u}nSu)5BKMpmVym;0j^iCqWaW
z3jbXV<lJLecmAboA)ls_aGPXeRFFof$meBo>N5Wu!Z=Ml6O=hirj<G?R{aPIv(@IF
z8kP_md(>+2EujOiWEj&O9SlP1*2?!U=Mrlu|8?NY)3nN)S0g^Y+vVJK!7;k0Kz2g1
zPh|O)?WI#Vt!$RFR!84W%{}pc-L@q`_4&?!znh(j2o$Wf{<0~Cb>qq(FXz`vuhUw!
ze4Xx^Ilfo@qE~O3>%MSZeZdC4i;dzfhSnmM*L-vfv)6v#y)d$&M<9|>c5`T4_H*6X
zM<E-Z=N%We(E28J#pB;c^Jib|uLQ_NEfM}M9uVSmav_6LD=^L(JYD@<);T3K0RWv9
B89o32

literal 0
HcmV?d00001

diff --git a/src/assets/image/chatList/search-empty.png b/src/assets/image/chatList/search-empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdb9a27d35fcae264aed53edc80fc2eabb3e6865
GIT binary patch
literal 6901
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

literal 0
HcmV?d00001

diff --git a/src/assets/image/icon/close-btn-grey-line.png b/src/assets/image/icon/close-btn-grey-line.png
new file mode 100644
index 0000000000000000000000000000000000000000..79ee1515e273e0f49a45811f1f0d39c6d19804a4
GIT binary patch
literal 286
zcmeAS@N?(olHy`uVBq!ia0vp^;vmez3?zkEPEH0=jKx9jP7LeL$-D$|v;urWT!HlY
z^Y^b_y?Xib^@|s;T)K4i(j^Fa_2NYk8z=~7T)neSS{A69w<O3fm_fk6AwFTjh6Cp>
zy#El%!PyOz==5}P43W5Odu}7|AqSq;hs%8qaD=;gaeeEYaEPsB%b5dg9ag-HoFxx(
zv+Rv6_>;44=VrT?f0B1OFaK?FV|%7V#o<HK6Q1@=T-11*aW1Q+%^x9FhbanP9980P
zjx;T>XHfqXk^f)IILR`ymCs-MR(VLG&iO-Ygi@!jSk<I6-8wcQ)b!Vd`Kuq_s`FC`
Vt<bPbp8|9ggQu&X%Q~loCII9RdaeKf

literal 0
HcmV?d00001

diff --git a/src/components/group/GroupPanel.vue b/src/components/group/GroupPanel.vue
index 57c64f4..717132e 100644
--- a/src/components/group/GroupPanel.vue
+++ b/src/components/group/GroupPanel.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { reactive, computed, watch, ref } from 'vue'
-import { NEmpty, NPopover, NPopconfirm } from 'naive-ui'
+import { NEmpty, NPopover, NPopconfirm, NSwitch } from 'naive-ui'
 import { useUserStore } from '@/store'
 import GroupLaunch from './GroupLaunch.vue'
 import GroupManage from './manage/index.vue'
@@ -22,6 +22,11 @@ const props = defineProps({
   gid: {
     type: Number,
     default: 0
+  },
+  talkType: {
+    // 1: 单聊， 2: 群聊
+    type: Number,
+    default: 0
   }
 })
 
@@ -53,7 +58,7 @@ const state = reactive({
   actionBtns: {
     confirmBtn: true,
     cancelBtn: true
-  }, // 操作按钮
+  } // 操作按钮
 })
 
 const members = ref<any[]>([])
@@ -198,9 +203,10 @@ const showChatSettingOperateModal = (type: string) => {
 </script>
 <template>
   <section class="el-container is-vertical section">
-    <header class="el-header header bdr-b">
-      <div class="left-icon" @click="emit('to-talk')">
-        <n-icon size="21" :component="Comment" />
+    <header class="el-header header">
+      <!-- <div class="left-icon" @click="emit('to-talk')"> -->
+      <div class="left-icon" style="cursor: unset;">
+        <!-- <n-icon size="21" :component="Comment" /> -->
       </div>
       <div class="center-text">
         <!-- <span>群信息</span> -->
@@ -213,7 +219,29 @@ const showChatSettingOperateModal = (type: string) => {
     </header>
 
     <main class="el-main main me-scrollbar me-scrollbar-thumb">
-      <div class="info-box">
+      <div class="info-box" v-if="talkType === 1">
+        <div class="b-box b-box-bottomBorder">
+          <div class="block">
+            <div class="title">查找聊天记录</div>
+            <img class="icon-right" src="@/assets/image/icon/arrow-right-grey.png" alt="" />
+          </div>
+        </div>
+
+        <div class="b-box">
+          <div class="block">
+            <div class="title">置顶会话</div>
+            <n-switch />
+          </div>
+        </div>
+
+        <div class="b-box">
+          <div class="block">
+            <div class="title">消息免打扰</div>
+            <n-switch />
+          </div>
+        </div>
+      </div>
+      <div class="info-box" v-if="talkType === 2">
         <div class="b-box">
           <div class="block">
             <div class="title">群成员</div>
@@ -284,7 +312,7 @@ const showChatSettingOperateModal = (type: string) => {
         </div>
       </div>
 
-      <div class="member-box">
+      <div class="member-box" v-if="talkType === 2">
         <div class="flex">
           <n-input placeholder="搜索" v-model:value="state.keywords" :clearable="true" round>
             <template #prefix>
@@ -335,7 +363,7 @@ const showChatSettingOperateModal = (type: string) => {
           清空聊天记录
         </n-button>
         <n-button
-          v-if="isAdmin || isLeader"
+          v-if="talkType === 2 && (isAdmin || isLeader)"
           class="btn"
           type="error"
           ghost
@@ -343,7 +371,13 @@ const showChatSettingOperateModal = (type: string) => {
         >
           解散该群
         </n-button>
-        <n-button class="btn" type="error" ghost @click="showChatSettingOperateModal('quit')">
+        <n-button
+          v-if="talkType === 2"
+          class="btn"
+          type="error"
+          ghost
+          @click="showChatSettingOperateModal('quit')"
+        >
           退出群聊
         </n-button>
       </div>
@@ -404,8 +438,11 @@ const showChatSettingOperateModal = (type: string) => {
   height: 100%;
 
   .header {
-    width: 100%;
+    width: calc(100% - 40px);
     height: 60px;
+    margin: 0 20px;
+    box-sizing: border-box;
+    border-bottom: 2px solid #efeff2;
 
     display: flex;
     align-items: center;
@@ -425,7 +462,7 @@ const showChatSettingOperateModal = (type: string) => {
 
     .left-icon,
     .right-icon {
-      width: 50px;
+      width: 30px;
       height: 100%;
       flex-shrink: 0;
       cursor: pointer;
@@ -437,7 +474,7 @@ const showChatSettingOperateModal = (type: string) => {
   }
 
   .main {
-    padding: 15px;
+    padding: 15px 20px;
 
     .info-box {
       .b-box {
@@ -498,6 +535,9 @@ const showChatSettingOperateModal = (type: string) => {
           color: #999999;
         }
       }
+      .b-box-bottomBorder {
+        border-bottom: 1px solid #f0f0f2;
+      }
     }
 
     .member-box {
@@ -572,7 +612,7 @@ const showChatSettingOperateModal = (type: string) => {
     .btn {
       width: calc(100% - 50px);
       background-color: #fff;
-      color: #CF3050;
+      color: #cf3050;
     }
   }
 
diff --git a/src/components/search/searchItem.vue b/src/components/search/searchItem.vue
index 54fd755..4669c95 100644
--- a/src/components/search/searchItem.vue
+++ b/src/components/search/searchItem.vue
@@ -261,6 +261,7 @@ const resultDetail = computed(() => {
   justify-content: flex-start;
   padding: 11px 0 12px;
   border-bottom: 1px solid #f8f8f8;
+  cursor: pointer;
 
   .search-item-avatar{
     position: relative;
@@ -334,4 +335,7 @@ const resultDetail = computed(() => {
 .search-item-condition {
   border: 0;
 }
+.search-item:hover {
+  background-color: #f8f8f8;
+}
 </style>
diff --git a/src/components/search/searchList.vue b/src/components/search/searchList.vue
index 6604189..0f63504 100644
--- a/src/components/search/searchList.vue
+++ b/src/components/search/searchList.vue
@@ -127,7 +127,7 @@
 // useZPaging(zPaging)
 
 import searchItem from './searchItem.vue'
-import { ref, reactive, defineEmits, defineProps, onMounted } from 'vue'
+import { ref, reactive, defineEmits, defineProps, onMounted, watch } from 'vue'
 
 const emits = defineEmits(['toMoreResultPage', 'lastIdChange', 'clickSearchItem'])
 
@@ -184,6 +184,16 @@ onMounted(() => {
   }
 })
 
+watch(
+  () => [props.searchResultPageSize, props.searchText],
+  ([newPageSize, newText], [oldPageSize, oldText]) => {
+    console.log(newPageSize, newText, oldPageSize, oldText)
+    if (newPageSize !== oldPageSize || newText !== oldText) {
+      queryAllSearch(1, newPageSize)
+    }
+  }
+)
+
 //输入搜索文本
 const inputSearchText = (e) => {
   if (e.trim() != state.searchText.trim()) {
@@ -419,6 +429,7 @@ const queryAllSearch = (pageNum, searchResultPageSize) => {
       // zPaging.value?.complete([data])
     }
   }
+
   // const resp = props.apiRequest(params)
   // resp.then(({ code, data }) => {
   //   console.log(data)
@@ -493,10 +504,10 @@ const queryAllSearch = (pageNum, searchResultPageSize) => {
   //       if (pageNum === 1) {
   //         // 第一页请求且为空，清空结果
   //         state.searchResult = null
-  //         zPaging.value?.complete([])
+  //         // zPaging.value?.complete([])
   //       } else {
   //         // 加载更多且为空，保持原列表不变
-  //         zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
+  //         // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
   //       }
   //     } else {
   //       if (props.isPagination) {
@@ -534,20 +545,20 @@ const queryAllSearch = (pageNum, searchResultPageSize) => {
   //             total = data.group_record_count
   //           }
   //         }
-  //         zPaging.value?.completeByTotal([data], total)
+  //         // zPaging.value?.completeByTotal([data], total)
   //       } else {
   //         state.searchResult = data
-  //         zPaging.value?.complete([data])
+  //         // zPaging.value?.complete([data])
   //       }
   //     }
   //   } else {
   //     if (pageNum === 1) {
   //       // 第一页请求失败，清空结果
   //       state.searchResult = null
-  //       zPaging.value?.complete([])
+  //       // zPaging.value?.complete([])
   //     } else {
   //       // 加载更多失败，保持原列表不变
-  //       zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
+  //       // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
   //     }
   //   }
   // })
@@ -556,10 +567,10 @@ const queryAllSearch = (pageNum, searchResultPageSize) => {
   //   if (pageNum === 1) {
   //     // 第一页请求异常，清空结果
   //     state.searchResult = null
-  //     zPaging.value?.complete([])
+  //     // zPaging.value?.complete([])
   //   } else {
   //     // 加载更多异常，保持原列表不变
-  //     zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
+  //     // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
   //   }
   // })
 }
@@ -731,11 +742,15 @@ const clickSearchItem = (searchResultKey, searchItem) => {
         .result-has-more {
           padding: 10px 0;
           border-bottom: 1px solid #f8f8f8;
+          cursor: pointer;
           span {
             color: #191919;
             line-height: 20px;
           }
         }
+        .result-has-more:hover {
+          background-color: #f8f8f8;
+        }
       }
     }
   }
diff --git a/src/utils/auth.js b/src/utils/auth.js
index bbc6a56..46df863 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -18,7 +18,7 @@ export function isLoggedIn() {
  */
 export function getAccessToken() {
   // return storage.get(AccessToken) || ''
-  return JSON.parse(localStorage.getItem('token'))||'79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b8987a3f4c77465504ba46f90370546f2f3656c248bd63549a43410178becfd0d1888ecbb8e82d291e68cf9da8ec1096e2d8abd4bb9d7edc62d38469e56226683693764f82df03eaa47fe6fd21a9cb83e0e'
+  return JSON.parse(localStorage.getItem('token'))||'79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b89642c979f5ab2d142ebbcb209ce7e7964c143edb27ba9be09900f4f4af311e8f5edee6f6b05af86d24daae9a9fd1d1cf686b1ac565663e192e2598c14c35470c9d760c4badd3a54f9c46c7b779684c7d0'
 }
 
 /**
diff --git a/src/views/message/inner/IndexContent.vue b/src/views/message/inner/IndexContent.vue
index dfc3af7..87a9c8f 100644
--- a/src/views/message/inner/IndexContent.vue
+++ b/src/views/message/inner/IndexContent.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { reactive, computed,watch } from 'vue'
+import { reactive, computed, watch } from 'vue'
 import { NDrawer } from 'naive-ui'
 import { useUserStore, useDialogueStore, useUploadsStore } from '@/store'
 import PanelHeader from './panel/PanelHeader.vue'
@@ -44,10 +44,13 @@ const events = {
   }
 }
 
-watch(() => talkParams, (newValue, oldValue) => {
-  console.log(newValue);
-  
-},{deep:true,immediate:true})
+watch(
+  () => talkParams,
+  (newValue, oldValue) => {
+    console.log(newValue)
+  },
+  { deep: true, immediate: true }
+)
 
 // Header 工具栏事件
 const onPanelHeaderEvent = (eventType: string) => {
@@ -130,7 +133,11 @@ const onPanelHeaderEvent = (eventType: string) => {
     show-mask="transparent"
     to="#drawer-container"
   >
-    <GroupPanel :gid="talkParams.receiver_id" @close="state.isShowGroupAside = false" />
+    <GroupPanel
+      :gid="talkParams.receiver_id"
+      @close="state.isShowGroupAside = false"
+      :talkType="talkParams.type"
+    />
   </n-drawer>
 </template>
 
diff --git a/src/views/message/inner/IndexSider.vue b/src/views/message/inner/IndexSider.vue
index c51cca9..2b8a351 100644
--- a/src/views/message/inner/IndexSider.vue
+++ b/src/views/message/inner/IndexSider.vue
@@ -36,6 +36,7 @@ import xNDataTable from '@/components/x-naive-ui/x-n-data-table/index.vue'
 import flTree from '@/components/flnlayout/tree/flnindex.vue'
 import { processError, processSuccess } from '@/utils/helper/message.js'
 import chatAppSearchList from '@/components/search/searchList.vue'
+import { ServeSeachQueryAll, ServeQueryTalkRecord } from '@/api/search'
 
 const currentInstance = getCurrentInstance()
 const $request = currentInstance?.appContext.config.globalProperties?.$request
@@ -79,24 +80,36 @@ const renderChatAppSearch = () => {
         console.log(searchText, searchResultKey, talk_type, receiver_id)
         const result = JSON.parse(decodeURIComponent(res))
         console.log(result)
+      },
+      onToMoreResultPage: (searchResultKey, searchText) => {
+        if (searchResultKey === 'general_infos') {
+          state.ServeQueryTalkRecordParams = encodeURIComponent(
+            JSON.stringify({
+              talk_type: 0, //1私聊2群聊
+              receiver_id: 0, //查详情的时候需传入
+              last_group_id: 0, //最后一条群id
+              last_member_id: 0, //最后一条用户id
+              last_receiver_user_name: '', //最后一条用户名
+              last_receiver_group_name: '' //最后一条群名
+            })
+          )
+          state.ServeQueryTalkRecordDetailParams = encodeURIComponent(
+            JSON.stringify({
+              last_group_id: 0,
+              last_member_id: 0,
+              receiver_id: 40,
+              talk_type: 1
+            })
+          )
+          state.isShowSearchRecordModal = true
+        }
+        console.log(searchResultKey, searchText)
       }
     },
     {}
   )
 }
 
-//ES搜索聊天记录-主页搜索什么都有、指定用户、指定群、群与用户概览
-const ServeSeachQueryAll = () => {
-  let url = '/api/v1/elasticsearch/query-all'
-  let params = {}
-  let config = {
-    baseURL: import.meta.env.VITE_BASE_API
-  }
-  return $request.HTTP.components.postDataByParams(url, params, config).then((res) => {
-    console.log(res)
-  })
-}
-
 const state = reactive({
   isShowAddressBookModal: false, // 是否显示通讯录模态框
   customModalStyle: {
@@ -225,7 +238,16 @@ const state = reactive({
       type: 'render',
       render: renderChatAppSearch
     }
-  ] // 聊天搜索选项
+  ], // 聊天搜索选项
+  isShowSearchRecordModal: false, // 是否显示搜索聊天记录模态框
+  customSearchRecordModalStyle: {
+    width: '997px',
+    height: '740px',
+    backgroundColor: '#F9F9FD'
+  }, //自定义模态框样式
+  searchRecordText: '', // 搜索聊天记录文本
+  ServeQueryTalkRecordParams: '', // 搜索聊天记录参数
+  ServeQueryTalkRecordDetailParams: '' // 搜索聊天记录详情参数
 })
 
 const items = computed((): ISession[] => {
@@ -645,6 +667,62 @@ const handleGroupChatListPaginationSize = (value) => {
       </div>
     </template>
   </customModal>
+
+  <customModal
+    v-model:show="state.isShowSearchRecordModal"
+    title="搜索聊天记录"
+    :style="state.customSearchRecordModalStyle"
+    :customCloseBtn="true"
+    :closable="false"
+  >
+    <template #content>
+      <div class="search-record-modal-content">
+        <n-card style="padding: 0 12px;">
+          <div class="search-record-input">
+            <span class="search-record-input-title">搜索</span>
+            <n-input
+              type="text"
+              v-model:value="state.searchRecordText"
+              placeholder="请输入"
+              clearable
+            >
+              <template #clear-icon>
+                <img src="@/assets/image/icon/close-btn-grey-line.png" alt="close" />
+              </template>
+            </n-input>
+          </div>
+          <div class="search-record-card" v-if="state.searchRecordText">
+            <div class="search-record-list">
+              <chatAppSearchList
+                :searchResultPageSize="10"
+                :listLimit="false"
+                :apiRequest="ServeQueryTalkRecord"
+                :apiParams="state.ServeQueryTalkRecordParams"
+                :searchText="state.searchRecordText || '王'"
+                :isPagination="true"
+                searchResultKey="general_infos"
+              ></chatAppSearchList>
+            </div>
+            <div class="search-record-detail">
+              <chatAppSearchList
+                :searchResultPageSize="10"
+                :listLimit="false"
+                :apiRequest="ServeQueryTalkRecord"
+                :apiParams="state.ServeQueryTalkRecordDetailParams"
+                :searchText="state.searchRecordText || '王'"
+                :isPagination="true"
+                :searchRecordDetail="true"
+              ></chatAppSearchList>
+            </div>
+          </div>
+          <div class="search-record-empty" v-if="!state.searchRecordText">
+            <img src="@/assets/image/chatList/search-empty.png" alt="" />
+            <span>暂无搜索内容</span>
+          </div>
+        </n-card>
+      </div>
+    </template>
+  </customModal>
 </template>
 
 <style lang="less" scoped>
@@ -802,4 +880,58 @@ html[theme-mode='dark'] {
     }
   }
 }
+
+.search-record-modal-content {
+  box-sizing: border-box;
+  width: 100%;
+  padding: 0 12px;
+  :deep(.n-card) {
+    border: 0;
+    box-shadow: 0 3px 6px 1px rgba(188, 188, 188, 0.18);
+  }
+  .search-record-input {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .search-record-input-title {
+      width: 78px;
+    }
+  }
+  .search-record-card {
+    display: flex;
+    flex-direction: row;
+    gap: 20px;
+    padding: 28px 0 0;
+    .search-record-list {
+      width: 260px;
+      height: 517px;
+      border: 1px solid #efeff5;
+      overflow-y: scroll;
+    }
+    .search-record-detail {
+      width: 578px;
+      height: 517px;
+      border: 1px solid #efeff5;
+      overflow-y: scroll;
+    }
+  }
+  .search-record-empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 28px 0 0;
+    height: 519px;
+    img {
+      width: 160px;
+      height: 104px;
+    }
+    span {
+      font-size: 14px;
+      color: #999;
+      font-weight: 400;
+      margin: 13px 0 0;
+    }
+  }
+}
 </style>
diff --git a/src/views/message/inner/panel/PanelHeader.vue b/src/views/message/inner/panel/PanelHeader.vue
index 53e377d..680d5f1 100644
--- a/src/views/message/inner/panel/PanelHeader.vue
+++ b/src/views/message/inner/panel/PanelHeader.vue
@@ -67,12 +67,12 @@ const onSetMenu = () => {
         @click="emit('evnet', 'notice')"
       />
       <n-icon
-        v-show="type == 2"
-        :component="Peoples"
         :size="18"
         class="icon"
         @click="emit('evnet', 'group')"
-      />
+      >
+        <img style="width: 20px; height: 20px;" src="@/assets/image/chatList/chat-settings.png" alt="" />
+      </n-icon>
     </div>
   </header>
 </template>

From 814eb44358b1ec2685111f29cb55136216396e0d Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Thu, 15 May 2025 18:56:41 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=EF=BC=9B=E6=8E=A5=E5=85=A5erp=E7=9A=84v-loadmore?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?PC=E7=AB=AF=E7=9A=84=E8=A7=A6=E5=BA=95=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A;=E7=BB=A7=E7=BB=AD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A8=A1=E5=9D=97=E7=9A=84=E8=81=94=E5=8A=A8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.test                            |   2 +
 src/components/group/GroupPanel.vue      |   8 +-
 src/components/search/searchItem.vue     |  26 +-
 src/components/search/searchList.vue     | 550 ++++++++---------------
 src/directive/index.ts                   |   6 +-
 src/plugins/directive/index.js           | 118 +++++
 src/plugins/index.ts                     |   5 +
 src/utils/auth.js                        |   2 +-
 src/views/message/inner/IndexContent.vue | 124 ++++-
 src/views/message/inner/IndexSider.vue   | 106 ++++-
 10 files changed, 559 insertions(+), 388 deletions(-)
 create mode 100644 src/plugins/directive/index.js

diff --git a/env/.env.test b/env/.env.test
index d9f7529..7157087 100644
--- a/env/.env.test
+++ b/env/.env.test
@@ -3,6 +3,8 @@ ENV = 'development'
 VITE_BASE=/
 VUE_APP_PREVIEW=false
 VITE_BASE_API=http://172.16.100.93:8503
+# VITE_BASE_API=http://192.168.88.21:9503
 VITE_EPR_BASEURL=http://114.218.158.24:9020
 VITE_SOCKET_API=ws://172.16.100.93:8504
+# VITE_SOCKET_API=ws://192.168.88.21:9504
 VUE_APP_WEBSITE_NAME="Lumen IM"
\ No newline at end of file
diff --git a/src/components/group/GroupPanel.vue b/src/components/group/GroupPanel.vue
index 717132e..a05357a 100644
--- a/src/components/group/GroupPanel.vue
+++ b/src/components/group/GroupPanel.vue
@@ -17,7 +17,7 @@ import customModal from '@/components/common/customModal.vue'
 const userStore = useUserStore()
 const { showUserInfoModal } = useInject()
 
-const emit = defineEmits(['close', 'to-talk'])
+const emit = defineEmits(['close', 'to-talk', 'handleSearchRecordByConditionModalShow'])
 const props = defineProps({
   gid: {
     type: Number,
@@ -200,6 +200,10 @@ const showChatSettingOperateModal = (type: string) => {
       break
   }
 }
+
+const showSearchRecordByConditionModal = () => {
+  emit('handleSearchRecordByConditionModalShow', true)
+}
 </script>
 <template>
   <section class="el-container is-vertical section">
@@ -220,7 +224,7 @@ const showChatSettingOperateModal = (type: string) => {
 
     <main class="el-main main me-scrollbar me-scrollbar-thumb">
       <div class="info-box" v-if="talkType === 1">
-        <div class="b-box b-box-bottomBorder">
+        <div class="b-box b-box-bottomBorder" @click="showSearchRecordByConditionModal">
           <div class="block">
             <div class="title">查找聊天记录</div>
             <img class="icon-right" src="@/assets/image/icon/arrow-right-grey.png" alt="" />
diff --git a/src/components/search/searchItem.vue b/src/components/search/searchItem.vue
index 4669c95..4aac4e4 100644
--- a/src/components/search/searchItem.vue
+++ b/src/components/search/searchItem.vue
@@ -3,7 +3,10 @@
     class="search-item"
     :class="props?.conditionType ? 'search-item-condition' : ''"
     v-if="resultName"
-    :style="props.searchResultKey === 'talk_record_infos_receiver' ? 'margin: 12px 0 0' : ''"
+    :style="{
+      'margin': props.searchResultKey === 'talk_record_infos_receiver' ? '12px 0 0' : '',
+      'background-color': props.isClickStay ? '#EEE9F8' : ''
+    }"
   >
     <div class="search-item-avatar">
       <avatarModule
@@ -101,7 +104,11 @@ const props = defineProps({
   conditionType: {
     type: Number,
     default: 0
-  } //搜索类型
+  }, //搜索类型
+  isClickStay: {
+    type: Boolean,
+    default: false
+  } //是否点击停留
 })
 // 映射表-查找对应结构下的属性名
 const keyMapping = {
@@ -259,9 +266,9 @@ const resultDetail = computed(() => {
   flex-direction: row;
   align-items: center;
   justify-content: flex-start;
-  padding: 11px 0 12px;
-  border-bottom: 1px solid #f8f8f8;
+  padding: 11px 10px 12px;
   cursor: pointer;
+  position: relative;
 
   .search-item-avatar{
     position: relative;
@@ -332,6 +339,17 @@ const resultDetail = computed(() => {
     }
   }
 }
+.search-item::after{
+  content: '';
+  display: block;
+  width: 100%;
+  height: 1px;
+  position: absolute;
+  bottom: 0;
+  left: 10px;
+  width: calc(100% - 20px);
+  background-color: #f8f8f8;
+}
 .search-item-condition {
   border: 0;
 }
diff --git a/src/components/search/searchList.vue b/src/components/search/searchList.vue
index 0f63504..f1293f6 100644
--- a/src/components/search/searchList.vue
+++ b/src/components/search/searchList.vue
@@ -34,6 +34,11 @@
                   :searchItem="item"
                   :searchText="state.searchText"
                   :searchRecordDetail="props.searchRecordDetail"
+                  :isClickStay="
+                    props.useClickStay &&
+                    typeof state.clickStayItem === 'string' &&
+                    state.clickStayItem === `${item.talk_type}_${item.receiver_id}`
+                  "
                 ></searchItem>
               </div>
             </div>
@@ -129,14 +134,21 @@
 import searchItem from './searchItem.vue'
 import { ref, reactive, defineEmits, defineProps, onMounted, watch } from 'vue'
 
-const emits = defineEmits(['toMoreResultPage', 'lastIdChange', 'clickSearchItem'])
+const emits = defineEmits([
+  'toMoreResultPage',
+  'lastIdChange',
+  'clickSearchItem',
+  'clickStayItemChange',
+  'doLoadMore'
+])
 
 const state = reactive({
   searchText: '', //搜索内容
   searchResultList: [], //搜素结果列表
   searchResult: null, //搜索结果
   pageNum: 1, //当前请求数据页数
-  uid: 1496 //当前用户id
+  uid: 12303, //当前用户id
+  clickStayItem: '' //点击停留的item
 })
 
 const props = defineProps({
@@ -174,23 +186,35 @@ const props = defineProps({
   hideFirstRecord: {
     type: Boolean,
     default: false
-  } //是否隐藏前缀及搜索群/用户主体信息
+  }, //是否隐藏前缀及搜索群/用户主体信息
+  useClickStay: {
+    type: Boolean,
+    default: false
+  } //是否使用点击停留样式
 })
 
 onMounted(() => {
   if (props.searchText) {
     state.searchText = props.searchText
-    queryAllSearch(1, 10)
+    queryAllSearch()
   }
 })
 
+// 监听每页数量变化
 watch(
-  () => [props.searchResultPageSize, props.searchText],
-  ([newPageSize, newText], [oldPageSize, oldText]) => {
-    console.log(newPageSize, newText, oldPageSize, oldText)
-    if (newPageSize !== oldPageSize || newText !== oldText) {
-      queryAllSearch(1, newPageSize)
-    }
+  () => props.searchResultPageSize,
+  (newVal, oldVal) => {
+    queryAllSearch()
+  }
+)
+
+// 监听搜索文本变化
+watch(
+  () => props.searchText,
+  (newVal, oldVal) => {
+    queryAllSearch()
+    state.clickStayItem = ''
+    emits('clickStayItemChange', state.clickStayItem)
   }
 )
 
@@ -199,380 +223,166 @@ const inputSearchText = (e) => {
   if (e.trim() != state.searchText.trim()) {
     state.pageNum = 1
     state.searchResult = null // 清空搜索结果
-    emits('lastIdChange', 0, 0, 0)
+    emits('lastIdChange', 0, 0, 0, '', '')
   }
   state.searchText = e.trim()
   if (!e.trim()) {
     state.searchResult = null // 清空搜索结果
-    emits('lastIdChange', 0, 0, 0)
+    emits('lastIdChange', 0, 0, 0, '', '')
   }
   // zPaging.value?.reload()
+  queryAllSearch()
 }
 
 // ES搜索聊天记录-主页搜索什么都有、指定用户、指定群、群与用户概览
-const queryAllSearch = (pageNum, searchResultPageSize) => {
+const queryAllSearch = () => {
   let params = {
     key: state.searchText, //关键字
-    size: searchResultPageSize
+    size: props.searchResultPageSize
   }
   if (props.apiParams) {
     let apiParams = JSON.parse(decodeURIComponent(props.apiParams))
     params = Object.assign({}, params, apiParams)
   }
-  const data = {
-    user_infos: [
-      {
-        id: 127,
-        mobile: '17706200252',
-        nickname: '测试-王溢韬',
-        avatar:
-          'https://dci-file-new.bj.bcebos.com/fonchain-main/test/runtime/image/avatar/40/b8ed6fea-6662-416d-8bb3-1fd8a8197061.jpg',
-        created_at: '2025-03-28 11:33:13',
-        erp_user_id: 18282
-      },
-      {
-        id: 103,
-        mobile: '13814969538',
-        nickname: '王静测试',
-        avatar: '',
-        created_at: '2025-03-27 14:44:23',
-        erp_user_id: 2639
-      },
-      {
-        id: 57,
-        mobile: '13862027511',
-        nickname: '王西',
-        avatar:
-          'https://dci-file-new.bj.bcebos.com/fonchain-main/test/runtime/image/avatar/40/b8ed6fea-6662-416d-8bb3-1fd8a8197061.jpg',
-        created_at: '2025-03-27 14:44:23',
-        erp_user_id: 18229
-      }
-    ],
-    user_count: 9,
-    group_infos: null,
-    group_member_infos: [
-      {
-        id: 79,
-        group_id: 1,
-        group_name: '泰丰国际',
-        group_type: 4,
-        group_avatar: '',
-        group_num: 103,
-        user_id: 103,
-        user_name: '王静',
-        user_card: '',
-        created_at: '2025-03-27 14:44:24'
-      },
-      {
-        id: 55,
-        group_id: 1,
-        group_name: '泰丰国际',
-        group_type: 4,
-        group_avatar: '',
-        group_num: 103,
-        user_id: 57,
-        user_name: '王西',
-        user_card: '',
-        created_at: '2025-03-27 14:44:24'
-      },
-      {
-        id: 35,
-        group_id: 1,
-        group_name: '泰丰国际',
-        group_type: 4,
-        group_avatar: '',
-        group_num: 103,
-        user_id: 37,
-        user_name: '王雯婷',
-        user_card: '',
-        created_at: '2025-03-27 14:44:24'
-      }
-    ],
-    group_count: 9,
-    general_infos: [
-      {
-        receiver_id: 40,
-        receiver_name: '孙志远',
-        receiver_avatar:
-          'https://dci-file-new.bj.bcebos.com/fonchain-main/test/runtime/image/avatar/40/b8ed6fea-6662-416d-8bb3-1fd8a8197061.jpg',
-        group_num: 0,
-        talk_type: 1,
-        count: 3,
-        group_type: 0
-      },
-      {
-        receiver_id: 2,
-        receiver_name: '吹牛个人群',
-        receiver_avatar: '',
-        group_num: 4,
-        talk_type: 2,
-        count: 2,
-        group_type: 3
-      },
-      {
-        receiver_id: 3,
-        receiver_name: '丰链30自己人',
-        receiver_avatar:
-          'https://e-cdn.fontree.cn/fonchain-main/prod/image/default/fonchain-chat/3d273326-d2a5-4ad4-a974-32d020c6b3f9.jpg?width=1080&height=2412',
-        group_num: 8,
-        talk_type: 2,
-        count: 2,
-        group_type: 3
-      }
-    ],
-    record_count: 3
-  }
-  if ((data.user_infos || []).length > 0) {
-    ;(data.user_infos || []).forEach((item) => {
-      item.group_type = 0
-    })
-  }
-  if ((data.group_infos || []).length > 0) {
-    ;(data.group_infos || []).forEach((item) => {
-      item.group_type = item.type
-      item.groupTempType = 'group_infos'
-    })
-  }
-  if ((data.group_member_infos || []).length > 0) {
-    ;(data.group_member_infos || []).forEach((item) => {
-      item.groupTempType = 'group_member_infos'
-    })
-  }
-  if ((data.talk_record_infos || []).length > 0) {
-    let receiverInfo = JSON.parse(JSON.stringify(data.talk_record_infos[0]))
-    if (receiverInfo.talk_type === 1) {
-      //单聊才需此判断
-      if (receiverInfo.user_id === state.uid) {
-        //发送人是自己，接收人不需要变
-      }
-      if (receiverInfo.receiver_id === state.uid) {
-        //接收人是自己，这里需要变成对方
-        let temp_id = receiverInfo.receiver_id
-        let temp_name = receiverInfo.receiver_name
-        let temp_avatar = receiverInfo.receiver_avatar
-        receiverInfo.receiver_id = receiverInfo.user_id
-        receiverInfo.receiver_name = receiverInfo.user_name
-        receiverInfo.receiver_avatar = receiverInfo.user_avatar
-        receiverInfo.user_id = temp_id
-        receiverInfo.user_name = temp_name
-        receiverInfo.user_avatar = temp_avatar
-      }
-    }
-    state.first_talk_record_infos = Object.assign({}, state.first_talk_record_infos, receiverInfo)
-    ;(data.talk_record_infos || []).forEach((item) => {
-      item.group_type = 0
-    })
-  }
 
-  let tempGeneral_infos = Array.isArray(data.general_infos)
-    ? [...data.general_infos]
-    : data.general_infos
-  delete data.general_infos
-  data.combinedGroup = (data.group_infos || []).concat(data.group_member_infos || [])
-  data.general_infos = tempGeneral_infos
+  const resp = props.apiRequest(params)
+  resp.then(({ code, data }) => {
+    console.log(data)
+    if (code == 200) {
+      if ((data.user_infos || []).length > 0) {
+        ;(data.user_infos || []).forEach((item) => {
+          item.group_type = 0
+        })
+      }
+      if ((data.group_infos || []).length > 0) {
+        ;(data.group_infos || []).forEach((item) => {
+          item.group_type = item.type
+          item.groupTempType = 'group_infos'
+        })
+      }
+      if ((data.group_member_infos || []).length > 0) {
+        ;(data.group_member_infos || []).forEach((item) => {
+          item.groupTempType = 'group_member_infos'
+        })
+      }
+      if ((data.talk_record_infos || []).length > 0) {
+        let receiverInfo = JSON.parse(JSON.stringify(data.talk_record_infos[0]))
+        if (receiverInfo.talk_type === 1) {
+          //单聊才需此判断
+          if (receiverInfo.user_id === state.uid) {
+            //发送人是自己，接收人不需要变
+          }
+          if (receiverInfo.receiver_id === state.uid) {
+            //接收人是自己，这里需要变成对方
+            let temp_id = receiverInfo.receiver_id
+            let temp_name = receiverInfo.receiver_name
+            let temp_avatar = receiverInfo.receiver_avatar
+            receiverInfo.receiver_id = receiverInfo.user_id
+            receiverInfo.receiver_name = receiverInfo.user_name
+            receiverInfo.receiver_avatar = receiverInfo.user_avatar
+            receiverInfo.user_id = temp_id
+            receiverInfo.user_name = temp_name
+            receiverInfo.user_avatar = temp_avatar
+          }
+        }
+        state.first_talk_record_infos = Object.assign(
+          {},
+          state.first_talk_record_infos,
+          receiverInfo
+        )
+        ;(data.talk_record_infos || []).forEach((item) => {
+          item.group_type = 0
+        })
+      }
 
-  // 检查数据是否为空
-  let isEmpty = true
-  let dataKeys = Object.keys(data)
-  let paginationKey = ''
-  dataKeys.forEach((item) => {
-    if (Array.isArray(data[item]) && data[item].length > 0) {
-      paginationKey = item
-      isEmpty = false
+      let tempGeneral_infos = Array.isArray(data.general_infos)
+        ? [...data.general_infos]
+        : data.general_infos
+      delete data.general_infos
+      data.combinedGroup = (data.group_infos || []).concat(data.group_member_infos || [])
+      data.general_infos = tempGeneral_infos
+
+      // 检查数据是否为空
+      let isEmpty = true
+      let dataKeys = Object.keys(data)
+      let paginationKey = ''
+      dataKeys.forEach((item) => {
+        if (Array.isArray(data[item]) && data[item].length > 0) {
+          paginationKey = item
+          isEmpty = false
+        }
+      })
+
+      if (isEmpty) {
+        if (state.pageNum === 1) {
+          // 第一页请求且为空，清空结果
+          state.searchResult = null
+          // zPaging.value?.complete([])
+        } else {
+          // 加载更多且为空，保持原列表不变
+          // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
+        }
+      } else {
+        if (props.isPagination) {
+          if (state.pageNum === 1) {
+            // 第一页请求，直接设置新数据
+            state.searchResult = data
+          } else {
+            // 加载更多，合并数据
+            if (
+              paginationKey &&
+              Array.isArray((state?.searchResult && state?.searchResult[paginationKey]) || [])
+            ) {
+              data[paginationKey] = state.searchResult[paginationKey].concat(data[paginationKey])
+            }
+            state.searchResult = data
+          }
+
+          emits(
+            'lastIdChange',
+            data.last_id,
+            data.last_group_id,
+            data.last_member_id,
+            data.last_receiver_user_name,
+            data.last_receiver_group_name
+          )
+          let total = data.count
+          if (props.searchRecordDetail) {
+            if (state?.first_talk_record_infos?.talk_type === 1) {
+              total = data.user_record_count
+            } else if (state?.first_talk_record_infos?.talk_type === 2) {
+              total = data.group_record_count
+            }
+          }
+          // zPaging.value?.completeByTotal([data], total)
+        } else {
+          state.searchResult = data
+          // zPaging.value?.complete([data])
+        }
+      }
+      state.pageNum = state.pageNum + 1
+    } else {
+      if (state.pageNum === 1) {
+        // 第一页请求失败，清空结果
+        state.searchResult = null
+        // zPaging.value?.complete([])
+      } else {
+        // 加载更多失败，保持原列表不变
+        // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
+      }
     }
   })
 
-  if (isEmpty) {
-    if (pageNum === 1) {
-      // 第一页请求且为空，清空结果
+  resp.catch(() => {
+    if (state.pageNum === 1) {
+      // 第一页请求异常，清空结果
       state.searchResult = null
       // zPaging.value?.complete([])
     } else {
-      // 加载更多且为空，保持原列表不变
+      // 加载更多异常，保持原列表不变
       // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
     }
-  } else {
-    if (props.isPagination) {
-      if (pageNum === 1) {
-        // 第一页请求，直接设置新数据
-        state.searchResult = data
-      } else {
-        // 加载更多，合并数据
-        if (
-          paginationKey &&
-          Array.isArray((state?.searchResult && state?.searchResult[paginationKey]) || [])
-        ) {
-          data[paginationKey] = state.searchResult[paginationKey].concat(data[paginationKey])
-        }
-        state.searchResult = data
-      }
-
-      emits(
-        'lastIdChange',
-        data.last_id,
-        data.last_group_id,
-        data.last_member_id,
-        data.last_receiver_user_name,
-        data.last_receiver_group_name
-      )
-      let total = data.count
-      if (props.searchRecordDetail) {
-        if (state?.first_talk_record_infos?.talk_type === 1) {
-          total = data.user_record_count
-        } else if (state?.first_talk_record_infos?.talk_type === 2) {
-          total = data.group_record_count
-        }
-      }
-      // zPaging.value?.completeByTotal([data], total)
-    } else {
-      state.searchResult = data
-      // zPaging.value?.complete([data])
-    }
-  }
-
-  // const resp = props.apiRequest(params)
-  // resp.then(({ code, data }) => {
-  //   console.log(data)
-  //   if (code == 200) {
-  //     if ((data.user_infos || []).length > 0) {
-  //       ;(data.user_infos || []).forEach((item) => {
-  //         item.group_type = 0
-  //       })
-  //     }
-  //     if ((data.group_infos || []).length > 0) {
-  //       ;(data.group_infos || []).forEach((item) => {
-  //         item.group_type = item.type
-  //         item.groupTempType = 'group_infos'
-  //       })
-  //     }
-  //     if ((data.group_member_infos || []).length > 0) {
-  //       ;(data.group_member_infos || []).forEach((item) => {
-  //         item.groupTempType = 'group_member_infos'
-  //       })
-  //     }
-  //     if ((data.talk_record_infos || []).length > 0) {
-  //       let receiverInfo = JSON.parse(JSON.stringify(data.talk_record_infos[0]))
-  //       if (receiverInfo.talk_type === 1) {
-  //         //单聊才需此判断
-  //         if (receiverInfo.user_id === state.uid) {
-  //           //发送人是自己，接收人不需要变
-  //         }
-  //         if (receiverInfo.receiver_id === state.uid) {
-  //           //接收人是自己，这里需要变成对方
-  //           let temp_id = receiverInfo.receiver_id
-  //           let temp_name = receiverInfo.receiver_name
-  //           let temp_avatar = receiverInfo.receiver_avatar
-  //           receiverInfo.receiver_id = receiverInfo.user_id
-  //           receiverInfo.receiver_name = receiverInfo.user_name
-  //           receiverInfo.receiver_avatar = receiverInfo.user_avatar
-  //           receiverInfo.user_id = temp_id
-  //           receiverInfo.user_name = temp_name
-  //           receiverInfo.user_avatar = temp_avatar
-  //         }
-  //       }
-  //       state.first_talk_record_infos = Object.assign(
-  //         {},
-  //         state.first_talk_record_infos,
-  //         receiverInfo,
-  //       )
-  //       ;(data.talk_record_infos || []).forEach((item) => {
-  //         item.group_type = 0
-  //       })
-  //     }
-
-  //     let tempGeneral_infos = Array.isArray(data.general_infos)
-  //       ? [...data.general_infos]
-  //       : data.general_infos
-  //     delete data.general_infos
-  //     data.combinedGroup = (data.group_infos || []).concat(
-  //       data.group_member_infos || [],
-  //     )
-  //     data.general_infos = tempGeneral_infos
-
-  //     // 检查数据是否为空
-  //     let isEmpty = true
-  //     let dataKeys = Object.keys(data)
-  //     let paginationKey = ''
-  //     dataKeys.forEach((item) => {
-  //       if (Array.isArray(data[item]) && data[item].length > 0) {
-  //         paginationKey = item
-  //         isEmpty = false
-  //       }
-  //     })
-
-  //     if (isEmpty) {
-  //       if (pageNum === 1) {
-  //         // 第一页请求且为空，清空结果
-  //         state.searchResult = null
-  //         // zPaging.value?.complete([])
-  //       } else {
-  //         // 加载更多且为空，保持原列表不变
-  //         // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
-  //       }
-  //     } else {
-  //       if (props.isPagination) {
-  //         if (pageNum === 1) {
-  //           // 第一页请求，直接设置新数据
-  //           state.searchResult = data
-  //         } else {
-  //           // 加载更多，合并数据
-  //           if (
-  //             paginationKey &&
-  //             Array.isArray(
-  //               (state?.searchResult && state?.searchResult[paginationKey]) || [],
-  //             )
-  //           ) {
-  //             data[paginationKey] = state.searchResult[paginationKey].concat(
-  //               data[paginationKey],
-  //             )
-  //           }
-  //           state.searchResult = data
-  //         }
-
-  //         emits(
-  //           'lastIdChange',
-  //           data.last_id,
-  //           data.last_group_id,
-  //           data.last_member_id,
-  //           data.last_receiver_user_name,
-  //           data.last_receiver_group_name,
-  //         )
-  //         let total = data.count
-  //         if (props.searchRecordDetail) {
-  //           if (state?.first_talk_record_infos?.talk_type === 1) {
-  //             total = data.user_record_count
-  //           } else if (state?.first_talk_record_infos?.talk_type === 2) {
-  //             total = data.group_record_count
-  //           }
-  //         }
-  //         // zPaging.value?.completeByTotal([data], total)
-  //       } else {
-  //         state.searchResult = data
-  //         // zPaging.value?.complete([data])
-  //       }
-  //     }
-  //   } else {
-  //     if (pageNum === 1) {
-  //       // 第一页请求失败，清空结果
-  //       state.searchResult = null
-  //       // zPaging.value?.complete([])
-  //     } else {
-  //       // 加载更多失败，保持原列表不变
-  //       // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
-  //     }
-  //   }
-  // })
-
-  // resp.catch(() => {
-  //   if (pageNum === 1) {
-  //     // 第一页请求异常，清空结果
-  //     state.searchResult = null
-  //     // zPaging.value?.complete([])
-  //   } else {
-  //     // 加载更多异常，保持原列表不变
-  //     // zPaging.value?.complete(state.searchResult ? [state.searchResult] : [])
-  //   }
-  // })
+  })
 }
 
 //点击取消搜索
@@ -659,6 +469,12 @@ const toMoreResultPage = (searchResultKey) => {
 //点击了搜索结果项
 const clickSearchItem = (searchResultKey, searchItem) => {
   console.log(searchResultKey, searchItem)
+  if (props.useClickStay) {
+    state.clickStayItem = searchItem.talk_type + '_' + searchItem.receiver_id
+  } else {
+    state.clickStayItem = ''
+  }
+  emits('clickStayItemChange', state.clickStayItem)
   let talk_type = searchItem.talk_type
   let receiver_id = searchItem.receiver_id
   if (searchResultKey === 'user_infos') {
@@ -695,6 +511,16 @@ const clickSearchItem = (searchResultKey, searchItem) => {
     encodeURIComponent(JSON.stringify(searchItem))
   )
 }
+
+//加载更多数据
+const doLoadMore = () => {
+  queryAllSearch()
+}
+
+// 暴露doLoadMore方法给父组件
+defineExpose({
+  doLoadMore
+})
 </script>
 <style lang="scss" scoped>
 .search-list {
@@ -717,7 +543,7 @@ const clickSearchItem = (searchResultKey, searchItem) => {
   }
   .search-result {
     width: 100%;
-    padding: 0 10px;
+    // padding: 0 10px;
     display: flex;
     flex-direction: row;
     align-items: flex-start;
@@ -726,13 +552,13 @@ const clickSearchItem = (searchResultKey, searchItem) => {
 
     .search-result-list {
       width: 100%;
-      // padding: 0 9px;
+      // padding: 0 10px;
 
       .search-result-part {
         margin: 18px 0 0;
 
         .result-title {
-          padding: 0 0 5px;
+          padding: 0 10px 5px;
           border-bottom: 1px solid #f8f8f8;
           span {
             line-height: 20px;
@@ -740,7 +566,7 @@ const clickSearchItem = (searchResultKey, searchItem) => {
           }
         }
         .result-has-more {
-          padding: 10px 0;
+          padding: 10px;
           border-bottom: 1px solid #f8f8f8;
           cursor: pointer;
           span {
diff --git a/src/directive/index.ts b/src/directive/index.ts
index 3d86bb8..5ec0497 100644
--- a/src/directive/index.ts
+++ b/src/directive/index.ts
@@ -1,6 +1,6 @@
-import dropsize from './dropsize'
-import focus from './focus'
-import loading from './loading'
+import dropsize from './dropsize.js'
+import focus from './focus.js'
+import loading from './loading.js'
 
 const directives = {
   dropsize,
diff --git a/src/plugins/directive/index.js b/src/plugins/directive/index.js
new file mode 100644
index 0000000..8e06a15
--- /dev/null
+++ b/src/plugins/directive/index.js
@@ -0,0 +1,118 @@
+import { Local } from "@/utils/erpStorage.js";
+import {debounce} from 'lodash-es'
+import { setupDirective as setupCustomDirectives } from '@/directive/index.ts'
+// 缓存按钮权限列表的key
+const BTN_PERMISSION_KEY = 'ruleBtn';
+
+// 工具函数: 获取权限列表
+const getPermissionList = () => Local.get(BTN_PERMISSION_KEY) || [];
+
+// 工具函数: 安全地移除DOM元素
+const safeRemoveElement = (el) => {
+  el.style.display = 'none';
+  requestAnimationFrame(() => el.parentNode?.removeChild(el));
+};
+
+export default (app) => {
+  // 防抖函数
+  const directives = {
+    // 禁止输入空格
+    'no-space': {
+      mounted(el) {
+        const input = el.tagName === 'INPUT' ? el : el.querySelector('input');
+        if (!input) return;
+        const handleInput = debounce((e) => {
+          const value = e.target.value;
+          const trimmedValue = value.replace(/\s/g, '');
+          if (value !== trimmedValue) {
+            e.target.value = trimmedValue;
+            // 创建一次性的input事件
+            const inputEvent = new InputEvent('input', { bubbles: true });
+            e.target.dispatchEvent(inputEvent);
+          }
+        }, 100);
+
+        input.addEventListener('input', handleInput);
+
+        // 存储清理函数
+        el._cleanup = () => input.removeEventListener('input', handleInput);
+      },
+      unmounted(el) {
+        // 清理事件监听
+        el._cleanup?.();
+      }
+    },
+
+    // 上拉加载更多
+    'loadmore': {
+      mounted(el, binding) {
+        const handleScroll = debounce(() => {
+          const { scrollHeight, scrollTop, clientHeight } = el;
+          const threshold = 50; // 提前触发的距离
+          const isNearBottom = scrollHeight - scrollTop - clientHeight <= threshold;
+
+          if (isNearBottom && typeof binding.value === 'function') {
+            binding.value();
+          }
+        }, 200);
+
+        el.addEventListener('scroll', handleScroll, { passive: true });
+
+        el._cleanup = () => el.removeEventListener('scroll', handleScroll);
+      },
+      unmounted(el) {
+        el._cleanup?.();
+      }
+    },
+
+    // 按钮权限控制
+    'permission': {
+      mounted(el, binding) {
+        if (!binding.value) return;
+        const btnList = getPermissionList();
+        const hasPermission = btnList.includes(binding.value);
+
+        if (!hasPermission) {
+          safeRemoveElement(el);
+        }
+      }
+    }
+  };
+
+  // 注册指令
+  Object.entries(directives).forEach(([name, directive]) => {
+    app.directive(name, directive);
+  });
+
+  // 权限检查函数
+  const hasPermission = (permissions) => {
+    const permissionList = getPermissionList();
+    if (!permissionList.length) return false;
+
+    const requiredPermissions = Array.isArray(permissions) ? permissions : [permissions];
+    return requiredPermissions.some(permission => permissionList.includes(permission));
+  };
+  // 缓存代理以提高性能
+  // 注册全局权限检查方法
+  app.config.globalProperties.$hadRule = new Proxy(hasPermission, {
+    // 创建缓存Map
+    cache: new Map(),
+    // 代理函数调用
+    apply(target, thisArg, args) {
+      // 将参数序列化作为缓存key
+      const key = JSON.stringify(args);
+      // 如果缓存中存在，直接返回缓存结果
+      if (this.cache.has(key)) {
+        return this.cache.get(key);
+      }
+
+      // 如果缓存中不存在，执行原函数并缓存结果
+      const result = target.apply(thisArg, args);
+      this.cache.set(key, result);
+      return result;
+    }
+  });
+
+  // 注册 src/directive 里的 loading、dropsize、focus 等指令
+  setupCustomDirectives(app)
+};
\ No newline at end of file
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index b61f112..32b4346 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -5,3 +5,8 @@ export * from './naive-ui'
 export * from './sms-lock'
 export * from './ws-socket'
 export * from './pinia'
+import directive from './directive'
+
+export function setupDirective(app) {
+  directive(app)
+}
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 46df863..6d85967 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -18,7 +18,7 @@ export function isLoggedIn() {
  */
 export function getAccessToken() {
   // return storage.get(AccessToken) || ''
-  return JSON.parse(localStorage.getItem('token'))||'79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b89642c979f5ab2d142ebbcb209ce7e7964c143edb27ba9be09900f4f4af311e8f5edee6f6b05af86d24daae9a9fd1d1cf686b1ac565663e192e2598c14c35470c9d760c4badd3a54f9c46c7b779684c7d0'
+  return JSON.parse(localStorage.getItem('token'))||'79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b896fc262d304ff89c0c77d33d884b0d50cb245a5ce4e0a66c9b041b7859ba0c0c9d942cd23551c1e1259cc5b726b936bffd334ead575db2f7cfd9f3316b61487d115c4cf634d764124b986a7dc71dec603'
 }
 
 /**
diff --git a/src/views/message/inner/IndexContent.vue b/src/views/message/inner/IndexContent.vue
index 87a9c8f..7c9260f 100644
--- a/src/views/message/inner/IndexContent.vue
+++ b/src/views/message/inner/IndexContent.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { reactive, computed, watch } from 'vue'
-import { NDrawer } from 'naive-ui'
+import { NDrawer, NCard } from 'naive-ui'
 import { useUserStore, useDialogueStore, useUploadsStore } from '@/store'
 import PanelHeader from './panel/PanelHeader.vue'
 import PanelContent from './panel/PanelContent.vue'
@@ -8,6 +8,7 @@ import PanelFooter from './panel/PanelFooter.vue'
 import GroupPanel from '@/components/group/GroupPanel.vue'
 import GroupNotice from '@/components/group/GroupNotice.vue'
 import UploadsModal from '@/components/base/UploadsModal.vue'
+import customModal from '@/components/common/customModal.vue'
 
 const userStore = useUserStore()
 const dialogueStore = useDialogueStore()
@@ -31,8 +32,14 @@ const talkParams = reactive({
 const state = reactive({
   // 是否显示群面板
   isShowGroupAside: false,
-
-  isShowGroupNotice: false
+  isShowGroupNotice: false,
+  isShowSearchRecordByConditionModal: false,//是否显示按条件搜索记录弹窗
+  customSearchRecordByConditionModalStyle: {
+    width: '997px',
+    height: '740px',
+    backgroundColor: '#F9F9FD'
+  },//按条件搜索记录弹窗样式
+  searchRecordByConditionText: ''//按条件搜索记录文本
 })
 
 const events = {
@@ -137,12 +144,123 @@ const onPanelHeaderEvent = (eventType: string) => {
       :gid="talkParams.receiver_id"
       @close="state.isShowGroupAside = false"
       :talkType="talkParams.type"
+      @handleSearchRecordByConditionModalShow="state.isShowSearchRecordByConditionModal = true"
     />
   </n-drawer>
+
+  <customModal
+    v-model:show="state.isShowSearchRecordByConditionModal"
+    title="与“{{ talkParams.username }}”的聊天记录"
+    :style="state.customSearchRecordByConditionModalStyle"
+    :customCloseBtn="true"
+    :closable="false"
+  >
+    <template #content>
+      <div class="search-record-modal-searchArea">
+        <n-card style="padding: 0 12px;">
+          <div class="search-record-input">
+            <span class="search-record-input-title">搜索</span>
+            <n-input
+              type="text"
+              v-model:value="state.searchRecordByConditionText"
+              placeholder="请输入"
+              clearable
+            >
+              <template #clear-icon>
+                <img src="@/assets/image/icon/close-btn-grey-line.png" alt="close" />
+              </template>
+            </n-input>
+          </div>
+          <div class="search-area-condition">
+            <span>文件</span>
+            <span>图片与视频</span>
+            <span>日期</span>
+            <span>群成员</span>
+          </div>
+        </n-card>
+      </div>
+      <div class="search-record-modal-content">
+        <n-card style="padding: 0 12px;">
+          <div class="search-record-card" v-if="state.searchRecordByConditionText">
+            
+          </div>
+          <div class="search-record-empty" v-if="!state.searchRecordByConditionText">
+            <img src="@/assets/image/chatList/search-empty.png" alt="" />
+            <span>无内容</span>
+          </div>
+        </n-card>
+      </div>
+    </template>
+  </customModal>
 </template>
 
 <style lang="less" scoped>
 .drawer-target {
   overflow: hidden;
 }
+.search-record-modal-searchArea{
+  box-sizing: border-box;
+  width: 100%;
+  padding: 0 12px;
+  :deep(.n-card) {
+    border: 0;
+    box-shadow: 0 3px 6px 1px rgba(188, 188, 188, 0.18);
+  }
+  :deep(.n-card__content){
+    padding: 27px 12px 0;
+  }
+  .search-record-input {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .search-record-input-title {
+      width: 78px;
+    }
+  }
+  .search-area-condition {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    padding: 22px 0 11px;
+    span{
+      font-size: 14px;
+      color: #46299D;
+      font-weight: 400;
+      line-height: 20px;
+      margin: 0 62px 0 0;
+      cursor: pointer;
+    }
+  }
+}
+.search-record-modal-content {
+  box-sizing: border-box;
+  width: 100%;
+  padding: 0 12px;
+  margin: 18px 0 0;
+  :deep(.n-card) {
+    border: 0;
+    box-shadow: 0 3px 6px 1px rgba(188, 188, 188, 0.18);
+  }
+  .search-record-card {
+    
+  }
+  .search-record-empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 455px;
+    box-sizing: border-box;
+    img {
+      width: 160px;
+      height: 104px;
+    }
+    span {
+      font-size: 14px;
+      color: #999;
+      font-weight: 400;
+      margin: 13px 0 0;
+    }
+  }
+}
 </style>
diff --git a/src/views/message/inner/IndexSider.vue b/src/views/message/inner/IndexSider.vue
index 2b8a351..4231586 100644
--- a/src/views/message/inner/IndexSider.vue
+++ b/src/views/message/inner/IndexSider.vue
@@ -93,14 +93,6 @@ const renderChatAppSearch = () => {
               last_receiver_group_name: '' //最后一条群名
             })
           )
-          state.ServeQueryTalkRecordDetailParams = encodeURIComponent(
-            JSON.stringify({
-              last_group_id: 0,
-              last_member_id: 0,
-              receiver_id: 40,
-              talk_type: 1
-            })
-          )
           state.isShowSearchRecordModal = true
         }
         console.log(searchResultKey, searchText)
@@ -247,7 +239,8 @@ const state = reactive({
   }, //自定义模态框样式
   searchRecordText: '', // 搜索聊天记录文本
   ServeQueryTalkRecordParams: '', // 搜索聊天记录参数
-  ServeQueryTalkRecordDetailParams: '' // 搜索聊天记录详情参数
+  ServeQueryTalkRecordDetailParams: '', // 搜索聊天记录详情参数
+  isShowSearchRecordDetailInfo: false // 是否显示搜索聊天记录详情
 })
 
 const items = computed((): ISession[] => {
@@ -460,6 +453,85 @@ const handleGroupChatListPaginationSize = (value) => {
   console.log(value, 'value')
   state.groupChatListPageSize = value
 }
+//处理搜索聊天记录点击
+const handleClickSearchItem = (searchText, searchResultKey, talk_type, receiver_id, res) => {
+  console.log(searchText, searchResultKey, talk_type, receiver_id)
+  const result = JSON.parse(decodeURIComponent(res))
+  console.log(result)
+  if (searchResultKey === 'general_infos') {
+    state.ServeQueryTalkRecordDetailParams = encodeURIComponent(
+      JSON.stringify({
+        last_group_id: 0, //最后一条群id
+        last_member_id: 0, //最后一条用户id
+        receiver_id: receiver_id, //查详情的时候需传入
+        talk_type: talk_type //1私聊2群聊
+      })
+    )
+    searchDetailListRef.value?.doLoadMore()
+  }
+}
+//处理点击停留item变化
+const handleClickStayItemChange = (item) => {
+  if (item) {
+    state.isShowSearchRecordDetailInfo = true
+  } else {
+    state.isShowSearchRecordDetailInfo = false
+  }
+}
+
+// 定义搜索列表组件的ref
+const searchListRef = ref()
+
+// 定义搜索详情列表组件的ref
+const searchDetailListRef = ref()
+
+//搜索聊天记录列表加载更多
+const loadMoreRecordList = () => {
+  searchListRef.value?.doLoadMore()
+}
+
+// 搜索聊天记录详情列表加载更多
+const loadMoreRecordDetail = () => {
+  searchDetailListRef.value?.doLoadMore()
+}
+
+const handleMoreRecordLastIdChange = (
+  last_id,
+  last_group_id,
+  last_member_id,
+  last_receiver_user_name,
+  last_receiver_group_name
+) => {
+  let idChanges = {
+    last_id,
+    last_group_id,
+    last_member_id,
+    last_receiver_user_name,
+    last_receiver_group_name
+  }
+  state.ServeQueryTalkRecordParams = encodeURIComponent(
+    JSON.stringify(
+      Object.assign({}, JSON.parse(decodeURIComponent(state.ServeQueryTalkRecordParams)), idChanges)
+    )
+  )
+}
+
+const handleRecordDetailLastIdChange = (last_id, last_group_id, last_member_id) => {
+  let idChanges = {
+    last_id,
+    last_group_id,
+    last_member_id
+  }
+  state.ServeQueryTalkRecordDetailParams = encodeURIComponent(
+    JSON.stringify(
+      Object.assign(
+        {},
+        JSON.parse(decodeURIComponent(state.ServeQueryTalkRecordDetailParams)),
+        idChanges
+      )
+    )
+  )
+}
 </script>
 
 <template>
@@ -692,26 +764,34 @@ const handleGroupChatListPaginationSize = (value) => {
             </n-input>
           </div>
           <div class="search-record-card" v-if="state.searchRecordText">
-            <div class="search-record-list">
+            <div class="search-record-list" v-loadmore="loadMoreRecordList">
               <chatAppSearchList
+                ref="searchListRef"
                 :searchResultPageSize="10"
                 :listLimit="false"
                 :apiRequest="ServeQueryTalkRecord"
                 :apiParams="state.ServeQueryTalkRecordParams"
-                :searchText="state.searchRecordText || '王'"
+                :searchText="state.searchRecordText"
                 :isPagination="true"
                 searchResultKey="general_infos"
+                @clickSearchItem="handleClickSearchItem"
+                :useClickStay="true"
+                @clickStayItemChange="handleClickStayItemChange"
+                @lastIdChange="handleMoreRecordLastIdChange"
               ></chatAppSearchList>
             </div>
-            <div class="search-record-detail">
+            <div class="search-record-detail" v-loadmore="loadMoreRecordDetail">
               <chatAppSearchList
+                ref="searchDetailListRef"
+                v-if="state.isShowSearchRecordDetailInfo"
                 :searchResultPageSize="10"
                 :listLimit="false"
                 :apiRequest="ServeQueryTalkRecord"
                 :apiParams="state.ServeQueryTalkRecordDetailParams"
-                :searchText="state.searchRecordText || '王'"
+                :searchText="state.searchRecordText"
                 :isPagination="true"
                 :searchRecordDetail="true"
+                @lastIdChange="handleRecordDetailLastIdChange"
               ></chatAppSearchList>
             </div>
           </div>

From c39d5aea8840fb796978225fb0cbaf8a5e40bfbf Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Fri, 16 May 2025 17:00:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=A5=E5=85=A5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E6=89=80=E5=9C=A8=E7=BE=A4?=
 =?UTF-8?q?=E8=81=8A=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=95=B4=E4=B8=AA=E9=80=9A=E8=AE=AF=E5=BD=95?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E4=BA=A4=E4=BA=92=E5=92=8C=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=8C=85=E6=8B=AC=E5=91=98=E5=B7=A5=E9=80=9A?=
 =?UTF-8?q?=E8=AE=AF=E5=BD=95=E5=92=8C=E7=BE=A4=E8=81=8A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=9B=E5=B9=B6=E5=AE=8C=E6=88=90=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E4=BC=9A=E8=AF=9D=E8=B7=B3=E8=BD=AC=EF=BC=9B?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E6=9D=A1=E4=BB=B6=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=AD=89=E5=BE=85=E6=8E=A5=E5=85=A5?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E7=9A=84=E6=8C=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/search.js                           |  15 +
 src/api/user.js                             |   5 +
 src/components/group/GroupPanel.vue         |  45 +-
 src/components/search/searchByCondition.vue | 896 ++++++++++++++++++++
 src/components/search/searchList.vue        |  18 +-
 src/utils/auth.js                           |   2 +-
 src/views/message/inner/IndexContent.vue    |  57 +-
 src/views/message/inner/IndexSider.vue      | 114 ++-
 8 files changed, 1097 insertions(+), 55 deletions(-)
 create mode 100644 src/components/search/searchByCondition.vue

diff --git a/src/api/search.js b/src/api/search.js
index ee3654e..7fa5928 100644
--- a/src/api/search.js
+++ b/src/api/search.js
@@ -9,3 +9,18 @@ export const ServeSeachQueryAll = (data = {}) => {
 export const ServeQueryTalkRecord = (data = {}) => {
   return post('/api/v1/elasticsearch/query-talk-record', data)
 }
+
+//查看存在聊天记录的天数
+export const ServeTalkDate = (data) => {
+  return post('/api/v1/talk/date', data)
+}
+
+//获取会话Id
+export const ServeGetSessionId = (data) => {
+  return post('/api/v1/talk/session/getId', data)
+}
+
+//获取用户所在群聊列表
+export const ServeUserGroupChatList = (data) => {
+  return post('/api/v1/group/user/list', data)
+}
diff --git a/src/api/user.js b/src/api/user.js
index 76c55b7..17bcd0b 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -29,3 +29,8 @@ export const ServeGetUserDetail = () => {
 export const ServeGetUserSetting = () => {
   return get('/api/v1/users/setting')
 }
+
+//根据erpUserId查询聊天系统用户详情
+export const getUserInfoByERPUserId = (data) => {
+  return post('/api/v1/users/info', data)
+}
diff --git a/src/components/group/GroupPanel.vue b/src/components/group/GroupPanel.vue
index a05357a..7e25748 100644
--- a/src/components/group/GroupPanel.vue
+++ b/src/components/group/GroupPanel.vue
@@ -223,28 +223,6 @@ const showSearchRecordByConditionModal = () => {
     </header>
 
     <main class="el-main main me-scrollbar me-scrollbar-thumb">
-      <div class="info-box" v-if="talkType === 1">
-        <div class="b-box b-box-bottomBorder" @click="showSearchRecordByConditionModal">
-          <div class="block">
-            <div class="title">查找聊天记录</div>
-            <img class="icon-right" src="@/assets/image/icon/arrow-right-grey.png" alt="" />
-          </div>
-        </div>
-
-        <div class="b-box">
-          <div class="block">
-            <div class="title">置顶会话</div>
-            <n-switch />
-          </div>
-        </div>
-
-        <div class="b-box">
-          <div class="block">
-            <div class="title">消息免打扰</div>
-            <n-switch />
-          </div>
-        </div>
-      </div>
       <div class="info-box" v-if="talkType === 2">
         <div class="b-box">
           <div class="block">
@@ -316,6 +294,29 @@ const showSearchRecordByConditionModal = () => {
         </div>
       </div>
 
+      <div class="info-box">
+        <div class="b-box b-box-bottomBorder" @click="showSearchRecordByConditionModal">
+          <div class="block">
+            <div class="title">查找聊天记录</div>
+            <img class="icon-right" src="@/assets/image/icon/arrow-right-grey.png" alt="" />
+          </div>
+        </div>
+
+        <div class="b-box">
+          <div class="block">
+            <div class="title">置顶会话</div>
+            <n-switch />
+          </div>
+        </div>
+
+        <div class="b-box">
+          <div class="block">
+            <div class="title">消息免打扰</div>
+            <n-switch />
+          </div>
+        </div>
+      </div>
+
       <div class="member-box" v-if="talkType === 2">
         <div class="flex">
           <n-input placeholder="搜索" v-model:value="state.keywords" :clearable="true" round>
diff --git a/src/components/search/searchByCondition.vue b/src/components/search/searchByCondition.vue
new file mode 100644
index 0000000..0ded9ab
--- /dev/null
+++ b/src/components/search/searchByCondition.vue
@@ -0,0 +1,896 @@
+<template>
+  <div class="outer-layer search-by-condition-page">
+    <div class="root">
+      <div v-if="state.condition === 'date'" class="search-by-date">
+        <tm-time-picker
+          :show="state.showMonthPicker"
+          :showDetail="{
+            year: true,
+            month: true,
+            day: false,
+            hour: false,
+            minute: false,
+            second: false,
+            am_pm: false
+          }"
+          :showSuffix="{
+            year: '',
+            month: ''
+          }"
+          :defaultValue="state.nowDate"
+          format="YYYY年MM月"
+          start=""
+          :end="state.maxDate"
+          @confirm="confirmSelectedMonth"
+          :round="0"
+          :title="'请选择聊天日期'"
+        >
+          <div class="search-date-picker">
+            <span class="text-[14px] font-regular">
+              {{ state.selectedMonth }}
+            </span>
+            <img src="@/static/image/search/down-pointer.png" />
+          </div>
+        </tm-time-picker>
+        <tm-calendar-view
+          :show="true"
+          :hideTool="true"
+          :hideButton="true"
+          :dateStyle="state.dateStyle"
+          :defaultValue="state.selectedDateArray"
+          v-model="state.selectedDateArray"
+          :disabledDate="state.disabledDateArray"
+          @click="selectDate"
+          model="day"
+          :end="state.maxDate"
+          @getDArray="getDArray"
+          :showDefault="false"
+        ></tm-calendar-view>
+      </div>
+      <div
+        class="search-by-condition-input-list"
+        v-if="
+          state.condition === 'imgAndVideo' ||
+          state.condition === 'file' ||
+          state.condition === 'link' ||
+          state.condition === 'member'
+        "
+        :style="{
+          padding: state.condition === 'imgAndVideo' ? '0 14px' : ''
+        }"
+      >
+        <div
+          class="search-by-condition-input"
+          v-if="state.condition === 'file' || state.condition === 'link'"
+        >
+          <!-- <customInput
+            :searchText="state.searchText"
+            :first_talk_record_infos="state.first_talk_record_infos"
+            @inputSearchText="inputSearchText"
+          ></customInput> -->
+          <span
+            @click="cancelSearch"
+            class="search-by-condition-input-text text-[16px] font-medium"
+          >
+            取消
+          </span>
+        </div>
+        <div class="search-by-condition-list">
+          <div class="condition-dimensionality">
+            <div
+              class="condition-dimensionality-each"
+              v-for="(conditionItem, conditionIndex) in state.searchResultList"
+              :key="conditionIndex"
+            >
+              <div class="condition-dimensionality-each-month">
+                <span class="text-[14px] font-regular">
+                  {{ conditionItem.dateMonth }}
+                </span>
+              </div>
+              <div
+                class="condition-each-resultList"
+                :class="[
+                  state.condition === 'imgAndVideo' ? 'condition-type-imgAndVideo-result' : ''
+                ]"
+              >
+                <div
+                  class="condition-each-resultList-each"
+                  v-for="(item, index) in conditionItem.monthResultList"
+                  :key="index"
+                  :style="{
+                    border:
+                      state.condition === 'imgAndVideo' || state.condition === 'member' ? '0' : '',
+                    padding: state.condition === 'imgAndVideo' ? '0 0 5px' : ''
+                  }"
+                >
+                  <div class="condition-result-member" v-if="state.condition === 'member'">
+                    <searchItem
+                      @click="toDialogueByMember(item)"
+                      :searchResultKey="'search_by_member_condition'"
+                      :searchItem="item"
+                      :searchText="state.searchText"
+                      :searchRecordDetail="true"
+                    ></searchItem>
+                  </div>
+                  <div
+                    class="condition-result-imgAndVideo"
+                    v-if="state.condition === 'imgAndVideo'"
+                  >
+                    <div
+                      class="condition-result-imgAndVideo-area"
+                      v-if="item?.extra?.items?.length > 0"
+                    >
+                      <div
+                        class="condition-result-imgAndVideo-each"
+                        v-for="(imgItem, imgIndex) in item?.extra?.items"
+                        :key="imgIndex"
+                      >
+                        <tm-image
+                          preview
+                          :src="imgItem?.content"
+                          v-if="imgItem?.type == 3"
+                          model="aspectFill"
+                        />
+                      </div>
+                    </div>
+                    <!-- <div class="condition-result-imgAndVideo-area" v-if="item?.extra?.url">
+                      <template v-if="item?.msg_type === 3">
+                        <tm-image preview :src="item?.extra?.url" model="aspectFill" />
+                      </template>
+                      <template v-else-if="item?.msg_type === 5">
+                        <div class="video-preview" @click="onPlay(item?.extra?.url)">
+                          <tm-image :src="item?.extra?.cover" model="aspectFill" />
+                          <div class="play-icon">
+                            <img :src="playCircle" />
+                          </div>
+                        </div>
+                      </template>
+                    </div> -->
+                  </div>
+                  <div
+                    class="condition-each-result-main"
+                    v-if="state.condition === 'file' || state.condition === 'link'"
+                  >
+                    <searchItem :searchItem="item" :conditionType="state.msg_type"></searchItem>
+                    <span class="text-[12px] font-medium condition-each-result-main-date">
+                      {{ item.dateTime }}
+                    </span>
+                  </div>
+                  <div
+                    class="condition-each-result-attachments"
+                    @click="previewPDF(item)"
+                    v-if="state.condition === 'file' || state.condition === 'link'"
+                  >
+                    <div class="attachment-avatar">
+                      <img :src="item?.extra?.file_avatar" v-if="state.condition === 'file'" />
+                      <img
+                        src="@/static/image/search/result-link-icon.png"
+                        v-if="state.condition === 'link'"
+                      />
+                    </div>
+                    <div class="attachment-info">
+                      <div class="attachment-info-title">
+                        <span class="text-[14px] font-regular" v-if="state.condition === 'file'">
+                          {{ item?.extra?.name }}
+                        </span>
+                        <span class="text-[14px] font-regular" v-if="state.condition === 'link'">
+                          分享链接
+                        </span>
+                      </div>
+                      <div
+                        class="attachment-sub-info"
+                        :style="{
+                          margin: state.condition === 'file' ? '10px 0 0' : ''
+                        }"
+                      >
+                        <span class="text-[12px] font-regular" v-if="state.condition === 'file'">
+                          {{ item?.extra?.typeText }}
+                        </span>
+                        <span
+                          class="text-[12px] font-regular"
+                          v-if="state.condition === 'file'"
+                          style="margin: 0 0 0 10px;"
+                        >
+                          {{ item?.extra?.fileSize }}
+                        </span>
+                        <span class="text-[12px] font-regular" v-if="state.condition === 'link'">
+                          {{ item?.extra?.content }}
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- <ZPaging
+        ref="zPaging"
+        :show-scrollbar="false"
+        @query="queryAllSearch"
+        :refresher-enabled="false"
+        :auto="false"
+        :loading-more-default-as-loading="true"
+        :inside-more="true"
+        v-model="state.flatList"
+      >
+        <template #top v-if="state.showPageTitle">
+          <customNavbar :title="state.pageTitle"></customNavbar>
+        </template>
+        
+      </ZPaging> -->
+      <teleport to="body">
+        <div v-show="open" class="video-container">
+          <video
+            :src="currentVideoUrl"
+            controls
+            @fullscreenchange="fullscreenchange"
+            :id="currentVideoUrl"
+            playsinline
+            webkit-playsinline
+            x5-playsinline
+            class="fullscreen-video"
+          ></video>
+        </div>
+      </teleport>
+    </div>
+  </div>
+</template>
+<script setup>
+// import { useDialogueStore } from '@/store'
+// import customInput from '@/components/custom-input/custom-input.vue'
+// import playCircle from '@/static/image/chatList/playCircle@2x.png'
+// import fileType_PPT from '@/static/image/search/fileType_PPT.png'
+// import fileType_EXCEL from '@/static/image/search/fileType_EXCEL.png'
+// import fileType_WORD from '@/static/image/search/fileType_WORD.png'
+// import fileType_PDF from '@/static/image/search/fileType_PDF.png'
+// import fileType_Files from '@/static/image/search/fileType_Files.png'
+// import ZPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue'
+// import useZPaging from '@/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js'
+// const zPaging = ref()
+// useZPaging(zPaging)
+
+// const dialogueStore = useDialogueStore()
+// const dialogueParams = reactive({
+//   talk_type: computed(() => dialogueStore.talk.talk_type),
+//   receiver_id: computed(() => dialogueStore.talk.receiver_id)
+// })
+const dialogueParams = reactive({
+  talk_type: 1,
+  receiver_id: 1
+})
+
+import { onMounted, reactive, computed, ref, nextTick, watch } from 'vue'
+import searchItem from './searchItem.vue'
+import { ServeFindTalkRecords } from '@/api/chat.js'
+import { ServeTalkDate, ServeGetSessionId } from '@/api/search.js'
+import { parseTime } from '@/utils/datetime'
+import { fileFormatSize, fileSuffix } from '@/utils/strings'
+
+let nowDay = new Date().setHours(0, 0, 0, 0)
+
+const props = defineProps({
+  conditionType: {
+    //搜索条件
+    type: String,
+    default: ''
+  }
+})
+
+const state = reactive({
+  pageTitle: '', //页面标题
+  dateStyle: [], //日期样式
+  nowDate: new Date(nowDay), //当前时间
+  maxDate: new Date(nowDay), //可选择最大时间
+  selectedDateArray: Array(new Date(nowDay)), //选择的月份数组
+  showMonthPicker: false, //是否显示月份选择
+  selectedMonth: new Date(nowDay), //当前选择的月份
+  disabledDateArray: [], //被禁用的日期数组
+  dArray: [], //日历日期数组
+  showPageTitle: false, //是否显示页面标题
+  searchText: '', //搜索内容
+  first_talk_record_infos: Object,
+  searchResultList: [], //搜索结果列表
+  cursor: 0, //上次查询的游标
+  msg_type: 0, //查询的消息类型
+  group_member_id: 0, //群成员id
+  flatList: [] // 用于存储扁平化的数据
+})
+
+watch(
+  () => props?.conditionType,
+  (newVal, oldVal) => {
+    console.log(newVal, oldVal)
+    state.condition = newVal
+    if (newVal) {
+      if (newVal === 'member') {
+        state.showPageTitle = true
+        state.pageTitle = '按群成员查找'
+        state.group_member_id = options.groupMemberId
+        queryAllSearch()
+      } else if (newVal === 'date') {
+        state.showPageTitle = true
+        state.pageTitle = '按日期查找'
+        ServeQueryTalkDate(parseTime(state.nowDate, '{y}{m}'))
+      } else if (newVal === 'imgAndVideo') {
+        state.showPageTitle = true
+        state.pageTitle = '图片与视频'
+        state.msg_type = '3,5'
+        queryAllSearch()
+      } else if (newVal === 'file') {
+        console.log(dialogueParams)
+        let first_talk_record_infos = {
+          receiver_name: '文件'
+        }
+        state.first_talk_record_infos = Object.assign(
+          {},
+          state.first_talk_record_infos,
+          first_talk_record_infos
+        )
+        state.msg_type = 6
+        queryAllSearch()
+      } else if (newVal === 'link') {
+        console.log(dialogueParams)
+        let first_talk_record_infos = {
+          receiver_name: '链接'
+        }
+        state.first_talk_record_infos = Object.assign(
+          {},
+          state.first_talk_record_infos,
+          first_talk_record_infos
+        )
+        state.msg_type = 14
+        queryAllSearch()
+      }
+    }
+  },
+  {
+    immediate: true,
+    deep: true
+  }
+)
+
+const videoContext = ref()
+const open = ref(false)
+const currentVideoUrl = ref('')
+
+const fullscreenchange = (e) => {
+  if (!e.detail.fullScreen) {
+    videoContext.value.stop()
+    videoContext.value.seek(0)
+    open.value = false
+  }
+}
+
+async function onPlay(url) {
+  currentVideoUrl.value = url
+  open.value = true
+
+  // 等待 DOM 更新
+  await nextTick()
+
+  // 创建新的视频上下文
+  videoContext.value = uni.createVideoContext(url, getCurrentInstance())
+
+  setTimeout(() => {
+    // 先请求全屏
+    videoContext.value.requestFullScreen({ direction: 2 })
+
+    // 延迟一下再播放，确保全屏已经完成
+    setTimeout(() => {
+      videoContext.value.play()
+    }, 100)
+  }, 200)
+}
+
+onMounted(() => {
+  state.selectedMonth = parseTime(state.selectedMonth, '{y}年{m}月')
+  state.dateStyle = [
+    {
+      date: state.nowDate, //日期
+      text: false, //浅色背景。
+      color: '#46299D', //主题色.
+      extra: '今天' //额外的内容，在日期下方显示的文本。
+    }
+  ]
+})
+
+//查看存在聊天记录的天数
+const ServeQueryTalkDate = (month) => {
+  let params = {
+    month: month,
+    talk_type: dialogueParams.talk_type, //1私聊2群聊
+    receiver_id: dialogueParams.receiver_id //目标人id
+  }
+  const resp = ServeTalkDate(params)
+  console.log(resp)
+  resp.then(({ code, data }) => {
+    console.log(data)
+    if (code == 200) {
+      if (data && data.length > 0) {
+        const formattedData = data.map(
+          (item) => item.substring(0, 4) + '/' + item.substring(4, 6) + '/' + item.substring(6, 8)
+        )
+        let disabledDateArray = state.dArray.filter((dIt) => !formattedData.includes(dIt))
+        disabledDateArray = disabledDateArray.map((item) => item.replace(/\//g, '-'))
+        console.log(disabledDateArray)
+        state.disabledDateArray = disabledDateArray
+      } else {
+        state.disabledDateArray = state.dArray
+      }
+    } else {
+    }
+  })
+
+  resp.catch(() => {})
+}
+
+//点击选择日期
+const selectDate = async (e) => {
+  if (e == parseTime(state.nowDate, '{y}/{m}/{d}')) {
+    console.log('==今日')
+    state.dateStyle = [
+      {
+        date: state.nowDate, //日期
+        text: false, //浅色背景。
+        color: '#46299D', //主题色.
+        extra: '今天' //额外的内容，在日期下方显示的文本。
+      }
+    ]
+  } else {
+    state.dateStyle = [
+      {
+        date: state.nowDate, //日期
+        text: false, //浅色背景。
+        color: '', //主题色.
+        extra: '今天' //额外的内容，在日期下方显示的文本。
+      },
+      {
+        date: new Date(e), //日期
+        text: false, //浅色背景。
+        color: '#46299D' //主题色.
+      }
+    ]
+  }
+  const sessionId = await getSessionId(dialogueParams.talk_type, dialogueParams.receiver_id)
+  uni.navigateTo({
+    url:
+      '/pages/dialog/index?sessionId=' +
+      sessionId +
+      '&keepDialogInfo=1' +
+      '&recordDate=' +
+      parseTime(e, '{y}-{m}-{d}')
+  })
+}
+
+//获取会话Id
+const getSessionId = (talk_type, receiver_id) => {
+  return new Promise((resolve, reject) => {
+    let params = {
+      talkType: talk_type,
+      receiverId: receiver_id
+    }
+    const resp = ServeGetSessionId(params)
+    console.log(resp)
+    resp.then(({ code, data }) => {
+      console.log(data)
+      if (code == 200) {
+        resolve(data?.sessionId)
+      } else {
+      }
+    })
+    resp.catch(() => {})
+  })
+}
+
+//点击确认选择月份
+const confirmSelectedMonth = (e) => {
+  console.log(e)
+  state.selectedMonth = parseTime(e, '{y}年{m}月')
+  // console.log()
+  let newDate = new Date(e)
+  newDate.setHours(0, 0, 0, 0)
+  newDate.setDate(1)
+  state.selectedDateArray = Array(new Date(newDate))
+  state.dateStyle = [
+    {
+      date: state.nowDate, //日期
+      text: false, //浅色背景。
+      color: '', //主题色.
+      extra: '今天' //额外的内容，在日期下方显示的文本。
+    }
+  ]
+  ServeQueryTalkDate(parseTime(e, '{y}{m}'))
+}
+
+//获取日历日期数组
+const getDArray = (dArray) => {
+  state.dArray = dArray
+}
+
+//输入搜索内容
+const inputSearchText = (e) => {
+  state.searchText = e
+  state.cursor = 0
+  queryAllSearch()
+}
+
+//点击取消搜索
+const cancelSearch = () => {
+  const pages = getCurrentPages()
+  if (pages.length > 1) {
+    uni.navigateBack({
+      delta: 1
+    })
+  } else {
+    uni.reLaunch({
+      url: '/pages/index/index'
+    })
+  }
+}
+
+//查询数据
+const queryAllSearch = () => {
+  let params = {
+    talk_type: dialogueParams.talk_type, //1私聊；2群聊
+    receiver_id: dialogueParams.receiver_id, //目标用户id或群聊id
+    msg_type: state.msg_type, //消息类型：0:全部;2:代码;3:图片;4:音频;5:视频;6:文件;7:位置;9:会话;11群投票;12图文混合
+    cursor: state.cursor, //上次查询的游标
+    limit: 10, //数据行数
+    no_limit: '', //1不限制
+    direction: 'up', //down向下查最新，up向上查老数据
+    start_time: '',
+    end_time: '',
+    group_member_user_id: state.group_member_id, //群成员id，当查询群历史消息的时候，需要指定群成员的时候送
+    file_name: state.msg_type === 6 ? state.searchText : ''
+  }
+  console.log(params)
+  const resp = ServeFindTalkRecords(params)
+  console.log(resp)
+  resp.then(({ code, data }) => {
+    console.log(data)
+    if (code == 200) {
+      // 当cursor为0时，清空searchResultList
+      let dateList = state.cursor === 0 ? [] : state.searchResultList
+      let noMore = false
+      if (data?.items?.length > 0) {
+        data.items.forEach((item) => {
+          item.dateTime = parseTime(item?.created_at, '{m}/{d}')
+          if (item?.extra) {
+            item.extra.fileSize = fileFormatSize(item?.extra?.size)
+            item.extra.typeText = item?.extra?.name ? fileSuffix(item?.extra?.name) : ''
+            item.extra.file_avatar = fileTypeAvatar(item?.extra?.typeText)
+            console.log(item.extra.type)
+          }
+          let year = new Date(item.created_at).getFullYear()
+          let month = new Date(item.created_at).getMonth() + 1
+          let dateMonth =
+            year == state.nowDate.getFullYear() && month == state.nowDate.getMonth() + 1
+              ? '这个月'
+              : year + '年' + month + '月'
+          if (dateList.length > 0) {
+            let hasAdd = false
+            dateList.forEach((dateItem) => {
+              if (dateItem.dateMonth === dateMonth) {
+                dateItem.monthResultList.push(item)
+                hasAdd = true
+              }
+            })
+            if (!hasAdd) {
+              console.log(dateList)
+              dateList.push({
+                dateMonth: dateMonth,
+                monthResultList: [item]
+              })
+            }
+          } else {
+            dateList.push({
+              dateMonth: dateMonth,
+              monthResultList: [item]
+            })
+          }
+        })
+      } else {
+        noMore = true
+      }
+
+      // 保存分组数据用于显示
+      state.searchResultList = dateList
+
+      // 将分组数据扁平化，用于z-paging分页
+      state.flatList = dateList.reduce((acc, group) => {
+        return acc.concat(group.monthResultList)
+      }, [])
+
+      if (state.cursor === 0) {
+        // zPaging.value?.complete(state.flatList)
+      } else {
+        // zPaging.value?.completeByNoMore(state.flatList, noMore)
+      }
+      state.cursor = data?.cursor
+    } else {
+      if (state.cursor === 0) {
+        state.searchResultList = []
+        state.flatList = []
+      }
+      // zPaging.value?.complete([])
+    }
+  })
+
+  resp.catch(() => {
+    if (state.cursor === 0) {
+      state.searchResultList = []
+      state.flatList = []
+    }
+    // zPaging.value?.complete([])
+  })
+}
+
+//文件类型图标
+const fileTypeAvatar = (fileType) => {
+  // let file_type_avatar = fileType_Files
+  // if (fileType) {
+  //   if (fileType === 'ppt' || fileType === 'pptx') {
+  //     file_type_avatar = fileType_PPT
+  //   } else if (fileType === 'pdf') {
+  //     file_type_avatar = fileType_PDF
+  //   } else if (fileType === 'doc' || fileType === 'docx') {
+  //     file_type_avatar = fileType_WORD
+  //   } else if (fileType === 'xls' || fileType === 'xlsx') {
+  //     file_type_avatar = fileType_EXCEL
+  //   } else {
+  //     file_type_avatar = fileType_Files
+  //   }
+  // }
+  // return file_type_avatar
+  return ''
+}
+
+const previewPDF = (item) => {
+  console.log(item)
+  if (typeof plus !== 'undefined') {
+    downloadAndOpenFile(item)
+  } else {
+    document.addEventListener('plusready', () => {
+      downloadAndOpenFile(item)
+    })
+  }
+}
+
+const downloadAndOpenFile = (item) => {
+  uni.showLoading({ title: '加载中...', mask: true })
+  const downloadUrl = item?.extra?.path
+  const options = {
+    filename: '_doc/downloads/' // 保存路径
+  }
+  const dtask = plus.downloader.createDownload(downloadUrl, options, function (d, status) {
+    if (status === 200) {
+      uni.hideLoading()
+      const filePath = d.filename
+      plus.runtime.openFile(
+        filePath,
+        {},
+        function () {},
+        function (error) {}
+      )
+    } else {
+      uni.hideLoading()
+    }
+  })
+  dtask.start()
+}
+
+//跳转到对应的记录位置
+const toDialogueByMember = async (msgInfo) => {
+  const sessionId = await getSessionId(dialogueParams.talk_type, dialogueParams.receiver_id)
+  uni.navigateTo({
+    url:
+      '/pages/dialog/index?sessionId=' +
+      sessionId +
+      '&keepDialogInfo=1' +
+      '&msgInfo=' +
+      encodeURIComponent(JSON.stringify(msgInfo))
+  })
+}
+</script>
+<style scoped lang="scss">
+.search-by-date {
+  .search-date-picker {
+    padding: 10px 16px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+    span {
+      line-height: 20px;
+      color: #999999;
+    }
+    img {
+      width: 9px;
+      height: 6px;
+      margin: 0 0 0 13px;
+    }
+  }
+}
+
+body:deep(.text-overflow-1) {
+  color: #666666 !important;
+  line-height: 22px !important;
+  font-size: 16px !important;
+  font-weight: bold !important;
+}
+body:deep(.tmicon-times-circle-fill) {
+  width: 19px;
+  height: 19px;
+}
+body:deep(.round-3) {
+  background: linear-gradient(to right, #674bbc, #46299d);
+}
+
+.search-by-condition-input-list {
+  padding: 10px 24px 0 21px;
+  .search-by-condition-input {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    .search-by-condition-input-text {
+      flex-shrink: 0;
+      margin: 0 0 0 10px;
+      color: #46299d;
+    }
+  }
+
+  .search-by-condition-list {
+    .condition-dimensionality {
+      .condition-dimensionality-each {
+        .condition-dimensionality-each-month {
+          padding: 12px 0 5px;
+          span {
+            line-height: 20px;
+            color: #999999;
+          }
+        }
+        .condition-each-resultList {
+          .condition-each-resultList-each {
+            border-bottom: 1px solid #f8f8f8;
+            padding: 0 0 10px;
+            .condition-each-result-main {
+              display: flex;
+              flex-direction: row;
+              align-items: center;
+              justify-content: space-between;
+              .condition-each-result-main-date {
+                line-height: 17px;
+                color: #999999;
+              }
+            }
+            .condition-each-result-attachments {
+              display: flex;
+              flex-direction: row;
+              align-items: center;
+              justify-content: flex-start;
+              padding: 12px 15px;
+              background-color: #f3f3f3;
+              border-radius: 4px;
+              .attachment-avatar {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                justify-content: center;
+                flex-shrink: 0;
+                img {
+                  width: 48px;
+                  height: 48px;
+                }
+              }
+              .attachment-info {
+                display: flex;
+                flex-direction: column;
+                align-items: flex-start;
+                justify-content: center;
+                margin: 0 0 0 11px;
+                .attachment-info-title {
+                  display: flex;
+                  flex-direction: row;
+                  align-items: center;
+                  justify-content: flex-start;
+                  span {
+                    line-height: 20px;
+                    color: #191919;
+                    word-break: break-all;
+                  }
+                }
+                .attachment-sub-info {
+                  display: flex;
+                  flex-direction: row;
+                  align-items: center;
+                  justify-content: flex-start;
+                  span {
+                    line-height: 17px;
+                    color: #999999;
+                    word-break: break-all;
+                    display: -webkit-box;
+                    -webkit-box-orient: vertical;
+                    -webkit-line-clamp: 2;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                  }
+                }
+              }
+            }
+          }
+        }
+        .condition-type-imgAndVideo-result {
+          border-bottom: 0;
+          padding: 0;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: flex-start;
+          flex-wrap: wrap;
+          .condition-each-resultList-each {
+            .condition-result-imgAndVideo {
+              margin: 0 3px;
+              :deep(.overflow) {
+                width: 82px !important;
+                height: 82px !important;
+              }
+              .condition-result-imgAndVideo-area {
+                :deep(.overflow) {
+                  width: 82px !important;
+                  height: 82px !important;
+                }
+                :deep(.round-0) {
+                  width: 82px !important;
+                  height: 82px !important;
+                }
+                .video-preview {
+                  position: relative;
+                  width: 82px;
+                  height: 82px;
+                  cursor: pointer;
+                  .play-icon {
+                    position: absolute;
+                    top: 50%;
+                    left: 50%;
+                    transform: translate(-50%, -50%);
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+
+                    img {
+                      width: 40px !important;
+                      height: 40px !important;
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+.video-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background: #000;
+  z-index: 9999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.fullscreen-video {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+</style>
diff --git a/src/components/search/searchList.vue b/src/components/search/searchList.vue
index f1293f6..7c69137 100644
--- a/src/components/search/searchList.vue
+++ b/src/components/search/searchList.vue
@@ -235,7 +235,10 @@ const inputSearchText = (e) => {
 }
 
 // ES搜索聊天记录-主页搜索什么都有、指定用户、指定群、群与用户概览
-const queryAllSearch = () => {
+const queryAllSearch = (doClearSearchResult) => {
+  if (doClearSearchResult) {
+    state.searchResult = null
+  }
   let params = {
     key: state.searchText, //关键字
     size: props.searchResultPageSize
@@ -329,12 +332,9 @@ const queryAllSearch = () => {
             state.searchResult = data
           } else {
             // 加载更多，合并数据
-            if (
-              paginationKey &&
-              Array.isArray((state?.searchResult && state?.searchResult[paginationKey]) || [])
-            ) {
-              data[paginationKey] = state.searchResult[paginationKey].concat(data[paginationKey])
-            }
+            data[paginationKey] = (state.searchResult?.[paginationKey] || []).concat(
+              data[paginationKey]
+            )
             state.searchResult = data
           }
 
@@ -513,8 +513,8 @@ const clickSearchItem = (searchResultKey, searchItem) => {
 }
 
 //加载更多数据
-const doLoadMore = () => {
-  queryAllSearch()
+const doLoadMore = (doClearSearchResult) => {
+  queryAllSearch(doClearSearchResult)
 }
 
 // 暴露doLoadMore方法给父组件
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 6d85967..c088ac6 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -18,7 +18,7 @@ export function isLoggedIn() {
  */
 export function getAccessToken() {
   // return storage.get(AccessToken) || ''
-  return JSON.parse(localStorage.getItem('token'))||'79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b896fc262d304ff89c0c77d33d884b0d50cb245a5ce4e0a66c9b041b7859ba0c0c9d942cd23551c1e1259cc5b726b936bffd334ead575db2f7cfd9f3316b61487d115c4cf634d764124b986a7dc71dec603'
+  return JSON.parse(localStorage.getItem('token'))||'79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b894e81e7367079550f5bfe506cb1d1874de13cb7696a188e09b47b9997c92972e501cbcaf2601dc4d1981a2f9bdbfe2ddef970f3e2d760b94e5947f9fe004528f5214a8cd9a92de884cc64bfa32d716e25'
 }
 
 /**
diff --git a/src/views/message/inner/IndexContent.vue b/src/views/message/inner/IndexContent.vue
index 7c9260f..8cb091f 100644
--- a/src/views/message/inner/IndexContent.vue
+++ b/src/views/message/inner/IndexContent.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { reactive, computed, watch } from 'vue'
-import { NDrawer, NCard } from 'naive-ui'
+import { NDrawer, NCard, NTag } from 'naive-ui'
 import { useUserStore, useDialogueStore, useUploadsStore } from '@/store'
 import PanelHeader from './panel/PanelHeader.vue'
 import PanelContent from './panel/PanelContent.vue'
@@ -9,6 +9,7 @@ import GroupPanel from '@/components/group/GroupPanel.vue'
 import GroupNotice from '@/components/group/GroupNotice.vue'
 import UploadsModal from '@/components/base/UploadsModal.vue'
 import customModal from '@/components/common/customModal.vue'
+import historyRecord from '@/components/search/searchByCondition.vue'
 
 const userStore = useUserStore()
 const dialogueStore = useDialogueStore()
@@ -33,13 +34,15 @@ const state = reactive({
   // 是否显示群面板
   isShowGroupAside: false,
   isShowGroupNotice: false,
-  isShowSearchRecordByConditionModal: false,//是否显示按条件搜索记录弹窗
+  isShowSearchRecordByConditionModal: false, //是否显示按条件搜索记录弹窗
   customSearchRecordByConditionModalStyle: {
     width: '997px',
     height: '740px',
     backgroundColor: '#F9F9FD'
-  },//按条件搜索记录弹窗样式
-  searchRecordByConditionText: ''//按条件搜索记录文本
+  }, //按条件搜索记录弹窗样式
+  searchRecordByConditionText: '', //按条件搜索记录文本
+  conditionTag: '', //当前条件标签
+  conditionType: '' //当前条件类型
 })
 
 const events = {
@@ -63,6 +66,22 @@ watch(
 const onPanelHeaderEvent = (eventType: string) => {
   events[eventType] && events[eventType]()
 }
+//点击切换搜索条件/分类
+const changeConditionTag = (tag) => {
+  console.log(tag)
+  state.conditionType = tag
+  if (tag === 'file') {
+    state.conditionTag = '文件'
+  } else if (tag === 'imgAndVideo') {
+    state.conditionTag = '图片与视频'
+  } else if (tag === 'date') {
+    state.conditionTag = '日期'
+  } else if (tag === 'member') {
+    state.conditionTag = '群成员'
+  } else {
+    state.conditionTag = ''
+  }
+}
 </script>
 
 <template>
@@ -150,7 +169,7 @@ const onPanelHeaderEvent = (eventType: string) => {
 
   <customModal
     v-model:show="state.isShowSearchRecordByConditionModal"
-    title="与“{{ talkParams.username }}”的聊天记录"
+    :title='`与“${talkParams.username}”的聊天记录`'
     :style="state.customSearchRecordByConditionModalStyle"
     :customCloseBtn="true"
     :closable="false"
@@ -169,22 +188,27 @@ const onPanelHeaderEvent = (eventType: string) => {
               <template #clear-icon>
                 <img src="@/assets/image/icon/close-btn-grey-line.png" alt="close" />
               </template>
+              <template #prefix>
+                <n-tag closable v-if="state.conditionTag" @close="changeConditionTag('')">
+                  {{ state.conditionTag }}
+                </n-tag>
+              </template>
             </n-input>
           </div>
           <div class="search-area-condition">
-            <span>文件</span>
-            <span>图片与视频</span>
-            <span>日期</span>
-            <span>群成员</span>
+            <span @click="changeConditionTag('file')">文件</span>
+            <span @click="changeConditionTag('imgAndVideo')">图片与视频</span>
+            <span @click="changeConditionTag('date')">日期</span>
+            <span @click="changeConditionTag('member')">群成员</span>
           </div>
         </n-card>
       </div>
       <div class="search-record-modal-content">
         <n-card style="padding: 0 12px;">
-          <div class="search-record-card" v-if="state.searchRecordByConditionText">
-            
+          <div class="search-record-card" v-if="state.searchRecordByConditionText || state.conditionType">
+            <historyRecord :conditionType="state.conditionType" />
           </div>
-          <div class="search-record-empty" v-if="!state.searchRecordByConditionText">
+          <div class="search-record-empty" v-if="!state.searchRecordByConditionText && !state.conditionType">
             <img src="@/assets/image/chatList/search-empty.png" alt="" />
             <span>无内容</span>
           </div>
@@ -198,7 +222,7 @@ const onPanelHeaderEvent = (eventType: string) => {
 .drawer-target {
   overflow: hidden;
 }
-.search-record-modal-searchArea{
+.search-record-modal-searchArea {
   box-sizing: border-box;
   width: 100%;
   padding: 0 12px;
@@ -206,7 +230,7 @@ const onPanelHeaderEvent = (eventType: string) => {
     border: 0;
     box-shadow: 0 3px 6px 1px rgba(188, 188, 188, 0.18);
   }
-  :deep(.n-card__content){
+  :deep(.n-card__content) {
     padding: 27px 12px 0;
   }
   .search-record-input {
@@ -222,9 +246,9 @@ const onPanelHeaderEvent = (eventType: string) => {
     align-items: center;
     justify-content: flex-start;
     padding: 22px 0 11px;
-    span{
+    span {
       font-size: 14px;
-      color: #46299D;
+      color: #46299d;
       font-weight: 400;
       line-height: 20px;
       margin: 0 62px 0 0;
@@ -242,7 +266,6 @@ const onPanelHeaderEvent = (eventType: string) => {
     box-shadow: 0 3px 6px 1px rgba(188, 188, 188, 0.18);
   }
   .search-record-card {
-    
   }
   .search-record-empty {
     display: flex;
diff --git a/src/views/message/inner/IndexSider.vue b/src/views/message/inner/IndexSider.vue
index 4231586..5b097a1 100644
--- a/src/views/message/inner/IndexSider.vue
+++ b/src/views/message/inner/IndexSider.vue
@@ -7,7 +7,8 @@ import {
   reactive,
   onBeforeMount,
   getCurrentInstance,
-  h
+  h,
+  nextTick
 } from 'vue'
 import { onBeforeRouteUpdate } from 'vue-router'
 import { useDialogueStore, useTalkStore } from '@/store'
@@ -36,7 +37,11 @@ import xNDataTable from '@/components/x-naive-ui/x-n-data-table/index.vue'
 import flTree from '@/components/flnlayout/tree/flnindex.vue'
 import { processError, processSuccess } from '@/utils/helper/message.js'
 import chatAppSearchList from '@/components/search/searchList.vue'
-import { ServeSeachQueryAll, ServeQueryTalkRecord } from '@/api/search'
+import { ServeSeachQueryAll, ServeQueryTalkRecord, ServeUserGroupChatList } from '@/api/search'
+import { getUserInfoByERPUserId } from '@/api/user'
+
+import { useRouter } from 'vue-router'
+const router = useRouter()
 
 const currentInstance = getCurrentInstance()
 const $request = currentInstance?.appContext.config.globalProperties?.$request
@@ -179,7 +184,7 @@ const state = reactive({
       field: 'groupName',
       width: 200,
       render(row, index) {
-        return row.groupName
+        return row.group_name
       }
     },
     {
@@ -188,7 +193,16 @@ const state = reactive({
       width: 400,
       ellipsis: true,
       render(row, index) {
-        return row.groupType
+        let groupType = row.group_type
+        if (groupType == 1) {
+          return '普通群'
+        } else if (groupType == 2) {
+          return '部门群'
+        } else if (groupType == 3) {
+          return '项目群'
+        } else if (groupType == 4) {
+          return '公司群'
+        }
       }
     },
     {
@@ -275,10 +289,39 @@ watch(
       state.addressBookTableWidth = 800
       state.clickKey = 3
       state.treeRefreshCount++
+      state.addressBookPage = 1
     }
     getDepPoisUser()
   }
 )
+watch(
+  () => state.groupChatListSearchGroupName,
+  (newValue, oldValue) => {
+    if (newValue) {
+      state.groupChatListPage = 1
+    } else {
+      state.groupChatListPage = 1
+    }
+    getUserGroupChatList()
+  }
+)
+
+// watch(
+//   () => state.searchRecordText,
+//   (newValue, oldValue) => {
+//     console.log(newValue, 'newValue')
+//     state.ServeQueryTalkRecordParams = encodeURIComponent(
+//       JSON.stringify({
+//         talk_type: 0, //1私聊2群聊
+//         receiver_id: 0, //查详情的时候需传入
+//         last_group_id: 0, //最后一条群id
+//         last_member_id: 0, //最后一条用户id
+//         last_receiver_user_name: '', //最后一条用户名
+//         last_receiver_group_name: '' //最后一条群名
+//       })
+//     )
+//   }
+// )
 
 // 列表加载状态
 const loadStatus = computed(() => talkStore.loadStatus)
@@ -338,6 +381,7 @@ onBeforeRouteUpdate(onInitialize)
 
 onBeforeMount(() => {
   getTreeData()
+  getUserGroupChatList()
 })
 
 onMounted(() => {
@@ -412,8 +456,40 @@ const getDepPoisUser = () => {
   })
 }
 //点击进入对应的聊天
-const handleEnterChat = (row) => {
+const handleEnterChat = async (row) => {
   console.log(row)
+  if (state.addressBookCurrentTab === 'employeeAddressBook') {
+    //员工通讯录，聊天类型一定为单聊
+    await getUserInfoByERPUserId({ erp_user_id: row.ID }).then((res) => {
+      // console.log(res)
+      if (res.code === 200) {
+        let sysUserInfo = res.data
+        talkStore.toTalk(1, sysUserInfo.sys_id, router)
+      }
+    })
+  } else if (state.addressBookCurrentTab === 'groupChatList') {
+    //群聊列表，聊天类型一定为群聊
+    talkStore.toTalk(2, row.id, router)
+  }
+  state.isShowAddressBookModal = false
+  resetAddressBookModal()
+}
+//恢复默认通讯录模态框
+const resetAddressBookModal = () => {
+  nextTick(() => {
+    state.addressBookCurrentTab = 'employeeAddressBook'
+    state.addressBookSearchNickName = ''
+    state.groupChatListSearchGroupName = ''
+    state.addressBookTableWidth = 800
+    state.clickKey = 3
+    state.treeRefreshCount++
+    state.addressBookPage = 1
+    state.addressBookPageSize = 10
+    state.groupChatListPage = 1
+    state.groupChatListPageSize = 10
+    getDepPoisUser()
+    getUserGroupChatList()
+  })
 }
 //处理页数变化
 const handleAddressBookPagination = (page) => {
@@ -442,16 +518,40 @@ const handleAddressBookTabChange = (value) => {
 //处理群聊列表搜索
 const changeGroupChatListSearch = (value) => {
   console.log(value, 'value')
+  if (!value.groupName?.trim()) {
+    state.groupChatListSearchGroupName = ''
+  } else {
+    state.groupChatListSearchGroupName = value.groupName
+  }
 }
+//获取用户所在群聊列表
+const getUserGroupChatList = () => {
+  let params = {
+    page: state.groupChatListPage,
+    page_size: state.groupChatListPageSize,
+    group_name: state.groupChatListSearchGroupName
+  }
+  ServeUserGroupChatList(params).then((res) => {
+    // console.log(res)
+    if (res.code === 200) {
+      state.groupChatListData = res?.data?.items || []
+      state.groupChatListTotal = res?.data?.total || 0
+    }
+  })
+}
+
 //处理群聊列表页数变化
 const handleGroupChatListPagination = (value) => {
   console.log(value, 'value')
   state.groupChatListPage = value
+  getUserGroupChatList()
 }
 //处理群聊列表每页条数变化
 const handleGroupChatListPaginationSize = (value) => {
   console.log(value, 'value')
   state.groupChatListPageSize = value
+  state.groupChatListPage = 1
+  getUserGroupChatList()
 }
 //处理搜索聊天记录点击
 const handleClickSearchItem = (searchText, searchResultKey, talk_type, receiver_id, res) => {
@@ -467,7 +567,9 @@ const handleClickSearchItem = (searchText, searchResultKey, talk_type, receiver_
         talk_type: talk_type //1私聊2群聊
       })
     )
-    searchDetailListRef.value?.doLoadMore()
+    nextTick(() => {
+      searchDetailListRef.value?.doLoadMore(true)
+    })
   }
 }
 //处理点击停留item变化

From 9360ecaaf98e43c00af8a8654e386a8cf945224d Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Mon, 19 May 2025 09:04:28 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=BC=B9=E7=AA=97=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/auth.js                        | 2 +-
 src/views/message/inner/IndexContent.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/auth.js b/src/utils/auth.js
index c088ac6..6369112 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -18,7 +18,7 @@ export function isLoggedIn() {
  */
 export function getAccessToken() {
   // return storage.get(AccessToken) || ''
-  return JSON.parse(localStorage.getItem('token'))||'79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b894e81e7367079550f5bfe506cb1d1874de13cb7696a188e09b47b9997c92972e501cbcaf2601dc4d1981a2f9bdbfe2ddef970f3e2d760b94e5947f9fe004528f5214a8cd9a92de884cc64bfa32d716e25'
+  return JSON.parse(localStorage.getItem('token'))||'79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b8962d32ca9acda2e80272e2558c2a366762349b830b666ec5fa17a2d4304de907fc1e15f4bef1a68f350975080df1c9577b69543e38d63124a06b7b2218b126be05c2669b3dcdb9c8a30daf38c781bfb6a'
 }
 
 /**
diff --git a/src/views/message/inner/IndexContent.vue b/src/views/message/inner/IndexContent.vue
index 8cb091f..4e2d2c7 100644
--- a/src/views/message/inner/IndexContent.vue
+++ b/src/views/message/inner/IndexContent.vue
@@ -169,7 +169,7 @@ const changeConditionTag = (tag) => {
 
   <customModal
     v-model:show="state.isShowSearchRecordByConditionModal"
-    :title='`与“${talkParams.username}”的聊天记录`'
+    :title='`${talkParams.type === 1 ? "与" : ""}"${talkParams.username}"的聊天记录`'
     :style="state.customSearchRecordByConditionModalStyle"
     :customCloseBtn="true"
     :closable="false"