From f9b6f90bbe59bbef69a5749e274f799004c2ed8d Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期一, 19 八月 2024 15:02:55 +0800
Subject: [PATCH] Merge branch 'master' into gerson-test
---
src/layout/component/sidebar/components/ChatRecord.vue | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/layout/component/sidebar/components/ChatRecord.vue b/src/layout/component/sidebar/components/ChatRecord.vue
index 84bba9d..b15288d 100644
--- a/src/layout/component/sidebar/components/ChatRecord.vue
+++ b/src/layout/component/sidebar/components/ChatRecord.vue
@@ -46,10 +46,10 @@
:key="index"
@click="roomClick(item)"
>
- <div class="ywicon icon-xiaoxi flex-0 mr-2.5"></div>
+ <div class="ywicon icon-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="ywicon invisible icon-bianji group-hover:visible !text-sm"></div> -->
<el-popconfirm title="纭畾鍒犻櫎鑱婂ぉ璁板綍?" @confirm.stop="confirmDeleteChatRoom(item)" width="180">
<template #reference>
@@ -74,6 +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({
@@ -82,20 +83,22 @@
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 () => {
@@ -184,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: Number(item.chat_count) === 0,
- };
- });
- if (!chatRoomList.value || chatRoomList.value.length === 0 || !chatRoomList.value?.[0].isInitial) {
+ // 鎸夋渶鏅氭椂闂村埌鏈�鏃╂椂闂�
+ 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