From 7952b69f6a34845a7d5f622d1e7d36dfec62c588 Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Sat, 10 May 2025 15:23:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A5=BD=E5=8F=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=BC=E8=88=AA=E6=9D=A1=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im-uniapp/pages/friend/friend.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/im-uniapp/pages/friend/friend.vue b/im-uniapp/pages/friend/friend.vue index 1a89263..2702702 100644 --- a/im-uniapp/pages/friend/friend.vue +++ b/im-uniapp/pages/friend/friend.vue @@ -118,9 +118,13 @@ export default { color: $im-text-color !important; } + :deep(.u-index-list__letter) { + margin-top: 50px; + } + :deep(.u-index-list__letter__item) { - width: 48rpx !important; - height: 48rpx !important; + width: 40rpx !important; + height: 40rpx !important; } :deep(.u-index-list__letter__item__index) { From c89c9a3ca433601571055aeb0da212843b769011 Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Sat, 10 May 2025 16:41:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A5=BD=E5=8F=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=BC=E8=88=AA=E6=9D=A1=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im-uniapp/pages/friend/friend.vue | 4 ---- .../uview-plus/components/u-index-list/u-index-list.vue | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/im-uniapp/pages/friend/friend.vue b/im-uniapp/pages/friend/friend.vue index 2702702..b114171 100644 --- a/im-uniapp/pages/friend/friend.vue +++ b/im-uniapp/pages/friend/friend.vue @@ -118,10 +118,6 @@ export default { color: $im-text-color !important; } - :deep(.u-index-list__letter) { - margin-top: 50px; - } - :deep(.u-index-list__letter__item) { width: 40rpx !important; height: 40rpx !important; diff --git a/im-uniapp/uni_modules/uview-plus/components/u-index-list/u-index-list.vue b/im-uniapp/uni_modules/uview-plus/components/u-index-list/u-index-list.vue index b0aa31d..c55eafb 100644 --- a/im-uniapp/uni_modules/uview-plus/components/u-index-list/u-index-list.vue +++ b/im-uniapp/uni_modules/uview-plus/components/u-index-list/u-index-list.vue @@ -265,8 +265,8 @@ customNavHeight = sysData.windowTop // #endif // #ifndef H5 - // 在非H5中，为原生导航栏，其高度不算在windowHeight内，这里设置为负值，后面相加时变成减去其高度的一半 - customNavHeight = -(sysData.statusBarHeight + 44) + // 在非H5中，为原生导航栏，其高度不算在windowHeight内 + customNavHeight = sysData.statusBarHeight // #endif } else { customNavHeight = getPx(this.customNavHeight) From ab3f4dca7de2983fc4e2956044d77fcdb4cab8cf Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Wed, 14 May 2025 17:03:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E7=BE=A4=E8=81=8A=E6=98=B5=E7=A7=B0?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/{ => impl}/FileServiceImpl.java | 3 ++- im-uniapp/pages/chat/chat-box.vue | 7 ++++++- im-web/src/components/chat/ChatBox.vue | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 8 deletions(-) rename im-platform/src/main/java/com/bx/implatform/service/{ => impl}/FileServiceImpl.java (98%) diff --git a/im-platform/src/main/java/com/bx/implatform/service/FileServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/FileServiceImpl.java similarity index 98% rename from im-platform/src/main/java/com/bx/implatform/service/FileServiceImpl.java rename to im-platform/src/main/java/com/bx/implatform/service/impl/FileServiceImpl.java index 44b51e8..efca8e5 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/FileServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/FileServiceImpl.java @@ -1,4 +1,4 @@ -package com.bx.implatform.service; +package com.bx.implatform.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -11,6 +11,7 @@ import com.bx.implatform.enums.FileType; import com.bx.implatform.enums.ResultCode; import com.bx.implatform.exception.GlobalException; import com.bx.implatform.mapper.FileInfoMapper; +import com.bx.implatform.service.FileService; import com.bx.implatform.session.SessionContext; import com.bx.implatform.thirdparty.MinioService; import com.bx.implatform.util.FileUtil; diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue index 947fac7..eebf384 100644 --- a/im-uniapp/pages/chat/chat-box.vue +++ b/im-uniapp/pages/chat/chat-box.vue @@ -763,7 +763,7 @@ export default { }, listenKeyBoard() { // #ifdef H5 - if (navigator.platform == "Win32" || navigator.platform == "MacIntel") { + if (navigator.platform == "Win32") { // 电脑端不需要弹出键盘 console.log("navigator.platform:", navigator.platform) return; @@ -805,6 +805,11 @@ export default { }, resizeListener() { let keyboardHeight = this.initHeight - window.innerHeight; + // 兼容部分ios浏览器 + if (window.visualViewport && uni.getSystemInfoSync().platform == 'ios') { + keyboardHeight = this.initHeight - window.visualViewport.height; + } + console.log("resizeListener:",window.visualViewport.height) this.isShowKeyBoard = keyboardHeight > 150; if (this.isShowKeyBoard) { this.keyboardHeight = keyboardHeight; diff --git a/im-web/src/components/chat/ChatBox.vue b/im-web/src/components/chat/ChatBox.vue index 76452ae..81dce21 100644 --- a/im-web/src/components/chat/ChatBox.vue +++ b/im-web/src/components/chat/ChatBox.vue @@ -3,7 +3,7 @@ {{ title }} - @@ -41,19 +41,19 @@ -
-
-
-
@@ -578,7 +578,7 @@ export default { } }, headImage(msgInfo) { - if (this.chat.type == 'GROUP') { + if (this.isGroup) { let member = this.groupMembers.find((m) => m.userId == msgInfo.sendId); return member ? member.headImage : ""; } else { @@ -689,6 +689,12 @@ export default { }, memberSize() { return this.groupMembers.filter(m => !m.quit).length; + }, + isGroup() { + return this.chat.type == 'GROUP'; + }, + isPrivate() { + return this.chat.type == 'PRIVATE'; } }, watch: {