fix: 1.搜索历史记录，

     2.膝盖群公告

.env.development

@@ -15,17 +15,17 @@ VITE_APP_ENV=development
 # VITE_APP_BASE_URL=http://cilicli.qicp.vip
 
 # 黄雯本地
-VITE_APP_BASE_URL=http://192.168.1.44:8082/
+# VITE_APP_BASE_URL=http://192.168.1.44:8082/
 # 本地socoket
-VITE_APP_IM_URL=ws://192.168.1.44:8082/system/message
+# VITE_APP_IM_URL=ws://192.168.1.44:8082/system/message
 # 花生壳
 # VITE_APP_BASE_URL=http://q9943037p3.goho.co
 # VITE_APP_IM_URL=ws://q9943037p3.goho.co/system/message
 
 # 张维本地
-# VITE_APP_BASE_URL=http://192.168.1.73:8082/
+VITE_APP_BASE_URL=http://192.168.1.73:8082/
 # 本地socoket
-# VITE_APP_IM_URL=ws://192.168.1.73:8082/system/message
+VITE_APP_IM_URL=ws://192.168.1.73:8082/system/message
 # 花生壳
 # VITE_APP_BASE_URL=http://4eqxwr.natappfree.cc
 # VITE_APP_IM_URL=ws://4eqxwr.natappfree.cc/system/message

src/components/Profile/News/GroupChat.vue

@@ -73,7 +73,7 @@ const props = defineProps({
   }
 })
 defineEmits(['onNoBother', 'onIsTop', 'onConvDelete', 'onChatPage'])
-console.log(props.itemData.dfGroupImage, 'itemData')
+
 // 消息数量通知的展示  需要动态的展示
 const messageNumber = (content) => {
   let messageNumberObj = {}

src/pages/chat/announcement.vue

@@ -71,23 +71,21 @@
 <script setup>
 const router = useRouter()
 const route = useRoute()
+// 每个成员的信息
+const groupMemberInfo = ref({})
 
 // 是否是普通成员
 const isRankAndFiler = (role) => {
   return role == 1 || role == 2 ? true : false
 }
 
-onMounted(() => {
-  getAnnouncement()
-})
-
 const groupBulletinTemplate =
   '1.本群提倡友好理性交流，鼓励群友多发言，多互动 2.禁止无意义刷屏、发送广告信息以及谩骂等不良消息 3.为了保证群活跃不经常发言的群友，可能会被定时清理出群'
 
 const queryDataName = reactive({
   groupId: computed(() => route?.query?.groupId ?? ''),
   userId: computed(() => route?.query?.userId ?? ''),
-  groupRole: computed(() => route?.query?.groupRole ?? ''),
+  groupRole: '',
   groupNotice: ''
 })
 
@@ -132,11 +130,23 @@ const getAnnouncement = async () => {
     }
   })
   if (data) {
-    queryDataName.groupNotice = data.groupNotice.messageContent
+    queryDataName.groupNotice = data.groupNotice
+    if (Array.isArray(data.memberList) && data?.memberList?.length) {
+      data.memberList.map((el) => {
+        if (el.userId == queryDataName.userId) {
+          groupMemberInfo.value = el
+          queryDataName.groupRole = el.groupRole
+        }
+      })
+    }
   } else {
   }
 }
 
+onMounted(() => {
+  getAnnouncement()
+})
+
 useSeoMeta({
   title: '群聊'
 })

src/pages/chat/group-chat.vue

@@ -24,10 +24,19 @@
     </van-nav-bar>
 
     <van-notice-bar
-      v-if="groupInfo?.groupNotice?.messageContent"
+      v-if="groupInfo?.groupNotice"
       left-icon="volume-o"
       mode="link"
-      :text="groupInfo?.groupNotice?.messageContent"
+      @click="
+        navigateTo({
+          path: '/chat/announcement',
+          query: {
+            groupId: groupInfo?.id,
+            userId: userInfo.userId
+          }
+        })
+      "
+      :text="groupInfo?.groupNotice"
     ></van-notice-bar>
 
     <template v-if="showPage">

src/pages/chat/set-sub/index.vue

@@ -36,7 +36,7 @@
             </template>
             <template #title>
               <div class="w-full flex justify-between text-sm text-black-9">
-                <span class="w-150 border line-clamp-1">{{ item?.showName }}</span>
+                <span class="w-150 line-clamp-1">{{ item?.showName }}</span>
 
                 <span class="text-sm text-black-9">
                   {{ item?.createTime }}
@@ -95,8 +95,7 @@ const objectType = computed(() => route.query.objectType)
 
 const queryParams = reactive({
   pageNum: 1,
-  pageSize: 10,
-  searchMessage: ''
+  pageSize: 10
 })
 
 const loading = ref(false)
@@ -114,7 +113,6 @@ const title = ref('聊天记录')
 
 // 搜索
 const search = () => {
-  queryParams.searchMessage = searchString.value
   queryParams.pageNum = 1
   list.value = []
   getList()
@@ -135,7 +133,8 @@ const getList = async () => {
     let { data } = await request('/website/tourMessage/getMessageByGroupId', {
       query: {
         groupId: route.query.groupId,
-        ...queryParams
+        ...queryParams,
+        searchMessage: searchString.value
       }
     })
 

src/pages/chat/set.vue

@@ -31,8 +31,8 @@
               />
             </div>
             <p class="w-full line-clamp-1 lin text-sm text-center text-black-6">
-              <!-- {{ item.groupNickname }} -->
-              {{ item.showName }}
+              {{ item?.groupNickname }}
+              <!-- {{ item.showName }} -->
             </p>
           </van-col>
           <van-col
@@ -147,7 +147,7 @@
           center
           is-link
           title="群公告"
-          :value="setData?.groupNotice?.messageContent ? '' : '未设置'"
+          :value="setData?.groupNotice ? '' : '未设置'"
         ></van-cell>
 
         <van-cell @click="handleDescription" size="large" center>
@@ -783,8 +783,7 @@ const handleAnnouncement = () => {
     path: '/chat/announcement',
     query: {
       groupId: setData?.id,
-      userId: userInfo.value.userId,
-      groupRole: userGroupData.value?.groupRole
+      userId: userInfo.value.userId
     }
   })
 }