diff --git a/pages/common/allType/index.vue b/pages/common/allType/index.vue index 57187c1..cf7d17d 100644 --- a/pages/common/allType/index.vue +++ b/pages/common/allType/index.vue @@ -34,7 +34,7 @@ uni.switchTab({ url: '/pages/common/index/index', success: (res) => { - res.eventChannel.emit('index', { + res.eventChannel.emit('index', { data: item }); } diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue index fbd3477..9bc3412 100644 --- a/pages/common/index/index.vue +++ b/pages/common/index/index.vue @@ -12,11 +12,11 @@ {{tab.typeName}} - + - + 报警 位置 发送信息 @@ -190,16 +190,17 @@ loading: false, finished: false, deviceId: '', - deviceName: "" //重命名 + deviceName: "", //重命名 + activeTabInfo: '' } }, methods: { // 更多 - allMore(){ + allMore() { this.showshare = !this.showshare; }, // 所有分享,所有类型 - handleshareClick(item){ + handleshareClick(item) { this.showshare = false; // 关闭弹窗 switch (item.action) { case 'type': @@ -248,6 +249,7 @@ switchTab(tab, index) { this.deviceList = []; this.activeTab = index; + this.activeTabInfo = tab this.page = 1; // 重置页码 this.finished = false; // 重 // 明确传递参数,空字符串改为null或undefined @@ -292,7 +294,7 @@ scan() { this.showTooltip = !this.showTooltip; }, - // 添加设备,扫一扫,蓝牙 + // 添加设备,扫一扫,蓝牙 handleMenuClick(item) { this.showTooltip = false; // 关闭弹窗 switch (item.action) { @@ -434,7 +436,6 @@ } }) } - if (item.typeName == '6155') { uni.navigateTo({ url: "/pages/6155/deviceDetail", @@ -812,7 +813,8 @@ /* 根据导航栏高度调整 */ z-index: 9999; } - .tooltip-share{ + + .tooltip-share { position: fixed; right: 18rpx; top: 230rpx;