From f89f0f95313cb8f25a059ba57dff394b8046ce26 Mon Sep 17 00:00:00 2001
From: 17792275749 <812100002@qq.com>
Date: Wed, 11 Mar 2026 11:04:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=B5=81=E7=A8=8B=EF=BC=8C=E9=87=8D=E6=9E=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E5=8F=8A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8B=E5=8F=91=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../configureDevice_2/configureDevice_2.js    |  68 +++++++++++----
 .../configureDevice_2/configureDevice_2.wxml  |  82 ++++++++++--------
 .../configureDevice_2/configureDevice_2.wxss  |  19 ++++
 .../configureDevice_2_addUser.js              |  41 ++++++---
 .../configureDevice_2_addUser.wxml            |  45 +++++++---
 .../configureDevice_2_addUser.wxss            |  22 +++--
 .../configureDevice_3/configureDevice_3.js    |  72 +--------------
 images/configureDevice/null.png               | Bin 0 -> 11768 bytes
 pages/configureDevice/configureDevice.js      |   6 +-
 utils/request.js                              |   4 +-
 10 files changed, 204 insertions(+), 155 deletions(-)
 create mode 100644 images/configureDevice/null.png

diff --git a/components/configureDevice_2/configureDevice_2.js b/components/configureDevice_2/configureDevice_2.js
index 3cc412b..4824406 100644
--- a/components/configureDevice_2/configureDevice_2.js
+++ b/components/configureDevice_2/configureDevice_2.js
@@ -1,6 +1,25 @@
 const app = getApp();
 import $ from "../../utils/request";
 
