diff --git a/apis/interfaces/im.js b/apis/interfaces/im.js index 22ef137..63bc538 100644 --- a/apis/interfaces/im.js +++ b/apis/interfaces/im.js @@ -118,7 +118,25 @@ const getGroupAnnouncements = (groupId) => { return request({ url: 'im/groups/' + groupId + '/announcements' }) -} +} + +const createGroupAnnouncement = (groupId, content) => { + return request({ + method: 'POST', + url: 'im/groups/' + groupId + '/announcements', + data: { + content: content + } + }) +} + +const deleteGroupAnnouncement = (groupId, announcementId) => { + return request({ + method: 'DELETE', + url: 'im/groups/' + groupId + '/announcements/' + announcementId + }) +} + /** * 创建群聊 */ @@ -178,7 +196,9 @@ export { updateGroup, getGroupInfo, getGroupUsers, - getGroupAnnouncements, + getGroupAnnouncements, + createGroupAnnouncement, + deleteGroupAnnouncement, searchGroup, joinGroup, quitGroup diff --git a/pages.json b/pages.json index 31af73a..f86f7e2 100644 --- a/pages.json +++ b/pages.json @@ -482,27 +482,45 @@ "style": { "navigationBarTitleText": "群信息" } - }, - { - "path": "pages/im/group/create", - "name": "imGroupCreate", - "style": { - "navigationBarTitleText": "创建群聊" - } - }, - { - "path": "pages/im/group/users", - "name": "imGroupUsers", - "style": { - "navigationBarTitleText": "群成员" - } - }, - { - "path": "pages/im/group/announcement", - "name": "imGroupAnnouncement", - "style": { - "navigationBarTitleText": "群公告" - } + }, + { + "path": "pages/im/group/create", + "name": "imGroupCreate", + "style": { + "navigationBarTitleText": "创建群聊" + } + }, + { + "path": "pages/im/group/users", + "name": "imGroupUsers", + "style": { + "navigationBarTitleText": "群成员" + } + }, + { + "path": "pages/im/group/announcement", + "name": "imGroupAnnouncement", + "style": { + "navigationBarTitleText": "群公告", + "app-plus": { + "titleNView": { + "type": "default", + "buttons": [{ + "float": "right", + "fontSrc": "/static/iconfont.ttf", + "text": "\ue60a", + "fontSize": "20px" + }] + } + } + } + }, + { + "path": "pages/im/group/announceCreate", + "name": "imGroupAnnouncementCreate", + "style": { + "navigationBarTitleText": "发布群公告" + } }, { "path": "pages/wallet/add", diff --git a/pages/im/group/announceCreate.vue b/pages/im/group/announceCreate.vue new file mode 100644 index 0000000..3d3ee9d --- /dev/null +++ b/pages/im/group/announceCreate.vue @@ -0,0 +1,54 @@ + + + + + diff --git a/pages/im/group/announcement.nvue b/pages/im/group/announcement.nvue deleted file mode 100644 index 3dbff79..0000000 --- a/pages/im/group/announcement.nvue +++ /dev/null @@ -1,32 +0,0 @@ - - - - - diff --git a/pages/im/group/announcement.vue b/pages/im/group/announcement.vue new file mode 100644 index 0000000..14619f3 --- /dev/null +++ b/pages/im/group/announcement.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue index d89a658..b60dfe4 100644 --- a/pages/im/group/chat.nvue +++ b/pages/im/group/chat.nvue @@ -38,7 +38,7 @@ showVoice, showImage, showText, - sentMessageBar, + sentMessageBar }, data() { return { diff --git a/pages/im/group/create.nvue b/pages/im/group/create.vue similarity index 100% rename from pages/im/group/create.nvue rename to pages/im/group/create.vue diff --git a/pages/im/group/index.nvue b/pages/im/group/index.vue similarity index 100% rename from pages/im/group/index.nvue rename to pages/im/group/index.vue diff --git a/pages/im/group/info.nvue b/pages/im/group/info.vue similarity index 77% rename from pages/im/group/info.nvue rename to pages/im/group/info.vue index 4af8085..e085ad0 100644 --- a/pages/im/group/info.nvue +++ b/pages/im/group/info.vue @@ -5,10 +5,11 @@ {{ item.name }} - - - - 邀请用户 + + + + 邀请用户 @@ -18,21 +19,25 @@ - - + + + + + + - + 清空聊天记录 - - 删除并退出 - - + 解散群聊 + + + 删除并退出 @@ -65,26 +70,35 @@ uni.navigateTo({ url: '/pages/im/friends/info?targetId=' + item.targetId }) + }, + inviteUser() { + + }, + loadMore() { + uni.navigateTo({ + url: '/pages/im/group/users?targetId=' + this.targetId + }) + }, + toAnnouncement() { + uni.navigateTo({ + url: '/pages/im/group/announcement?targetId=' + this.targetId + }) }, - inviteUser() { + onClean() { }, - loadMore() { - uni.navigateTo({ - url: '/pages/im/group/users?targetId=' + this.targetId - }) + onDismiss() { + }, - toAnnouncement() { - uni.navigateTo({ - url: '/pages/im/group/announcement?targetId=' + this.targetId - }) + onQuite() { + } } } diff --git a/pages/im/group/users.nvue b/pages/im/group/users.vue similarity index 91% rename from pages/im/group/users.nvue rename to pages/im/group/users.vue index bd44611..ee9baf3 100644 --- a/pages/im/group/users.nvue +++ b/pages/im/group/users.vue @@ -10,7 +10,8 @@