diff --git a/apis/interfaces/im.js b/apis/interfaces/im.js index e6945de..15f209e 100644 --- a/apis/interfaces/im.js +++ b/apis/interfaces/im.js @@ -85,10 +85,13 @@ const searchFriend = (value) => { }) } -const pedingFriend = (recipient) => { +const pedingFriend = (recipient, message) => { return request({ method: 'POST', - url: 'im/friends/' + recipient + url: 'im/friends/' + recipient, + data: { + message + } }) } diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue index 35a3766..46b0f87 100644 --- a/pages/im/friends/info.vue +++ b/pages/im/friends/info.vue @@ -6,7 +6,7 @@ bg-color="#fff"> {{ userInfo.name }} - Hash:{{ userInfo.address }} + 地址:{{ userInfo.address }} @@ -106,7 +106,8 @@ name: '视频通话' } ], - callShow: false + callShow: false, + hasPeding: false } }, onLoad(e) { @@ -201,36 +202,35 @@ }, // 申请好友 toBeFriend() { - pedingFriend(this.targetId).then(res => { + if (this.hasPeding) { + uni.showToast({ + icon: 'none', + title: '请不要频繁操作' + }) + return + } + pedingFriend(this.targetId, 'message').then(res => { uni.showToast({ title: ` 申请成功,等待审核 `, icon: 'none', duration: 3000, mask: true }); + this.hasPeding = true }) .catch(err => { - // if(err.status_code === 6001){ - // this.userInfo.friendship = 'accepted' - // }else{ - uni.showToast({ - icon: 'error', - title: err.message, - duration: 2000, - mask: true - }) - // } + uni.showToast({ + icon: 'error', + title: err.message, + duration: 2000, + mask: true + }) }) }, singleCall(e) { - uni.showToast({ - icon: 'none', - title: '功能正在开发中' + uni.redirectTo({ + url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type }) - // CallLib.startSingleCall(this.targetId, e.type, ''); - // uni.redirectTo({ - // url: '/pages/im/private/call?targetId=' + this.targetId + '&mediaType=' + e.type - // }) } } } diff --git a/pages/im/private/chat.vue b/pages/im/private/chat.vue index 385d806..f04a704 100644 --- a/pages/im/private/chat.vue +++ b/pages/im/private/chat.vue @@ -5,7 +5,7 @@ {{ item.sentTime|timeCustomCN }} -