diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java index b785de9..2faa946 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java @@ -206,12 +206,13 @@ public class GroupMessageServiceImpl extends ServiceImpl members = groupMemberService.findByUserId(session.getUserId()); Map groupMemberMap = CollStreamUtil.toIdentityMap(members, GroupMember::getGroupId); Set groupIds = groupMemberMap.keySet(); if(CollectionUtil.isEmpty(groupIds)){ + // 关闭加载中标志 + this.sendLoadingMessage(false); return; } // 开启加载中标志 diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java index 45f2126..415e438 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java @@ -182,10 +182,11 @@ public class PrivateMessageServiceImpl extends ServiceImpl friends = friendService.findFriendByUserId(session.getUserId()); if (friends.isEmpty()) { + // 关闭加载中标志 + this.sendLoadingMessage(false); return; } // 开启加载中标志 diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue index 4274b60..ab6121d 100644 --- a/im-uniapp/App.vue +++ b/im-uniapp/App.vue @@ -64,15 +64,19 @@ store.commit("loadingPrivateMsg",true) http({ url: "/message/private/pullOfflineMessage?minId=" + minId, - method: 'get' - }); + method: 'GET' + }).catch(()=>{ + store.commit("loadingPrivateMsg",false) + }) }, pullGroupOfflineMessage(minId) { store.commit("loadingGroupMsg",true) http({ url: "/message/group/pullOfflineMessage?minId=" + minId, - method: 'get' - }); + method: 'GET' + }).catch(()=>{ + store.commit("loadingGroupMsg",false) + }) }, handlePrivateMessage(msg) { // 消息加载标志 @@ -201,7 +205,7 @@ } else { http({ url: `/friend/find/${id}`, - method: 'get' + method: 'GET' }).then((friend) => { store.commit("addFriend", friend); resolve(friend) @@ -217,7 +221,7 @@ } else { http({ url: `/group/find/${id}`, - method: 'get' + method: 'GET' }).then((group) => { resolve(group) store.commit("addGroup", group); diff --git a/im-uniapp/common/emotion.js b/im-uniapp/common/emotion.js index 06b509a..7e567e3 100644 --- a/im-uniapp/common/emotion.js +++ b/im-uniapp/common/emotion.js @@ -25,7 +25,7 @@ let textToImg = (emoText) => { // 微信小程序不能有前面的'/' path = path.slice(1); // #endif - let img = ``; return img; } diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue index 99e694a..b031a6c 100644 --- a/im-uniapp/pages/chat/chat-box.vue +++ b/im-uniapp/pages/chat/chat-box.vue @@ -497,10 +497,7 @@ }, onScrollToTop() { if(this.showMinIdx==0){ - uni.showToast({ - title: "没有更多消息啦", - icon: "none" - }) + console.log("消息已滚动到顶部") return; } @@ -575,7 +572,7 @@ this.$http({ url: `/group/members/${groupId}`, - method: 'get' + method: 'GET' }).then((groupMembers) => { this.groupMembers = groupMembers; });