同步用户信息调好了

This commit is contained in:
17792275749
2025-04-23 09:56:51 +08:00
parent 7554edfb93
commit a76176346f
5 changed files with 64 additions and 51 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ App({
ppScale: {
plugin: null,
activeProtocol: null,
// domain: "https://device.shuziweidao.com/gateway",
// domain: "http://device.shuziweidao.com/gateway",
domain: "http://192.168.10.173:8889",
wifi: {
ssid: "",
+2 -2
View File
@@ -38,8 +38,8 @@
"style": "v2",
"plugins": {
"ppScale-plugin": {
"version": "0.0.11",
"provider": "wx0826af4e4908f524"
"version": "1.2.15",
"provider": "wx0ffb48417ce6345c"
}
},
"sitemapLocation": "sitemap.json",
+2 -2
View File
@@ -23,9 +23,9 @@
</view>
</view>
<view class="btn">
<view class="btn" bind:tap="openUserInfo">
<view>
<image src="/images/familyMembers/add.png" />
</view>
<view bind:tap="openUserInfo">添加新成员</view>
<view>添加新成员</view>
</view>
+33 -21
View File
@@ -10,41 +10,53 @@ Page({
ssid: options.ssid,
password: options.password
}, (res) => {
app.globalData.ppScale.wifi.ssid = ssid;
app.globalData.ppScale.wifi.password = password;
if(res === 23) {
app.globalData.ppScale.wifi.ssid = ssid;
app.globalData.ppScale.wifi.password = password;
let mac = app.globalData.ppScale.device.mac;
let deviceId = app.globalData.ppScale.device.connection.deviceId;
if(mac && deviceId) {
let scaleDeviceId = mac.replace(/:/g, '');
let params = {
equipmentName: app.globalData.ppScale.device.name,
scaleDeviceId: scaleDeviceId,
deviceId: deviceId
};
$.ajax("weighingScale/binding/device", params, "POST").then(res => {
app.globalData.ppScale.activeProtocol.codeSetBindingState((res) => {
console.log("setNetwork.js codeSetBindingState", res);
wx.navigateTo({
url: "/pages/setNetworkSuccessful/setNetworkSuccessful"
let mac = app.globalData.ppScale.device.mac;
let deviceId = app.globalData.ppScale.device.connection.deviceId;
if(mac && deviceId) {
let scaleDeviceId = mac.replace(/:/g, '');
let params = {
equipmentName: app.globalData.ppScale.device.name,
scaleDeviceId: scaleDeviceId,
deviceId: deviceId
};
$.ajax("weighingScale/binding/device", params, "POST").then(res => {
app.globalData.ppScale.activeProtocol.codeSetBindingState((res) => {
console.log("setNetwork.js codeSetBindingState", res);
wx.navigateTo({
url: "/pages/setNetworkSuccessful/setNetworkSuccessful"
})
})
}).catch(err => {
wx.showToast({
icon: "none",
title: err.message
})
setTimeout(() => {
wx.switchTab({
url: "/pages/home/home"
})
}, 1500)
})
}).catch(err => {
} else {
wx.showToast({
icon: "none",
title: err.message
title: "Mac 地址与 deviceId 获取失败,请重新绑定"
})
setTimeout(() => {
wx.switchTab({
url: "/pages/home/home"
})
}, 1500)
})
}
} else {
wx.showToast({
icon: "none",
title: "Mac 地址与 deviceId 获取失败,请重新绑定"
title: "配网失败,错误码:" + res
})
setTimeout(() => {
wx.switchTab({
@@ -1,4 +1,5 @@
const app = getApp();
import $ from "../../utils/request";
Page({
data: {
@@ -58,35 +59,35 @@ Page({
let userInfo = this.data.userInfo;
let i = this.data.subUser.i;
let subUser = this.data.subUser.data;
app.globalData.ppScale.activeProtocol.dataSyncUserInfo({
userID: userInfo.id,
userName: subUser[i].realname,
memberID: subUser[i].id,
age: this.getAge(subUser[i].birthday), //
gender: subUser[i].sex, //
height: subUser[i].height, //
isAthleteMode: 0,
currentWeight: subUser[i].weight, //
deviceHeaderIndex: 0,
targetWeight: "",
idealWeight: "",
recentData: [],
}, (res) => {
console.log("dataSyncSubUserInfo", res);
if(i < subUser.length) {
if(i < subUser.length) {
app.globalData.ppScale.activeProtocol.dataSyncUserInfo({
userID: userInfo.id,
userName: subUser[i].realname,
memberID: subUser[i].id,
age: this.getAge(subUser[i].birthday), //
gender: subUser[i].sex, //
height: subUser[i].height, //
isAthleteMode: 0,
currentWeight: subUser[i].weight, //
deviceHeaderIndex: 0,
targetWeight: "",
idealWeight: "",
recentData: [],
}, (res) => {
console.log("dataSyncSubUserInfo", res);
this.setData({
['subUser.i']: i + 1
})
this.setSubUser();
} else {
this.resetDevice();
app.globalData.ppScale.plugin.Blue.stop();
wx.hideLoading();
wx.switchTab({
url: "/pages/home/home"
})
}
})
})
} else {
this.resetDevice();
app.globalData.ppScale.plugin.Blue.stop();
wx.hideLoading();
wx.switchTab({
url: "/pages/home/home"
})
}
},
resetDevice() {