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: {