diff --git a/pages/im/components/friendApplyCell.vue b/pages/im/components/friendApplyCell.vue index 65b89f6..b962aa9 100644 --- a/pages/im/components/friendApplyCell.vue +++ b/pages/im/components/friendApplyCell.vue @@ -36,7 +36,6 @@ methods: { resolve() { resolveFriend(this.message.sourceUserId).then(res => { - this.clearMessages() uni.showToast({ icon: 'none', title: '通过好友申请' @@ -47,6 +46,8 @@ icon: 'none', title: err.message }) + }).finally(() => { + this.clearMessages() }) }, reject() { @@ -67,12 +68,12 @@ }) }, // 不管是通过还是拒绝,都要把相关的信息清理 - clearMessages() { + clearMessages() { RongIMLib.deleteMessages(RongIMLib.ConversationType.SYSTEM, this.message.sourceUserId) this.$emit('success') - uni.$emit('onNewContactConversation', message) - uni.$emit('onNewContactFriends', message) - uni.$emit('onNewContactPendings', message) + uni.$emit('onNewContactConversation') + uni.$emit('onNewContactFriends') + uni.$emit('onNewContactPendings') } } } diff --git a/pages/im/components/show/showImage.vue b/pages/im/components/show/showImage.vue index ca752d6..c41e618 100644 --- a/pages/im/components/show/showImage.vue +++ b/pages/im/components/show/showImage.vue @@ -45,27 +45,27 @@ } } }, - methods: { - showImage(path) { - uni.previewImage({ - urls: [ - path - ] - }) + methods: { + showImage(path) { + uni.previewImage({ + urls: [ + path + ] + }) }, - previewImage() { + previewImage() { if (this.content.local && this.content.local.indexOf('///data/user/') < 0) { this.showImage(this.content.local) } else { + this.showImage(this.content.remote) RongIMLib.downloadMediaMessage(this.message.messageId, { success: (path) => { this.content.local = path - this.showImage(path) }, - error: (errorCode, messageId) => { - uni.showToast({ - icon: 'none', - title: errorCode + error: (errorCode, messageId) => { + uni.showToast({ + icon: 'none', + title: errorCode }) } }) diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue index 7179b89..e563914 100644 --- a/pages/im/friends/index.vue +++ b/pages/im/friends/index.vue @@ -10,25 +10,33 @@ 我的群聊 - + - - - - {{ contact(friendItem.targetId).name }} + + + + + {{ contact(friendItem.targetId).name }} + - - - 暂无好友列表~ + + + 暂无好友列表~ @@ -159,19 +165,20 @@ font-size: 14px; line-height: 24px; background-color: #fff; - } - .no-lists { - padding-top: $padding * 3; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - box-sizing: border-box; - font-size: $title-size-m; - color: $text-gray-m; - - span { - padding-top: $padding; - } + } + + .no-lists { + padding-top: $padding * 3; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + box-sizing: border-box; + font-size: $title-size-m; + color: $text-gray-m; + + span { + padding-top: $padding; + } } diff --git a/pages/im/friends/pending.vue b/pages/im/friends/pending.vue index 57480ff..cb1802d 100644 --- a/pages/im/friends/pending.vue +++ b/pages/im/friends/pending.vue @@ -2,7 +2,7 @@ - diff --git a/pages/im/friends/search.vue b/pages/im/friends/search.vue index 1c08750..0125804 100644 --- a/pages/im/friends/search.vue +++ b/pages/im/friends/search.vue @@ -11,14 +11,16 @@ - + - + 暂无匹配内容~ @@ -43,11 +45,11 @@ }, methods: { search() { - // friendship: '' 没有好友关系 - // accepted 好友 - // pending 申请中 - // denied 拒绝 - // blocked 黑名单 + // friendship: '' 没有好友关系 + // accepted 好友 + // pending 申请中 + // denied 拒绝 + // blocked 黑名单 searchFriend(this.searchValue) .then(res => { this.searchResult = res; @@ -60,9 +62,9 @@ }); }); }, - action(e) { - uni.navigateTo({ - url: '/pages/im/friends/info?targetId=' + e.item.targetId + action(e) { + uni.navigateTo({ + url: '/pages/im/friends/info?targetId=' + e.item.targetId }) } } diff --git a/pages/im/group/chat.vue b/pages/im/group/chat.vue index b75f21a..525563f 100644 --- a/pages/im/group/chat.vue +++ b/pages/im/group/chat.vue @@ -52,10 +52,12 @@ } } } + }, + onShow() { + this.initGroupInfo() }, onLoad(e) { this.targetId = e.targetId - this.initGroupInfo() // 获取历史消息列表 this.getMessageList() // 监听新消息 diff --git a/pages/im/group/index.vue b/pages/im/group/index.vue index 14eb4f5..5b0c47c 100644 --- a/pages/im/group/index.vue +++ b/pages/im/group/index.vue @@ -5,10 +5,10 @@ - {{item.name}} 共{{item.people_count}} 成员 + {{ item.name }} 共{{ item.members }} 成员 - {{groups.length}}个群聊 + {{ groups.length }}个群聊 diff --git a/pages/im/group/reviewed.vue b/pages/im/group/reviewed.vue index 8f09af0..f861dce 100644 --- a/pages/im/group/reviewed.vue +++ b/pages/im/group/reviewed.vue @@ -22,7 +22,7 @@ - 暂无群聊申请数据~ + 暂无群聊申请数据 @@ -82,7 +82,6 @@ uni.$emit('groupInvitedUser') } }) - }).catch(err => { // uni.showToast({ // title: err.message, diff --git a/pages/im/index.vue b/pages/im/index.vue index c513af7..d170e3f 100644 --- a/pages/im/index.vue +++ b/pages/im/index.vue @@ -59,7 +59,11 @@ onLoad() { // 监听新的好友申请 - uni.$on('onNewContactConversation', this.checkNewFriendPending) + uni.$on('onNewContactConversation', () => { + console.log('更新好友申请数量'); + // 更新好友申请数量 + this.checkNewFriendPending() + }) }, onShow() { // 好友申请数量