|
|
@@ -237,7 +237,6 @@ |
|
|
|
device.deviceId = deviceId; |
|
|
|
device.prefixName = prefixName; |
|
|
|
device.selected = false; //防止重复点击 |
|
|
|
console.log("device._prefixName", prefixName) |
|
|
|
let _name = ""; |
|
|
|
switch (prefixName) { |
|
|
|
case "WJ": |
|
|
@@ -275,7 +274,7 @@ |
|
|
|
break; |
|
|
|
} |
|
|
|
device._name = _name; |
|
|
|
|
|
|
|
console.log("device._name", device._name) |
|
|
|
if (deviceList.value.length == 0) { |
|
|
|
// #ifdef MP-ALIPAY |
|
|
|
if (device._name == '聚利' || device._name == '万集' || device._name == '天地融') { |
|
|
@@ -569,7 +568,7 @@ |
|
|
|
if (res.code == 0) { |
|
|
|
datas.setData("bluLinkStatus", true); |
|
|
|
datas.setData("connectPrefixName", connectPrefixName.value); |
|
|
|
// oks(); |
|
|
|
oks(); |
|
|
|
} else { |
|
|
|
//断开蓝牙 |
|
|
|
// bluetoothUtil.disconnectDevice(); |