+/**
+ * 根据生日计算年龄
+ * @param {string} birthday 生日字符串，如 "1990-05-20"
+ * @returns {number|null} 年龄，无法计算时返回 null
+ */
+function calcAge(birthday) {
+    if (!birthday) return null;
+    let birthDate = new Date(birthday.replace(/-/g, '/'));
+    if (isNaN(birthDate.getTime())) return null;
+    let today = new Date();
+    let age = today.getFullYear() - birthDate.getFullYear();
+    let monthDiff = today.getMonth() - birthDate.getMonth();
+    // 未过生日则减一岁
+    if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birthDate.getDate())) {
+        age--;
+    }
+    return age;
+}
+
 Component({
     data: {
         BLUE_STATE: {},
@@ -49,6 +68,10 @@ Component({
         },
 
         addUser() {
+            if (this.data.userList.length >= 10) {
+                wx.showToast({ title: "超过最大用户数", icon: "none" });
+                return;
+            }
 			this.selectComponent("#configureDevice2AddUser").showModal();
         },
 
@@ -61,7 +84,14 @@ Component({
             let sn = app.globalData.ppScale.device.mac.replace(/:/g, '');
             $.ajax("weighingScale/v2/select/user", { sn }, "GET", true, "正在获取用户列表...").then(res => {
                 if (res.result && res.result.length) {
-                    this.setData({ userList: res.result });
+                    let list = res.result.map(user => {
+                        // 没有 age 时通过 birthday 计算
+                        if (!user.age && user.birthday) {
+                            user.age = calcAge(user.birthday);
+                        }
+                        return user;
+                    });
+                    this.setData({ userList: list });
                 } else {
                     this.setData({ userList: [] });
                 }
@@ -81,12 +111,14 @@ Component({
                 content: "确定要删除该用户吗？",
                 success: (res) => {
                     if (res.confirm) {
-                        $.ajax("weighingScale/v2/del/user", { id }, "DELETE", true, "正在删除...").then(() => {
+                        $.ajax("weighingScale/v2/del/user", { id }, "DELETE", true, "正在删除...", "application/x-www-form-urlencoded").then(() => {
                             wx.showToast({
                                 title: "删除成功",
                                 icon: "success"
                             })
-                            this.fetchUserList();
+                            setTimeout(() => {
+                                this.fetchUserList();
+                            }, 1500)
                         }).catch(() => {
                             wx.showToast({
                                 title: "删除失败，请重试",
@@ -120,9 +152,11 @@ Component({
             wx.showLoading({ title: "正在下发用户信息...", mask: true });
             app.globalData.ppScale.activeProtocol.dataFetchUserID((deviceUserIds) => {
                 console.log("设备端已有用户ID列表", deviceUserIds);
-                let existIds = Array.isArray(deviceUserIds) ? deviceUserIds : [];
-                let needSyncList = userList.filter(user => !existIds.includes(user.userId));
-
+                let rawList = Array.isArray(deviceUserIds) ? deviceUserIds : [];
+                // 兼容对象数组和纯ID数组，统一转为字符串比对
+                let existIds = rawList.map(item => String(item.userID || item));
+                let needSyncList = userList.filter(user => !existIds.includes(String(user.id)));
+                console.log(needSyncList);
                 if (!needSyncList.length) {
                     wx.hideLoading();
                     wx.showToast({
@@ -150,17 +184,17 @@ Component({
                     }
                     let user = needSyncList[index];
                     app.globalData.ppScale.activeProtocol.dataSyncUserInfo({
-                        userID: user.userId,
-                        userName: user.realname,
-                        memberID: "",
-                        age: user.age,
-                        gender: user.sex,
-                        height: user.height,
-                        isAthleteMode: 0,
-                        currentWeight: String(user.weight),
-                        deviceHeaderIndex: index,
-                        targetWeight: "",
-                        idealWeight: "",
+                        userID: user.id, // 用户唯一标识 ID。
+                        userName: user.realname, // 用户昵称/姓名。
+                        memberID: "", // 成员 ID（用于区分主账号下的子成员，例如一家人共用一台体脂秤）。
+                        age: user.age, // 年龄。
+                        gender: user.sex, // 性别（通常 0 代表女性，1 代表男性，或者根据具体协议定义）。
+                        height: user.height, // 身高（单位通常为 cm）。
+                        isAthleteMode: 0, // 运动员模式开关（0 表示普通人，1 表示运动员。该模式会影响体脂率等算法的计算）。
+                        deviceHeaderIndex: index, // 设备头像索引（用于在秤端或 App 列表显示的头像图标编号）。
+                        currentWeight: String(user.weight), // 当前体重。
+						targetWeight: "", // 目标体重。
+                        idealWeight: "", // 理想体重（通常由系统根据身高、年龄自动计算得出）。
                         recentData: [],
                     }, (res) => {
                         if (res == 0) {
diff --git a/components/configureDevice_2/configureDevice_2.wxml b/components/configureDevice_2/configureDevice_2.wxml
index f6e06f6..8b28a07 100644
--- a/components/configureDevice_2/configureDevice_2.wxml
+++ b/components/configureDevice_2/configureDevice_2.wxml
@@ -33,49 +33,59 @@
     </view>
     <view class="section">
         <view class="from">
-			<scroll-view class="~scrollView" scroll-y>
-				<view class="scrollViewContent">
-					<block wx:for="{{userList}}" wx:key="userId">
-						<view class="userList">
-							<view class="userAvatar">
-								<block wx:if="{{item.avatar}}">
-									<image src="{{item.avatar}}" />
-								</block>
-								<block wx:else>
-									<block wx:if="{{item.sex === 1}}">
-										<image src="/images/configureDevice/userAvatarMan.png" />
+			<block wx:if="{{userList && userList.length}}">
+				<scroll-view class="~scrollView" scroll-y>
+					<view class="scrollViewContent">
+						<block wx:for="{{userList}}" wx:key="id">
+							<view class="userList">
+								<view class="userAvatar">
+									<block wx:if="{{item.avatar}}">
+										<image src="{{item.avatar}}" />
 									</block>
 									<block wx:else>
-										<image src="/images/configureDevice/userAvatarWoman.png" />
+										<block wx:if="{{item.sex === 1}}">
+											<image src="/images/configureDevice/userAvatarMan.png" />
+										</block>
+										<block wx:else>
+											<image src="/images/configureDevice/userAvatarWoman.png" />
+										</block>
 									</block>
-								</block>
-							</view>
-							<view class="userInfo">
-								<view class="userInfo_1">
-									<view>{{item.realname}}</view>
-									<view class="{{item.sex === 1 ? 'man' : 'woman'}}">
-										<view>
-											<block wx:if="{{item.sex === 1}}">
-												<image src="/images/configureDevice/man.png" />
-											</block>
-											<block wx:else>
-												<image src="/images/configureDevice/woman.png" mode=""/>
-											</block>
-                                        </view>
-										<view>{{item.age}}</view>
+								</view>
+								<view class="userInfo">
+									<view class="userInfo_1">
+										<view>{{item.realname}}</view>
+										<view class="{{item.sex === 1 ? 'man' : 'woman'}}">
+											<view>
+												<block wx:if="{{item.sex === 1}}">
+													<image src="/images/configureDevice/man.png" />
+												</block>
+												<block wx:else>
+													<image src="/images/configureDevice/woman.png" mode=""/>
+												</block>
+											</view>
+											<view>{{item.age}}</view>
+										</view>
+									</view>
+									<view class="userInfo_2">
+										<view>身高：{{item.height}}cm</view>
+										<view></view>
+										<view>体重：{{item.weight}}kg</view>
 									</view>
 								</view>
-								<view class="userInfo_2">
-									<view>身高：{{item.height}}cm</view>
-									<view></view>
-									<view>体重：{{item.weight}}kg</view>
-								</view>
+								<view class="delUser" bind:tap="delUserClick" data-id="{{item.id}}">-</view>
 							</view>
-							<view class="delUser" bind:tap="delUserClick" data-id="{{item.id}}">-</view>
-						</view>
-					</block>
+						</block>
+					</view>
+				</scroll-view>
+			</block>
+			<block wx:else>
+				<view class="nullData">
+					<view>
+						<image src="/images/configureDevice/null.png" />
+					</view>
+					<view>暂无用户数据</view>
 				</view>
-			</scroll-view>
+			</block>
         </view>
         <view class="btn">
             <view bind:tap="addUser">添加用户</view>
diff --git a/components/configureDevice_2/configureDevice_2.wxss b/components/configureDevice_2/configureDevice_2.wxss
index e293764..3dffc9e 100644
--- a/components/configureDevice_2/configureDevice_2.wxss
+++ b/components/configureDevice_2/configureDevice_2.wxss
@@ -213,6 +213,25 @@ input {
 	background-color: #F24439;
 }
 
+.nullData {
+    width: 100%;
+    padding: 200rpx 0 250rpx;
+}
+
+.nullData>view:first-of-type {
+    width: 230rpx;
+    height: 160rpx;
+    margin: 0 auto 15rpx;
+}
+
+.nullData>view:last-of-type {
+    color: #B6B6B6;
+    height: 30rpx;
+    font-size: 30rpx;
+    line-height: 30rpx;
+    text-align: center;
+}
+
 .btn {
     width: 100%;
     padding: 0 55rpx;
diff --git a/components/configureDevice_2_addUser/configureDevice_2_addUser.js b/components/configureDevice_2_addUser/configureDevice_2_addUser.js
index 6b8a7bb..3c02c85 100644
--- a/components/configureDevice_2_addUser/configureDevice_2_addUser.js
+++ b/components/configureDevice_2_addUser/configureDevice_2_addUser.js
@@ -81,6 +81,16 @@ Component({
             this.setData({ workNo: e.detail.value });
         },
 
+        // 监听身高输入
+        onHeightInput(e) {
+            this.setData({ 'userInfo.height': e.detail.value });
+        },
+
+        // 监听体重输入
+        onWeightInput(e) {
+            this.setData({ 'userInfo.weight': e.detail.value });
+        },
+
         // 根据工号查询用户信息
         searchUser() {
             let workNo = this.data.workNo.trim();
@@ -105,9 +115,11 @@ Component({
                         icon: "none"
                     })
                 }
-            }).catch(() => {
+            }).catch((err) => {
+				console.log(err);
+                this.setData({ userInfo: null });
                 wx.showToast({
-                    title: "查询失败，请重试",
+                    title: (err && err.message) || "查询失败",
                     icon: "none"
                 })
             })
@@ -122,21 +134,24 @@ Component({
                 })
                 return;
             }
-            let sn = app.globalData.ppScale.device.mac.replace(/:/g, '');
-            let user = this.data.userInfo;
-            $.ajax("weighingScale/v2/edit/user", {
-                sn,
-                realname: user.realname,
-                sex: user.sex,
-                birthday: user.birthday,
-                height: user.height,
-                weight: user.weight
-            }, "POST", true, "正在添加...").then(res => {
+            let userInfo = this.data.userInfo;
+            // 校验身高
+            if (!userInfo.height) {
+                wx.showToast({ title: "请输入身高", icon: "none" });
+                return;
+            }
+            // 校验体重
+            if (!userInfo.weight) {
+                wx.showToast({ title: "请输入体重", icon: "none" });
+                return;
+            }
+			userInfo.sn = app.globalData.ppScale.device.mac.replace(/:/g, '')
+            $.ajax("weighingScale/v2/edit/user", userInfo, "POST", true, "正在添加...").then(res => {
                 wx.showToast({
                     title: "添加成功",
                     icon: "success"
                 })
-                this.triggerEvent('returnDate', { userInfo: user });
+                this.triggerEvent('returnDate', { userInfo });
                 this.closeModal();
             }).catch(() => {
                 wx.showToast({
diff --git a/components/configureDevice_2_addUser/configureDevice_2_addUser.wxml b/components/configureDevice_2_addUser/configureDevice_2_addUser.wxml
index 740f7d0..8dfe659 100644
--- a/components/configureDevice_2_addUser/configureDevice_2_addUser.wxml
+++ b/components/configureDevice_2_addUser/configureDevice_2_addUser.wxml
@@ -11,43 +11,68 @@
 		<view class="input">
 			<view>工号：</view>
 			<view>
-				<input type="text" placeholder="输入工号自动显示员工信息" value="{{workNo}}" bindinput="onWorkNoInput" bindconfirm="searchUser" />
+				<input type="text" maxlength="8" placeholder="输入工号自动显示员工信息" value="{{workNo}}" bindinput="onWorkNoInput" bindconfirm="searchUser" />
 			</view>
 <!--			<view class="searchBtn" bind:tap="searchUser">查询</view>-->
 		</view>
 		<view class="only">
 			<view>姓名：</view>
 			<view>
-				<view>{{userInfo.realname || ''}}</view>
+				<view>
+					<block wx:if="{{userInfo}}">
+						{{userInfo.realname || ''}}
+					</block>
+					<block wx:else>
+						<text style="color: #808080;">请先输入工号</text>
+					</block>
+				</view>
 				<view></view>
 			</view>
 		</view>
 		<view class="only">
 			<view>性别：</view>
 			<view>
-				<view>{{userInfo.sex === 1 ? '男' : userInfo.sex === 2 ? '女' : ''}}</view>
+				<view>
+					<block wx:if="{{userInfo}}">
+						{{userInfo.sex === 1 ? '男' : userInfo.sex === 2 ? '女' : ''}}
+					</block>
+					<block wx:else>
+						<text style="color: #808080;">请先输入工号</text>
+					</block>
+				</view>
 				<view></view>
 			</view>
 		</view>
 		<view class="only">
 			<view>生日：</view>
 			<view>
-				<view>{{userInfo.birthday || ''}}</view>
+				<view>
+					<block wx:if="{{userInfo}}">
+						{{userInfo.birthday || ''}}
+					</block>
+					<block wx:else>
+						<text style="color: #808080;">请先输入工号</text>
+					</block>
+				</view>
 				<view></view>
 			</view>
 		</view>
-		<view class="only">
+		<view class="inputUnit">
 			<view>身高：</view>
 			<view>
-				<view>{{userInfo.height || ''}}</view>
-				<view wx:if="{{userInfo.height}}">cm</view>
+				<view>
+					<input type="digit" value="{{userInfo.height || ''}}" bindinput="onHeightInput" placeholder="请输入身高" />
+				</view>
+				<view>cm</view>
 			</view>
 		</view>
-		<view class="only">
+		<view class="inputUnit">
 			<view>体重：</view>
 			<view>
-				<view>{{userInfo.weight || ''}}</view>
-				<view wx:if="{{userInfo.weight}}">kg</view>
+				<view>
+					<input type="digit" value="{{userInfo.weight || ''}}" bindinput="onWeightInput" placeholder="请输入体重" />
+				</view>
+				<view>kg</view>
 			</view>
 		</view>
 	</view>
diff --git a/components/configureDevice_2_addUser/configureDevice_2_addUser.wxss b/components/configureDevice_2_addUser/configureDevice_2_addUser.wxss
index 744313e..a96960f 100644
--- a/components/configureDevice_2_addUser/configureDevice_2_addUser.wxss
+++ b/components/configureDevice_2_addUser/configureDevice_2_addUser.wxss
@@ -55,7 +55,8 @@
 }
 
 .only,
-.input {
+.input,
+.inputUnit {
 	width: 100%;
 	height: 104rpx;
 	display: flex;
@@ -64,14 +65,16 @@
 }
 
 .only>view:nth-of-type(1),
-.input>view:nth-of-type(1) {
+.input>view:nth-of-type(1),
+.inputUnit>view:nth-of-type(1) {
 	color: #333333;
 	height: 104rpx;
 	font-size: 32rpx;
 	line-height: 104rpx;
 }
 
-.only>view:nth-of-type(2) {
+.only>view:nth-of-type(2),
+.inputUnit>view:nth-of-type(2) {
 	flex: 1;
 	width: 0;
 	height: 104rpx;
@@ -84,7 +87,8 @@
 	border: 1rpx solid #E6E6EA;
 }
 
-.only>view:nth-of-type(2)>view:nth-of-type(1) {
+.only>view:nth-of-type(2)>view:nth-of-type(1),
+.inputUnit>view:nth-of-type(2)>view:nth-of-type(1) {
 	flex: 1;
 	width: 0;
 	color: #252535;
@@ -94,7 +98,8 @@
 	line-height: 100rpx;
 }
 
-.only>view:nth-of-type(2)>view:nth-of-type(2) {
+.only>view:nth-of-type(2)>view:nth-of-type(2),
+.inputUnit>view:nth-of-type(2)>view:nth-of-type(2) {
 	color: #77849E;
 	height: 28rpx;
 	font-size: 28rpx;
@@ -110,7 +115,8 @@
 	border: 1rpx solid #E6E6EA;
 }
 
-.input>view:nth-of-type(2) input {
+.input>view:nth-of-type(2) input,
+.inputUnit>view:nth-of-type(2)>view:nth-of-type(1) input {
 	width: 100%;
 	height: 100%;
 	color: #252535;
@@ -118,6 +124,10 @@
 	font-weight: 500;
 }
 
+.inputUnit>view:nth-of-type(2) {
+
+}
+
 .searchBtn {
 	color: #FFFFFF;
 	width: 120rpx;
diff --git a/components/configureDevice_3/configureDevice_3.js b/components/configureDevice_3/configureDevice_3.js
index a2a82dc..b494992 100644
--- a/components/configureDevice_3/configureDevice_3.js
+++ b/components/configureDevice_3/configureDevice_3.js
@@ -103,74 +103,10 @@ Component({
             if(res === 23) {
                 app.globalData.ppScale.wifi.ssid = this.data.selectWifi.ssid;
                 app.globalData.ppScale.wifi.password = this.data.selectWifiPWD;
-                
-                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 => {
-                        if (res.success) {
-                            app.globalData.ppScale.activeProtocol.codeSetBindingState((res) => {
-                                console.log("setNetwork.js codeSetBindingState", res);
-            
-                                if(res == 0) {
-                                    this.triggerEvent('deviceEvent', {
-                                        status: true
-                                    });
-                                } else {
-                                    app.globalData.ppScale.plugin.Blue.stop();
-                                    wx.showToast({
-                                        title: "绑定失败，请重试。",
-                                        icon: "none"
-                                    })
-                                    setTimeout(() => {
-                                        wx.navigateBack({
-                                            delta: 2
-                                        })
-                                    }, 1500)
-                                }
-                            })
-                        } else {
-                            app.globalData.ppScale.plugin.Blue.stop();
-                            wx.showToast({
-                                icon: "none",
-                                title: res.message
-                            })
-                            setTimeout(() => {
-                                wx.navigateBack({
-                                    delta: 2
-                                })
-                            }, 1500)
-                        }
-                    }).catch(err => {
-                        app.globalData.ppScale.plugin.Blue.stop();
-                        wx.showToast({
-                            icon: "none",
-                            title: err.message
-                        })
-                        setTimeout(() => {
-                            wx.navigateBack({
-                                delta: 2
-                            })
-                        }, 1500)
-                    })
-                } else {
-                    app.globalData.ppScale.plugin.Blue.stop();
-                    wx.showToast({
-                        icon: "none",
-                        title: "Mac 地址与 deviceId 获取失败，请重新绑定"
-                    })
-                    setTimeout(() => {
-                        wx.navigateBack({
-                            delta: 2
-                        })
-                    }, 1500)
-                }
+
+                this.triggerEvent('deviceEvent', {
+                    status: true
+                });
             } else {
                 app.globalData.ppScale.plugin.Blue.stop();
                 wx.showToast({
diff --git a/images/configureDevice/null.png b/images/configureDevice/null.png
new file mode 100644
index 0000000000000000000000000000000000000000..89ba90f037e6e8d01b94f0d4d880f915da502d9a
GIT binary patch
literal 11768
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

literal 0
HcmV?d00001

diff --git a/pages/configureDevice/configureDevice.js b/pages/configureDevice/configureDevice.js
index 3416eb3..7b5bec0 100644
--- a/pages/configureDevice/configureDevice.js
+++ b/pages/configureDevice/configureDevice.js
@@ -24,9 +24,9 @@ Page({
 			app.registerBusListeners();
 
 			// 页面级 bus 订阅
-			ppScale.plugin.bus.subscribe("deviceInfo", (res) => {
-				console.log("===》deviceInfo", res);
-				ppScale.device.mac = res.serialNumber;
+			ppScale.plugin.bus.subscribe("devicesModel", (res) => {
+				console.log("===》devicesModel", res);
+				ppScale.device.mac = res.deviceMac;
 				this._macReady = true;
 				this._tryProgress();
 			});
diff --git a/utils/request.js b/utils/request.js
index cfbc780..db3f252 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -20,7 +20,7 @@ const hideLoading = () => {
 	}
 }
 
-const ajax = (url, params, methos, loading = true, title = "加载中...") => {
+const ajax = (url, params, methos, loading = true, title = "加载中...", contentType = "application/json") => {
 	let requestUrl = app.globalData.wxRequestUrl + url;
 	if (loading) {
 		showLoading(title);
@@ -28,7 +28,7 @@ const ajax = (url, params, methos, loading = true, title = "加载中...") => {
 
 	return new Promise((resolve, reject) => {
 		let header = {
-			"content-type": "application/json"
+			"content-type": contentType
 		};
 
 		let token = wx.getStorageSync("token");