From 5f4dd80b2a5fd48f4fc202d17778b91042ed0bd5 Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Tue, 10 Jun 2025 14:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3es=E6=90=9C=E7=B4=A2=E6=97=B6?=
 =?UTF-8?q?=E6=8C=89=E4=BA=BA=E6=90=9C=E7=B4=A2=E5=92=8C=E6=8C=89=E7=BE=A4?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=9A=84=E8=B7=B3=E8=BD=AC=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98=EF=BC=9B=E8=A7=A3=E5=86=B3=E6=8C=89?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=90=9C=E7=B4=A2=E5=90=8E=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=9D=A1=E4=BB=B6=E6=88=96=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E9=87=8D=E7=BD=AE=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E9=80=89=E6=8B=A9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/search/searchByCondition.vue | 8 ++++++--
 src/views/message/inner/IndexContent.vue    | 6 ++++++
 src/views/message/inner/IndexSider.vue      | 6 ++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/search/searchByCondition.vue b/src/components/search/searchByCondition.vue
index ad509c9..a31f302 100644
--- a/src/components/search/searchByCondition.vue
+++ b/src/components/search/searchByCondition.vue
@@ -309,7 +309,8 @@ import { MessageComponents } from '@/constant/message'
 const emits = defineEmits([
   'clearSearchMemberByAlphabet',
   'getDisabledDateArray',
-  'hideSearchResultModal'
+  'hideSearchResultModal',
+  'clearSelectedDateTime'
 ])
 
 const dialogueStore = useDialogueStore()
@@ -753,6 +754,10 @@ const resetSearchConditions = (newVal) => {
     state.group_member_id = 0
     emits('clearSearchMemberByAlphabet')
   }
+  if (newVal !== 'date') {
+    state.selectedDateTime = null
+    emits('clearSelectedDateTime')
+  }
 }
 
 //触底加载更多数据
@@ -834,7 +839,6 @@ watch(
     queryAllSearch()
   },
   {
-    immediate: true,
     deep: true
   }
 )
diff --git a/src/views/message/inner/IndexContent.vue b/src/views/message/inner/IndexContent.vue
index 52fb22e..88a67dc 100644
--- a/src/views/message/inner/IndexContent.vue
+++ b/src/views/message/inner/IndexContent.vue
@@ -487,6 +487,11 @@ const hideSearchResultModal = () => {
   handleSearchRecordByConditionModalClose()
   state.isShowGroupAside = false
 }
+
+// 清空日期选择器
+const clearSelectedDateTime = () => {
+  onDatePickClear()
+}
 </script>
 
 <template>
@@ -714,6 +719,7 @@ const hideSearchResultModal = () => {
               :selectedDateTime="state.selectedDateTime"
               :nowDateTime="state.nowDateTime"
               @hideSearchResultModal="hideSearchResultModal"
+              @clearSelectedDateTime="clearSelectedDateTime"
             />
           </div>
         </n-card>
diff --git a/src/views/message/inner/IndexSider.vue b/src/views/message/inner/IndexSider.vue
index 43141bd..f084bf4 100644
--- a/src/views/message/inner/IndexSider.vue
+++ b/src/views/message/inner/IndexSider.vue
@@ -89,6 +89,12 @@ const renderChatAppSearch = () => {
           state.searchRecordText = searchText
           state.selectItemInList = res
         } else {
+          if(searchResultKey === 'user_infos'){
+            talk_type = 1
+          }
+          if(searchResultKey === 'combinedGroup'){
+            talk_type = 2
+          }
           talkStore.toTalk(talk_type, receiver_id, router)
         }
         state.showSearchDropdown = false