From 8f4cd804122093af8bc5d02218c2545d90a23b8e Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期一, 28 十月 2024 10:24:32 +0800
Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.V1.0 into test
---
src/layout/component/sidebar/components/ChatRecord.vue | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/src/layout/component/sidebar/components/ChatRecord.vue b/src/layout/component/sidebar/components/ChatRecord.vue
index 2d04a0b..9956e93 100644
--- a/src/layout/component/sidebar/components/ChatRecord.vue
+++ b/src/layout/component/sidebar/components/ChatRecord.vue
@@ -46,14 +46,14 @@
:key="index"
@click="roomClick(item)"
>
- <div class="ywicon icon-xiaoxi flex-0 mr-2.5"></div>
+ <div class="ywifont ywicon-xiaoxi1 flex-0 mr-2.5"></div>
<div class="flex-auto text-ellipsis text-nowrap text-sm group-hover:text-[#0084ff]">{{ item.title }}</div>
<div class="text-gray-100 flex items-center space-x-2 ml-1">
- <div class="ywicon invisible icon-bianji group-hover:visible !text-sm"></div>
+ <!-- <div class="ywifont invisible ywicon-bianji group-hover:visible !text-sm"></div> -->
<el-popconfirm title="纭畾鍒犻櫎鑱婂ぉ璁板綍?" @confirm.stop="confirmDeleteChatRoom(item)" width="180">
<template #reference>
- <div class="ywicon invisible icon-shanchu3 group-hover:visible"></div>
+ <div class="ywifont invisible ywicon-shanchu3 group-hover:visible"></div>
</template>
</el-popconfirm>
</div>
@@ -74,8 +74,7 @@
import { debounce, getRecentDateRange } from '/@/utils/util';
import moment from 'moment';
import { useSearch } from '/@/hooks/useSearch';
-
-
+import { gotoRoute } from '/@/utils/route';
const chatRoomRef = ref<HTMLDivElement>(null);
const queryParams = ref({
@@ -84,31 +83,33 @@
const gotoAnswerPage = (room: ChatRoomItem) => {
if (room.isInitial) {
- router.push({
+ gotoRoute({
name: 'Home',
+ query: {
+ id: room.id,
+ },
});
} else {
- router.push({
+ gotoRoute({
name: 'AskAnswer',
query: {
id: room.id,
},
});
}
- setTimeout(() => {
- activeRoomId.value = room.id;
- }, 0);
+
+ activeRoomId.value = room.id;
};
const newChatRoomClick = async () => {
const res = await CreateHistoryGroup({
- group_title: 'chat room',
+ group_title: '鏂板缓瀵硅瘽寮�濮�',
});
const newRoom = {
id: res.history_group_id,
isInitial: true,
- title: 'chat room',
+ title: '鏂板缓瀵硅瘽寮�濮�',
};
if (!chatRoomList.value) {
chatRoomList.value = [newRoom];
@@ -170,7 +171,7 @@
//#endregion
//#region ====================== 鎼滅储鑱婂ぉ瀹� ======================
-const { query,queryData } = useSearch(filteredChatRoomList, queryParams);
+const { query, queryData } = useSearch(filteredChatRoomList, queryParams);
const debounceQuery = debounce(query);
@@ -186,15 +187,20 @@
const res = await GetHistoryGroups();
const resData = (res?.groups || []) as any[];
- chatRoomList.value = resData?.map((item) => {
- return {
- id: item.group_id,
- title: item.group_title,
- createTime: item.create_time,
- isInitial: false,
- };
- });
- if (!chatRoomList.value || chatRoomList.value.length === 0) {
+ // 鎸夋渶鏅氭椂闂村埌鏈�鏃╂椂闂�
+ chatRoomList.value = resData
+ ?.toSorted((a, b) => {
+ return b.create_time.localeCompare(a.create_time);
+ })
+ .map((item) => {
+ return {
+ id: item.group_id,
+ title: item.group_title,
+ createTime: item.create_time,
+ isInitial: Number(item.chat_count) === 0,
+ };
+ });
+ if (!chatRoomList.value || chatRoomList.value.length === 0 ) {
newChatRoomClick();
} else {
roomClick(chatRoomList.value[0]);
--
Gitblit v1.9.3