100J4G相关bug修复

pages/common/index/index.vue

@@ -40,15 +40,15 @@
 										<view class="device-name">
 											<view>设备:{{item.deviceName}}</view>
 											<view class="ID">
-												<view class="ID" v-if="item.communicationMode==0">ID:{{item.deviceImei}}
+												<view class="ID" v-if="item.communicationMode==0 || item.communicationMode==2">ID:{{item.deviceImei}}
 												</view>
 												<view class="ID" v-else>ID:{{item.deviceMac}}</view>
 												<!-- 在线状态 -->
 												<view class="onlines"
-													v-if="item.communicationMode==0 && item.onlineStatus==1">在线</view>
+													v-if="item.onlineStatus==1">在线</view>
 												<!-- 离线状态 -->
 												<view class="offlines"
-													v-if="item.communicationMode==0 && item.onlineStatus==0">离线</view>
+													v-if="item.onlineStatus==0">离线</view>
 												<view>电量：{{item.battery || '0'}}%</view>
 											</view>
 										</view>
@@ -386,7 +386,7 @@ import BleReceive from '@/utils/BleReceive';
 					if (res.code == 200) {
 						//console.log("deviceTypeList=" + JSON.stringify(res.data));
 						this.tabs = [{
-								id: '',
+								id: '',         
 								name: '全部设备',
 								typeName: '全部设备'
 							},
@@ -405,9 +405,6 @@ import BleReceive from '@/utils/BleReceive';
 				this.deviceList = [];
 				this.activeTab = index;
 				this.activeTabInfo = tab
-
-
-
 				this.downCallback();
 			},
 			// 获取设备列表