From 85402f2ec17a11ed4b2e9061b9ddb70ebd117a37 Mon Sep 17 00:00:00 2001
From: 17792275749 <812100002@qq.com>
Date: Tue, 26 May 2026 16:46:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(device):=20=E8=AE=BE=E5=A4=87=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E6=88=90=E5=8A=9F=E5=90=8E=E7=BC=93=E5=AD=98=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=EF=BC=9B=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=88=90=E5=91=98=E6=97=B6=E6=90=BA=E5=B8=A6=20SN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 miniprogram/app.json                       |  2 +-
 miniprogram/pages/addMember/addMember.ts   |  1 +
 miniprogram/pages/equipment/equipment.ts   | 28 ++++++++++++++++++++++
 miniprogram/pages/equipment/equipment.wxml |  3 +--
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/miniprogram/app.json b/miniprogram/app.json
index 4c93010..f1ce9ab 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -1,10 +1,10 @@
 {
   "pages": [
-    "pages/equipmentMember/equipmentMember",
     "pages/login/login",
     "pages/home/home",
     "pages/connectedDevice/connectedDevice",
     "pages/connectedWifi/connectedWifi",
+    "pages/equipmentMember/equipmentMember",
     "pages/supplementPersonal/supplementPersonal",
     "pages/addMember/addMember",
     "pages/equipment/equipment",
diff --git a/miniprogram/pages/addMember/addMember.ts b/miniprogram/pages/addMember/addMember.ts
index e87ea4d..ffc8b35 100644
--- a/miniprogram/pages/addMember/addMember.ts
+++ b/miniprogram/pages/addMember/addMember.ts
@@ -303,6 +303,7 @@ Page({
 			...(this.data.selectedMember ?? {}),
 			...(serverResult ?? {}),
 			parentUserId: userInfo?.userId ?? '',
+			sn: lefuService.deviceInfo?.serialNumber ?? '',
 			scaleDeviceId: lefuService.deviceInfo?.serialNumber ?? '',
 			realname: name.trim(),
 			idCard,
diff --git a/miniprogram/pages/equipment/equipment.ts b/miniprogram/pages/equipment/equipment.ts
index 58b7e0a..8ddbaf9 100644
--- a/miniprogram/pages/equipment/equipment.ts
+++ b/miniprogram/pages/equipment/equipment.ts
@@ -45,6 +45,13 @@ interface DeviceItem {
     realname: string
     /** 蓝牙连接状态，接口不返回，由业务层更新 */
     connected: boolean
+    userId: string
+    sex: number
+    height: number
+    birthday: string
+    avatar: string | null
+    relationType: string | null
+    sex_dictText: string
 }
 
 Page({
@@ -82,6 +89,13 @@ Page({
                         connectDeviceInfo: item.connectDeviceInfo ?? '',
                         realname: item.realname,
                         connected: false,
+                        userId: item.userId,
+                        sex: item.sex,
+                        height: item.height,
+                        birthday: item.birthday,
+                        avatar: item.avatar,
+                        relationType: item.relationType,
+                        sex_dictText: item.sex_dictText,
                     }
                 })
                 this.setData({ deviceList: list }, () => {
@@ -119,6 +133,7 @@ Page({
 
     /** 点击「连接」：扫描周边设备，找到 deviceId 匹配的设备后连接 */
     onTapConnect(e: WechatMiniprogram.TouchEvent) {
+        const userInfo = e.currentTarget.dataset.userInfo as DeviceItem
         const connectDeviceInfoStr = e.currentTarget.dataset.connectDeviceInfo as string
         let cachedDevice: RawDevice | null = null
         try {
@@ -151,6 +166,19 @@ Page({
                     lefuService.onDeviceConnect(() => {
                         wx.hideLoading()
                         wx.setStorageSync('connectDeviceInfo', matched.raw)
+                        // 连接成功后缓存当前设备关联的用户信息
+                        if (userInfo) {
+                            wx.setStorageSync('userInfo', {
+                                userId: userInfo.userId,
+                                realname: userInfo.realname,
+                                sex: userInfo.sex,
+                                height: userInfo.height,
+                                birthday: userInfo.birthday,
+                                avatar: userInfo.avatar,
+                                relationType: userInfo.relationType,
+                                sex_dictText: userInfo.sex_dictText,
+                            })
+                        }
                     })
                     lefuService.onDeviceInfo((info) => {
                         this._markConnected(info.serialNumber as string)
diff --git a/miniprogram/pages/equipment/equipment.wxml b/miniprogram/pages/equipment/equipment.wxml
index 2255ec6..6396c0e 100644
--- a/miniprogram/pages/equipment/equipment.wxml
+++ b/miniprogram/pages/equipment/equipment.wxml
@@ -43,11 +43,10 @@
 						<block wx:else>
 							<!-- 未连接:双按钮 连接 / 成员管理 -->
 							<view class="card-actions card-actions-double">
-								<view class="btn-ghost-half" data-connect-device-info="{{ item.connectDeviceInfo }}" bind:tap="onTapConnect">连接</view>
+								<view class="btn-ghost-half" data-connect-device-info="{{ item.connectDeviceInfo }}" data-user-info="{{ item }}" bind:tap="onTapConnect">连接</view>
 								<view class="btn-ghost-half" bind:tap="onTapMember">成员管理</view>
 							</view>
 						</block>
-
 					</view>
 				</block>
 			</view>