From d334fdc4d911ae1c326e53c036cf885ffa9f988d Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sat, 26 Oct 2024 21:35:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=96=AD=E7=BA=BF=E9=87=8D?=
 =?UTF-8?q?=E8=BF=9E=E6=97=B6=E4=B8=A2=E6=B6=88=E6=81=AF=E7=9A=84bug=202.?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84bug=203.=E5=8E=BB=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/App.vue                              |  1 +
 im-uniapp/components/chat-item/chat-item.vue   |  1 +
 im-uniapp/pages/chat/chat-box.vue              | 10 ----------
 im-uniapp/store/chatStore.js                   |  7 +++++--
 im-web/src/components/chat/ChatMessageItem.vue |  2 +-
 im-web/src/components/group/AddGroupMember.vue |  3 +--
 im-web/src/store/chatStore.js                  |  7 +++++--
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue
index 9bf5c33..e2c7c3a 100644
--- a/im-uniapp/App.vue
+++ b/im-uniapp/App.vue
@@ -311,6 +311,7 @@
 				return new Promise((resolve, reject) => {
 					if (!loginInfo || !loginInfo.refreshToken) {
 						reject();
+						return;
 					}
 					http({
 						url: '/refreshToken',
diff --git a/im-uniapp/components/chat-item/chat-item.vue b/im-uniapp/components/chat-item/chat-item.vue
index 21b3e06..eafdf26 100644
--- a/im-uniapp/components/chat-item/chat-item.vue
+++ b/im-uniapp/components/chat-item/chat-item.vue
@@ -100,6 +100,7 @@
 			position: absolute;
 			width: 100%;
 			height: 100%;
+			z-index: 99;
 		}
 
 		.left {
diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index 81d4ca4..d63cd25 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -1,7 +1,6 @@
 <template>
 	<view class="page chat-box">
 		<view class="header">
-			<uni-icons class="btn-side left" type="back" size="30" @click="onNavBack()"></uni-icons>
 			<text class="title">{{title}}</text>
 			<uni-icons class="btn-side right" type="more-filled" size="30" @click="onShowMore()"></uni-icons>
 		</view>
@@ -344,11 +343,6 @@
 			selectEmoji(emoText) {
 				this.sendText += `#${emoText};`;
 			},
-			onNavBack() {
-				uni.switchTab({
-					url: "/pages/chat/chat"
-				})
-			},
 			onKeyboardheightchange(e) {
 				if (e.detail.height > 0) {
 					this.showKeyBoard = true;
@@ -797,10 +791,6 @@
 				font-size: 28rpx;
 				cursor: pointer;
 
-				&.left {
-					left: 30rpx;
-				}
-
 				&.right {
 					right: 30rpx;
 				}
diff --git a/im-uniapp/store/chatStore.js b/im-uniapp/store/chatStore.js
index 207b859..e85cd24 100644
--- a/im-uniapp/store/chatStore.js
+++ b/im-uniapp/store/chatStore.js
@@ -302,7 +302,7 @@ export default defineStore('chatStore', {
 			});
 			// 将消息一次性装载回来
 			this.chats = cacheChats;
-			// 清空缓存
+			// 清空缓存，不再使用
 			cacheChats = null;
 			this.saveToStorage();
 		},
@@ -375,7 +375,10 @@ export default defineStore('chatStore', {
 			return state.loadingPrivateMsg || state.loadingGroupMsg
 		},
 		curChats: (state) => {
-			return state.isLoading() ? cacheChats : state.chats;
+			if(cacheChats && state.isLoading()){
+				return cacheChats;
+			}
+			return state.chats;
 		},
 		findChatIdx: (state) => (chat) => {
 			let chats = state.curChats;
diff --git a/im-web/src/components/chat/ChatMessageItem.vue b/im-web/src/components/chat/ChatMessageItem.vue
index e9a8c30..e64d645 100644
--- a/im-web/src/components/chat/ChatMessageItem.vue
+++ b/im-web/src/components/chat/ChatMessageItem.vue
@@ -36,7 +36,7 @@
 							<div class="chat-file-box" v-loading="loading">
 								<div class="chat-file-info">
 									<el-link class="chat-file-name" :underline="true" target="_blank" type="primary"
-										:href="data.url">{{ data.name }}</el-link>
+										:href="data.url" :download="data.name">{{ data.name }}</el-link>
 									<div class="chat-file-size">{{ fileSize }}</div>
 								</div>
 								<div class="chat-file-icon">
diff --git a/im-web/src/components/group/AddGroupMember.vue b/im-web/src/components/group/AddGroupMember.vue
index 672d187..ada2f7b 100644
--- a/im-web/src/components/group/AddGroupMember.vue
+++ b/im-web/src/components/group/AddGroupMember.vue
@@ -2,8 +2,7 @@
 	<el-dialog title="邀请好友" :visible.sync="visible" width="50%" :before-close="onClose">
 		<div class="agm-container">
 			<div class="agm-l-box">
-				<el-input placeholder="搜索好友" v-model="searchText"
-					@keyup.enter.native="onSearch()">
+				<el-input placeholder="搜索好友" v-model="searchText">
 					<i class="el-icon-search el-input__icon" slot="suffix"> </i>
 				</el-input>
 				<el-scrollbar style="height:400px;">
diff --git a/im-web/src/store/chatStore.js b/im-web/src/store/chatStore.js
index 9d07b8b..bb46aaf 100644
--- a/im-web/src/store/chatStore.js
+++ b/im-web/src/store/chatStore.js
@@ -289,7 +289,7 @@ export default {
 			});
 			// 将消息一次性装载回来
 			state.chats = cacheChats;
-			// 清空缓存
+			// 清空缓存,不再使用
 			cacheChats = null;
 			this.commit("saveToStorage");
 		},
@@ -369,7 +369,10 @@ export default {
 			return state.loadingPrivateMsg || state.loadingGroupMsg
 		},
 		findChats: (state, getters) => () => {
-			return getters.isLoading() ? cacheChats : state.chats;
+			if(cacheChats && getters.isLoading()){
+				return cacheChats;
+			}
+			return state.chats;
 		},
 		findChatIdx: (state, getters) => (chat) => {
 			let chats = getters.findChats();