liubiao/APP
1
0
Fork 0
forked from dyf/APP
Code Pull Requests Activity

index解决冲突

Browse Source
This commit is contained in:
liub
2025-07-11 16:25:31 +08:00
parent a56e1fd43f
commit 3dfdd5d4c1
1 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pages/common/index/index.vue
View File

@ -23,9 +23,9 @@
<scroll-view class="device-list" scroll-y @scrolltolower="onScrollToLower" :lower-threshold="100" <scroll-view class="device-list" scroll-y @scrolltolower="onScrollToLower" :lower-threshold="100"
style="height:80vh;"> style="height:80vh;">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<block v-for="(item, index) in deviceList" :key="index" :ref="'swipeItem_' + index" > <block v-for="(item, index) in deviceList" :key="index" :ref="'swipeItem_' + index">
<uni-swipe-action-item :right-options="Options" @click.stop="handleSwipeClick($event, item, index)" <uni-swipe-action-item :right-options="Options"
class="device-card"> @click.stop="handleSwipeClick($event, item, index)" class="device-card">
<!-- 设备卡片内容保持不变 --> <!-- 设备卡片内容保持不变 -->
<!-- <view @click.stop="handleFile(item)"> <!-- <view @click.stop="handleFile(item)">
<view class="device-header"> <view class="device-header">
@ -192,7 +192,7 @@
getTab() { getTab() {
deviceTypeList({}).then((res) => { deviceTypeList({}).then((res) => {
if (res.code == 200) { if (res.code == 200) {
console.log("deviceTypeList="+JSON.stringify(res.data)); console.log("deviceTypeList=" + JSON.stringify(res.data));
this.tabs = [{ this.tabs = [{
id: '', id: '',
name: '全部设备', name: '全部设备',
@ -275,7 +275,7 @@
// }); // });
uni.navigateTo({ uni.navigateTo({
url:"/pages/common/addBLE/addEquip" url: "/pages/common/addBLE/addEquip"
}) })
break; break;
} }
@ -367,24 +367,28 @@
}) })
}, },
handleFile(item) { handleFile(item) {
console.log('item'+JSON.stringify(item)); console.log('item' + JSON.stringify(item));
// communicationMode 0是4G 1是蓝牙 // communicationMode 0是4G 1是蓝牙
if (item.communicationMode == 0) { if (item.communicationMode == 0) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/6170/deviceControl/index?id=${item.id}` url: `/pages/6170/deviceControl/index?id=${item.id}`
return;
});
return;
} }
if(item.typeName=='6155'){ if (item.typeName == '6155') {
uni.navigateTo({ uni.navigateTo({
url:"/pages/6155/deviceDetail", url: "/pages/6155/deviceDetail",
events:{ events: {
ack:function(data){ ack: function(data) {
} }
}, },
success: (res) => { success: (res) => {
res.eventChannel.emit('detailData', { data: item }); res.eventChannel.emit('detailData', {
data: item
});
} }
}) })
} }