修改636 和 568的配置信息、配图,添加体重秤校验
This commit is contained in:
@@ -31,7 +31,7 @@ App({
|
|||||||
"deviceCalcuteType": 3,
|
"deviceCalcuteType": 3,
|
||||||
"deviceConnectType": 2,
|
"deviceConnectType": 2,
|
||||||
"deviceFuncType": 223,
|
"deviceFuncType": 223,
|
||||||
"deviceName": "CF568_G",
|
"deviceName": "YX-B4-568-BW",
|
||||||
"devicePowerType": 3,
|
"devicePowerType": 3,
|
||||||
"deviceProtocolType": 3,
|
"deviceProtocolType": 3,
|
||||||
"deviceType": 1,
|
"deviceType": 1,
|
||||||
@@ -52,7 +52,7 @@ App({
|
|||||||
"deviceCalcuteType": 4,
|
"deviceCalcuteType": 4,
|
||||||
"deviceConnectType": 2,
|
"deviceConnectType": 2,
|
||||||
"deviceFuncType": 65759,
|
"deviceFuncType": 65759,
|
||||||
"deviceName": "CF636_G",
|
"deviceName": "YX-B8-636-BW",
|
||||||
"devicePowerType": 3,
|
"devicePowerType": 3,
|
||||||
"deviceProtocolType": 3,
|
"deviceProtocolType": 3,
|
||||||
"deviceType": 1,
|
"deviceType": 1,
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 236 KiB After Width: | Height: | Size: 236 KiB |
|
Before Width: | Height: | Size: 86 KiB After Width: | Height: | Size: 86 KiB |
@@ -26,13 +26,25 @@ Page({
|
|||||||
deviceId: deviceId
|
deviceId: deviceId
|
||||||
};
|
};
|
||||||
$.ajax("weighingScale/binding/device", params, "POST").then(res => {
|
$.ajax("weighingScale/binding/device", params, "POST").then(res => {
|
||||||
app.globalData.ppScale.activeProtocol.codeSetBindingState((res) => {
|
if (res.success) {
|
||||||
console.log("setNetwork.js codeSetBindingState", res);
|
app.globalData.ppScale.activeProtocol.codeSetBindingState((res) => {
|
||||||
|
console.log("setNetwork.js codeSetBindingState", res);
|
||||||
wx.navigateTo({
|
|
||||||
url: "/pages/setNetworkSuccessful/setNetworkSuccessful"
|
wx.navigateTo({
|
||||||
|
url: "/pages/setNetworkSuccessful/setNetworkSuccessful"
|
||||||
|
})
|
||||||
})
|
})
|
||||||
})
|
} else {
|
||||||
|
wx.showToast({
|
||||||
|
icon: "none",
|
||||||
|
title: res.message
|
||||||
|
})
|
||||||
|
setTimeout(() => {
|
||||||
|
wx.switchTab({
|
||||||
|
url: "/pages/home/home"
|
||||||
|
})
|
||||||
|
}, 1500)
|
||||||
|
}
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
wx.showToast({
|
wx.showToast({
|
||||||
icon: "none",
|
icon: "none",
|
||||||
|
|||||||
@@ -195,7 +195,7 @@ Page({
|
|||||||
})
|
})
|
||||||
let seviceList = [];
|
let seviceList = [];
|
||||||
app.globalData.ppScale.device.setting.map(item => {
|
app.globalData.ppScale.device.setting.map(item => {
|
||||||
if(this.data.deviceInfo.type === item.deviceName) {
|
if(this.data.deviceInfo && this.data.deviceInfo.type === item.deviceName) {
|
||||||
seviceList.push(item);
|
seviceList.push(item);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user