diff --git a/pages/common/shareDevices/index.vue b/pages/common/shareDevices/index.vue index 55bbeca..553f302 100644 --- a/pages/common/shareDevices/index.vue +++ b/pages/common/shareDevices/index.vue @@ -216,7 +216,7 @@ const res = await deviceShareAdd({ phonenumber: this.phone, smsCode: this.code, - deviceId: this.itemInfo.id, + deviceId: this.itemInfo.id || this.itemInfo.deviceId, permission: selectedPermissions.join(',') }) @@ -250,8 +250,8 @@ const eventChannel = this.getOpenerEventChannel(); // 监听 'shareDevice' 事件,获取传过来的数据 eventChannel.on('shareDevice', (data) => { - console.log(data, 'data1t111'); this.itemInfo = data.data; + console.log(this.itemInfo,'this.itemInfo'); this.permissions=Common.getPermissions(this.itemInfo.persissonType); console.log(this.itemInfo.persissonType,'this.itemInfo.persissonType'); }) diff --git a/pages/common/shareManagement/index.vue b/pages/common/shareManagement/index.vue index 2bd6487..44485e2 100644 --- a/pages/common/shareManagement/index.vue +++ b/pages/common/shareManagement/index.vue @@ -86,7 +86,9 @@ }, getData(val) { let data = { - deviceId: val + deviceId: val, + pageNum: 1, + pageSize: 500 } deviceShareList(data).then((res) => { if (res.code == 200) { @@ -117,7 +119,7 @@ eventChannel.on('shareManagement', (data) => { console.log(data, 'data1t111'); this.itemInfo = data.data; - this.getData(this.itemInfo.id) + this.getData(this.itemInfo.id ||this.itemInfo.deviceId) }) } }