diff --git a/apis/interfaces/im.js b/apis/interfaces/im.js index 0f0e1af..11c75be 100644 --- a/apis/interfaces/im.js +++ b/apis/interfaces/im.js @@ -88,9 +88,9 @@ const searchFriend = (value) => { const pedingFriend = (recipient, message) => { return request({ method: 'POST', - url: 'im/friends/' + recipient, - data: { - message + url: 'im/friends/' + recipient, + data: { + message } }) } @@ -120,7 +120,7 @@ const getGroupBase = (groupId) => { }) } -const getGroupUsers = (groupId, limit) => { +const getGroupUsers = (groupId, limit) => { limit = limit || 0 return request({ url: 'im/groups/' + groupId + '/users?limit=' + limit @@ -141,9 +141,9 @@ const createGroupAnnouncement = (groupId, content) => { content: content } }) -} +} // 查看该公告详情 -const getGroupAnnouncement = (groupId, announcementId) => { +const getGroupAnnouncement = (groupId, announcementId) => { return request({ method: 'GET', url: 'im/groups/' + groupId + '/announcements/' + announcementId @@ -155,12 +155,12 @@ const deleteGroupAnnouncement = (groupId, announcementId) => { method: 'DELETE', url: 'im/groups/' + groupId + '/announcements/' + announcementId }) -} -// 置顶群公告 -const topGroupAnnouncement = (groupId, announcementId) => { +} +// 置顶群公告 +const topGroupAnnouncement = (groupId, announcementId) => { return request({ method: 'POST', - url: 'im/groups/' + groupId + '/announcements/' + announcementId+'/top', + url: 'im/groups/' + groupId + '/announcements/' + announcementId + '/top', }) } @@ -241,12 +241,13 @@ const removeGroupUser = (groupId, userId) => { /** * 邀请群成员 */ -const inviteGroupUser = (groupId, userIds) => { +const inviteGroupUser = (groupId, userIds, allowIds) => { return request({ method: 'POST', url: 'im/groups/' + groupId + '/invite', data: { - userIds + userIds: userIds, + allowIds: allowIds } }) } @@ -280,16 +281,16 @@ const transferGroupOwner = (groupId, userId) => { url: 'im/groups/' + groupId + '/owner/' + userId }) } - + // 通过审核验证群成员 -const groupMakeSure = (groupId,user) => { +const groupMakeSure = (groupId, user) => { return request({ - url:`im/groups/${groupId}/makesure/${user}`, - method:'POST' + url: `im/groups/${groupId}/makesure/${user}`, + method: 'POST' }) -} - +} + export { @@ -310,16 +311,16 @@ export { getGroupInfo, getGroupBase, getGroupUsers, - getGroupAnnouncements, + getGroupAnnouncements, getGroupAnnouncement, createGroupAnnouncement, - deleteGroupAnnouncement, + deleteGroupAnnouncement, topGroupAnnouncement, searchGroup, joinGroupPre, joinGroup, quitGroup, - dismissGroup, + dismissGroup, inviteGroupUser, removeGroupUser, setGroupAdmin, diff --git a/pages/im/components/groupUserList.vue b/pages/im/components/groupUserList.vue index 6706556..112a4d0 100644 --- a/pages/im/components/groupUserList.vue +++ b/pages/im/components/groupUserList.vue @@ -11,7 +11,7 @@ {{ item.name }} - + 邀请好友 @@ -54,7 +54,8 @@ return { users: [], isOwner: false, - isAdmin: false, + isAdmin: false, + canInvite:false,// 是否可以开启邀请 adminUid: 0, members: 0, actionShow: false, @@ -63,6 +64,8 @@ currentUser: {}, avatarSize: 45, labelSize: 14, + iconSize: 14 + } }, computed: { @@ -72,14 +75,15 @@ } } }, - created() { - this.avatarSize = utils.rpx2px(84) - this.labelSize = utils.rpx2px(24) - this.iconSize = utils.rpx2px(26) + created() { + this.avatarSize = utils.rpx2px(90) + this.labelSize = utils.rpx2px(24) + this.iconSize = utils.rpx2px(26) }, mounted() { this.initGroupInfo() - getGroupUsers(this.targetId, this.count).then(res => { + getGroupUsers(this.targetId, this.count).then(res => { + console.log("res..",res) this.users = res res.map(item => { this.$store.dispatch('updateContact', item) @@ -92,7 +96,8 @@ this.isOwner = res.is_owner this.isAdmin = res.is_admin this.adminUid = res.user_id - this.members = res.members + this.members = res.members + this.canInvite = res.can_invite }) }, initUsers() { diff --git a/pages/im/components/sentVoice.vue b/pages/im/components/sentVoice.vue index 30a60c1..ae7a66d 100644 --- a/pages/im/components/sentVoice.vue +++ b/pages/im/components/sentVoice.vue @@ -100,7 +100,8 @@