From 69ad8358ae5db8a73edb85798b1ededdaceee7f4 Mon Sep 17 00:00:00 2001
From: 17792275749 <812100002@qq.com>
Date: Fri, 15 May 2026 17:29:37 +0800
Subject: [PATCH] =?UTF-8?q?[AI=20Generated]:=20feat(*):=20=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E6=95=B0=E6=8D=AE=E9=A1=B5=E5=88=87=E6=8D=A2=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E3=80=81=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=8A=E6=88=91=E7=9A=84=E9=A1=B5=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/app.ts                               | 16 ++++++++--------
 miniprogram/pages/addMember/addMember.less       |  1 -
 .../pages/equipmentMember/equipmentMember.ts     |  4 ++--
 miniprogram/pages/home/home.ts                   | 11 ++++++-----
 miniprogram/pages/login/login.ts                 | 12 ++++++------
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/miniprogram/app.ts b/miniprogram/app.ts
index 7a83f76..7a5194a 100644
--- a/miniprogram/app.ts
+++ b/miniprogram/app.ts
@@ -6,13 +6,13 @@ App<IAppOption>({
 
     onLaunch() {
         // 已登录则跳过登录页
-        // const userInfo = wx.getStorageSync('userInfo')
-        // if (userInfo) {
-        //     const connectDeviceInfo = wx.getStorageSync('connectDeviceInfo')
-        //     const hasDevice = connectDeviceInfo && Object.keys(connectDeviceInfo).length > 0
-        //     wx.reLaunch({
-        //         url: hasDevice ? '/pages/home/home' : '/pages/connectedDevice/connectedDevice'
-        //     })
-        // }
+        const userInfo = wx.getStorageSync('userInfo')
+        if (userInfo) {
+            const connectDeviceInfo = wx.getStorageSync('connectDeviceInfo')
+            const hasDevice = connectDeviceInfo && Object.keys(connectDeviceInfo).length > 0
+            wx.reLaunch({
+                url: hasDevice ? '/pages/home/home' : '/pages/connectedDevice/connectedDevice'
+            })
+        }
     },
 })
diff --git a/miniprogram/pages/addMember/addMember.less b/miniprogram/pages/addMember/addMember.less
index 88456a1..6c3d4e3 100644
--- a/miniprogram/pages/addMember/addMember.less
+++ b/miniprogram/pages/addMember/addMember.less
@@ -42,7 +42,6 @@
 		flex: 1;
 		overflow: hidden;
 		padding: 0 30rpx;
-		margin-bottom: 40rpx;
 		box-sizing: border-box;
 
 		/* 表单卡片 */
diff --git a/miniprogram/pages/equipmentMember/equipmentMember.ts b/miniprogram/pages/equipmentMember/equipmentMember.ts
index f746820..be8446f 100644
--- a/miniprogram/pages/equipmentMember/equipmentMember.ts
+++ b/miniprogram/pages/equipmentMember/equipmentMember.ts
@@ -130,7 +130,7 @@ Page({
         this.setData({
             sn: deviceInfo?.serialNumber ?? '',
             connected: lefuService.isConnected,
-            'deviceCard.name': deviceInfo?.name ?? '',
+            'deviceCard.name': deviceInfo?.modelNumber ?? '智能体重秤',
         })
         if (deviceInfo?.serialNumber) {
             this._loadData(deviceInfo.serialNumber)
@@ -139,7 +139,7 @@ Page({
         lefuService.onDeviceInfo((info) => {
             this.setData({
                 sn: info.serialNumber ?? '',
-                'deviceCard.name': info.name ?? '',
+                'deviceCard.name': info.modelNumber ?? '智能体重秤',
             })
             if (!this.data.memberList.length && info.serialNumber) {
                 this._loadData(info.serialNumber)
diff --git a/miniprogram/pages/home/home.ts b/miniprogram/pages/home/home.ts
index 7aba48b..b5b5c00 100644
--- a/miniprogram/pages/home/home.ts
+++ b/miniprogram/pages/home/home.ts
@@ -67,12 +67,8 @@ Page({
     },
 
     onLoad() {
-        this.setData({
-            'device.connected': lefuService.isConnected,
-            'device.name': lefuService.deviceInfo?.name ?? '智能体重秤',
-        })
         lefuService.onDeviceInfo((info) => {
-            this.setData({ 'device.name': info.name ?? '智能体重秤' })
+            this.setData({ 'device.name': info.modelNumber ?? '智能体重秤' })
         })
         lefuService.onDeviceConnect(() => {
             this.setData({ 'device.connected': true })
@@ -83,6 +79,11 @@ Page({
     },
 
     onShow() {
+        // 每次进入 tab 同步最新设备状态
+        this.setData({
+            'device.connected': lefuService.isConnected,
+            'device.name': lefuService.deviceInfo?.modelNumber ?? '智能体重秤',
+        })
         this.loadData()
     },
 
diff --git a/miniprogram/pages/login/login.ts b/miniprogram/pages/login/login.ts
index 305a6cc..32e141b 100644
--- a/miniprogram/pages/login/login.ts
+++ b/miniprogram/pages/login/login.ts
@@ -65,13 +65,13 @@ Page({
                         wx.setStorageSync('userInfo', result.user)
 
                         /* 上次连接设备不为空对象则直接进首页 */
-                        // const connectDeviceInfo = result.user?.connectDeviceInfo
-                        // if (connectDeviceInfo && connectDeviceInfo !== '{}') {
-                        //     wx.setStorageSync('connectDeviceInfo', JSON.parse(connectDeviceInfo))
-                        //     wx.reLaunch({ url: '/pages/home/home' })
-                        // } else {
+                        const connectDeviceInfo = result.user?.connectDeviceInfo
+                        if (connectDeviceInfo && connectDeviceInfo !== '{}') {
+                            wx.setStorageSync('connectDeviceInfo', JSON.parse(connectDeviceInfo))
+                            wx.reLaunch({ url: '/pages/home/home' })
+                        } else {
                             wx.reLaunch({ url: '/pages/connectedDevice/connectedDevice' })
-                        // }
+                        }
                     })
                     .catch(() => {
                         this.setData({ loading: false })