diff --git a/pages/form/index.ts b/pages/form/index.ts index 85c994c..d7481d1 100644 --- a/pages/form/index.ts +++ b/pages/form/index.ts @@ -44,7 +44,7 @@ Page({ if (res.data) { Message.success({ context: that, - offset: [20, 32], + offset: ['50px', 32], duration: 2000, content: '管理员已结束会议!', }); @@ -61,7 +61,7 @@ Page({ if (res.data) { Message.success({ context: that, - offset: [20, 32], + offset: ['50px', 32], duration: 2000, content: '管理员已将你移出会议!', }); diff --git a/pages/meeting/index.ts b/pages/meeting/index.ts index 1f2ace5..2eb1caf 100644 --- a/pages/meeting/index.ts +++ b/pages/meeting/index.ts @@ -733,28 +733,9 @@ Page({ item.isAdmin = role.ID.includes(item.roleId) || item.isRoomManager item.avatarName = item.userName?.slice(-2) }) - if (this.data.roomUserList.length) { - let arr: any = [] - const { roomUserList } = this.data; - res.data.forEach((item: any) => { - let userItem = roomUserList.find((row: any) => row.uid == item.uid); - if (userItem) { - userItem.enableCamera = item.enableCamera; - userItem.enableMicr = item.enableMicr; - userItem.isRoomManager = item.isRoomManager; - userItem.isAdmin = role.ID.includes(item.roleId) || item.isRoomManager; - } else { - arr.push(item) - } - }); - this.setData({ - roomUserList: [...roomUserList, ...arr] - }) - } else { - this.setData({ - roomUserList: res.data - }) - } + this.setData({ + roomUserList: res.data + }) } }) },