diff --git a/pages/im/group/info.vue b/pages/im/group/info.vue
index e25e977..ea4d1aa 100644
--- a/pages/im/group/info.vue
+++ b/pages/im/group/info.vue
@@ -4,10 +4,12 @@
-
-
+
+
-
+
@@ -17,11 +19,13 @@
-
+
-
+
@@ -30,7 +34,8 @@
删除并退出
-
+
@@ -42,7 +47,8 @@
-
+
@@ -84,10 +90,15 @@
onLoad(e) {
this.targetId = e.targetId
this.qrContent += e.targetId
- RongIMLib.getConversationNotificationStatus(this.conversationType, this.targetId, ({status}) => {
+ RongIMLib.getConversationNotificationStatus(this.conversationType, this.targetId, ({
+ status
+ }) => {
this.status = !Boolean(status)
})
- RongIMLib.getConversation(this.conversationType, this.targetId, ({code,conversation}) => {
+ RongIMLib.getConversation(this.conversationType, this.targetId, ({
+ code,
+ conversation
+ }) => {
if (code == 0) {
this.isTop = conversation.isTop
}
@@ -105,7 +116,6 @@
},
initData() {
getGroupInfo(this.targetId).then(res => {
- console.log(res,'群信息。。。。。')
this.group = res.group
this.groupName = res.group.name
this.announcement = res.announcement
@@ -152,9 +162,9 @@
this.qrCodeShow = true
},
// 群聊邀请待确认
- showGroupsSure(){
+ showGroupsSure() {
uni.navigateTo({
- url:"/pages/im/group/reviewed?id="+this.targetId
+ url: "/pages/im/group/reviewed?targetId=" + this.targetId
})
},
onGroupName() {
@@ -347,5 +357,4 @@
.u-border-bottom {
border-bottom: solid 1rpx #f9f9f9 !important;
}
-
diff --git a/pages/im/group/reviewed.vue b/pages/im/group/reviewed.vue
index 9c6452c..0c08b72 100644
--- a/pages/im/group/reviewed.vue
+++ b/pages/im/group/reviewed.vue
@@ -1,79 +1,108 @@
-
-
-
-
-
-
- {{`艾米的猫儿 `}}想邀请{{` 用户8066`}}加入群聊
- 申请原因:{{`呵呵哒。。`}}
-
- 通过
-
-
-
-
-
-
-
diff --git a/pages/im/group/reviewedInfo.vue b/pages/im/group/reviewedInfo.vue
deleted file mode 100644
index dc5a399..0000000
--- a/pages/im/group/reviewedInfo.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
- 确认信息页面
-
-
-
-
-
-
diff --git a/utils/im/message.js b/utils/im/message.js
index f6ab123..4316a90 100644
--- a/utils/im/message.js
+++ b/utils/im/message.js
@@ -60,8 +60,7 @@ const getPendingList = (callback, total) => {
// 群组申请列表,邀请列表
const getGroupPendinglist = (targetId, callback) => {
- total = total || 100
- RongIMLib.getConversationList([RongIMLib.ConversationType.SYSTEM], total, 0, (res) => {
+ RongIMLib.getConversationList([RongIMLib.ConversationType.SYSTEM], 100, 0, (res) => {
if (res.code === 0) {
const pendings = res.conversations.filter((item) => {
return item.targetId == targetId &&