diff --git a/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue
index d0fa275..f91c2be 100644
--- a/pages/common/addBLE/addEquip.vue
+++ b/pages/common/addBLE/addEquip.vue
@@ -51,9 +51,13 @@
搜索设备
刷新
+
+
+
+ v-show="item.name.indexOf(search)>-1">
@@ -148,6 +152,7 @@
}
},
+ search:'',//筛选
PairEquip: [], //已配对设备
EquipMents: [], //搜索出来的设备
device: null,
@@ -171,6 +176,7 @@
}
},
onLoad(option) {
+ debugger;
let search = option.search;
these = this;
eventChannel = this.getOpenerEventChannel();
@@ -367,6 +373,10 @@
eventChannel.on('detailData', function(rec) {
console.log("接收到父页面的参数:", rec);
these.device = rec.data;
+ if(rec.data.bluetoothName){
+ these.search=rec.data.bluetoothName.replace('JQZM-','');
+ }
+
startValidDevice();
these.refreshBleList();
});
@@ -805,10 +815,10 @@
padding: 30rpx;
box-sizing: border-box;
width: 100%;
- height: calc(100% - 300rpx);
+ height: calc(100% - 240rpx);
overflow-y: scroll;
position: absolute;
- top: 300rpx;
+ top: 240rpx;
left: 0rpx;
}
@@ -830,16 +840,17 @@
align-content: center;
align-items: center;
justify-content: space-between;
- margin-bottom: 20rpx;
+ margin-bottom:30rpx;
}
.list {
min-height: 120rpx;
+
}
.searchList {
width: 100%;
- height: calc(100% - 186rpx);
+ height: calc(100% - 260rpx);
overflow-y: scroll;
}
@@ -1010,4 +1021,12 @@
filter: none !important;
-webkit-filter: none !important;
}
+
+ .uni-mt-5 {
+ background-color: #000000;
+ }
+
+ .uni-easyinput__content {
+ background-color: #121212 !important;
+ }
\ No newline at end of file