diff --git a/yack-app/manifest.json b/yack-app/manifest.json index 9964583c..768f4050 100644 --- a/yack-app/manifest.json +++ b/yack-app/manifest.json @@ -163,7 +163,7 @@ "base" : "./" }, "devServer" : { - "port" : 8090 + "port" : 82 }, "optimization" : { "treeShaking" : { diff --git a/yack-app/pages/tabBar/home/index.vue b/yack-app/pages/tabBar/home/index.vue index 89e83246..ddc65e4f 100644 --- a/yack-app/pages/tabBar/home/index.vue +++ b/yack-app/pages/tabBar/home/index.vue @@ -236,12 +236,13 @@ return { token: '', groupList: [], // 分组列表 - // 查询参数 + // 查询参数(showChild: true 包含分享的设备,本账号和被分享账号都能查看) queryParams: { pageNum: 1, pageSize: 10, groupId: 0, - deviceName: null + deviceName: null, + showChild: true }, loadStatus: 'loadmore', // 加载更多 deviceList: [], // 设备列表 diff --git a/yack-app/pagesA/scene/product/device.vue b/yack-app/pagesA/scene/product/device.vue index b3a16eee..0261fbb4 100644 --- a/yack-app/pagesA/scene/product/device.vue +++ b/yack-app/pagesA/scene/product/device.vue @@ -148,7 +148,8 @@ pageNum: 1, pageSize: 11, deviceName: '', - status: null + status: null, + showChild: true // 包含分享的设备 }, list: [], // 产品列表 total: 0,