From 2ecb86871bb659fa34925f09e2fad61df60b9b37 Mon Sep 17 00:00:00 2001
From: 17792275749 <812100002@qq.com>
Date: Tue, 26 May 2026 15:39:39 +0800
Subject: [PATCH] =?UTF-8?q?[AI=20Generated]:=20refactor(member,my):=20?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E9=A1=B5=E9=87=8D=E6=9E=84=E4=B8=BA=20flex+s?=
 =?UTF-8?q?croll-view=20=E5=B8=83=E5=B1=80=E5=B9=B6=E8=AE=BE=E4=B8=BA?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=9B=E6=88=91=E7=9A=84=E9=A1=B5=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=20onShow=20=E5=88=B7=E6=96=B0?=
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/app.less                          |   1 +
 miniprogram/pages/equipment/equipment.less    |   1 -
 .../equipmentMember/equipmentMember.less      |  85 +++++++------
 .../equipmentMember/equipmentMember.wxml      | 118 +++++++++---------
 miniprogram/pages/my/my.ts                    |   2 +-
 6 files changed, 114 insertions(+), 95 deletions(-)

diff --git a/miniprogram/app.json b/miniprogram/app.json
index b29f6b8..4c93010 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -1,11 +1,11 @@
 {
   "pages": [
+    "pages/equipmentMember/equipmentMember",
     "pages/login/login",
     "pages/home/home",
     "pages/connectedDevice/connectedDevice",
     "pages/connectedWifi/connectedWifi",
     "pages/supplementPersonal/supplementPersonal",
-    "pages/equipmentMember/equipmentMember",
     "pages/addMember/addMember",
     "pages/equipment/equipment",
     "pages/measurementReport/measurementReport",
diff --git a/miniprogram/app.less b/miniprogram/app.less
index 502b45d..bcf564c 100644
--- a/miniprogram/app.less
+++ b/miniprogram/app.less
@@ -29,6 +29,7 @@ image {
     flex: 1;
     width: 100%;
     height: 100%;
+	overflow: hidden;
     box-sizing: border-box;
 }
 
diff --git a/miniprogram/pages/equipment/equipment.less b/miniprogram/pages/equipment/equipment.less
index 0b911ea..fbca2d1 100644
--- a/miniprogram/pages/equipment/equipment.less
+++ b/miniprogram/pages/equipment/equipment.less
@@ -12,7 +12,6 @@
 		color: #808080;
 		height: 80rpx;
 		font-size: 26rpx;
-		line-height: 28rpx;
 		padding: 0 30rpx;
 		line-height: 80rpx;
 		flex-shrink: 0;
diff --git a/miniprogram/pages/equipmentMember/equipmentMember.less b/miniprogram/pages/equipmentMember/equipmentMember.less
index 311a0c3..66a5e3c 100644
--- a/miniprogram/pages/equipmentMember/equipmentMember.less
+++ b/miniprogram/pages/equipmentMember/equipmentMember.less
@@ -1,6 +1,8 @@
 .equipmentMember {
 	width: 100%;
 	height: 100%;
+	display: flex;
+	flex-direction: column;
 
 	/* 顶部浅红提示条(未连接态) */
 	.tips {
@@ -10,6 +12,7 @@
 		padding-left: 30rpx;
 		align-items: center;
 		flex-shrink: 0;
+		margin-bottom: 24rpx;
 		box-sizing: border-box;
 		background-color: rgba(255, 77, 79, 0.12);
 
@@ -37,9 +40,11 @@
 
 	.seaction {
 		width: 100%;
-		height: 100%;
-		padding: 24rpx 30rpx 0 ;
-		box-sizing: border-box;
+		flex: 1;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		margin-bottom: 24rpx;
 
 		/* 设备卡(大卡:左插画 + 右信息) */
 		.device-card {
@@ -103,51 +108,51 @@
 			}
 		}
 
-		/* 成员卡(容量小标题 + 列表整体白卡) */
-		.member-card {
-			width: 100%;
-			margin-bottom: 40rpx;
-			border-radius: 20rpx;
-			background-color: #FFFFFF;
+		.scrollViewContent {
+			box-sizing: border-box;
 
-			/* 容量小标题 */
-			.member-card-header {
+			/* 成员卡(容量小标题 + 列表整体白卡) */
+			.member-card {
 				width: 100%;
-				height: 88rpx;
-				display: flex;
-				padding: 0 30rpx;
+				flex: 1;
 				box-sizing: border-box;
-				border-bottom: 1rpx solid #EAECF1;
-				justify-content: space-between;
+				overflow: hidden;
+				margin-bottom: 40rpx;
+				border-radius: 20rpx;
+				background-color: #FFFFFF;
 
-				.capacity-label {
-					color: #252535;
+				/* 容量小标题 */
+				.member-card-header {
+					width: 100%;
 					height: 88rpx;
-					font-size: 30rpx;
-					font-weight: bold;
-					line-height: 88rpx;
-				}
+					display: flex;
+					padding: 0 30rpx;
+					box-sizing: border-box;
+					border-bottom: 1rpx solid #EAECF1;
+					justify-content: space-between;
 
-				.capacity-value {
-					color: #1385FA;
-					height: 88rpx;
-					font-size: 28rpx;
-					font-weight: bold;
-					line-height: 88rpx;
-				}
-			}
+					.capacity-label {
+						color: #252535;
+						height: 88rpx;
+						font-size: 30rpx;
+						font-weight: bold;
+						line-height: 88rpx;
+					}
 
-			/* 列表 */
-			.member-card-list {
-				width: 100%;
-				padding: 0 30rpx;
-				box-sizing: border-box;
+					.capacity-value {
+						color: #1385FA;
+						height: 88rpx;
+						font-size: 28rpx;
+						font-weight: bold;
+						line-height: 88rpx;
+					}
+				}
 
 				.member-item {
 					width: 100%;
 					display: flex;
 					align-items: center;
-					padding: 20rpx 0;
+					padding: 20rpx 30rpx;
 					box-sizing: border-box;
 					border-bottom: 1rpx solid #F0F0F2;
 
@@ -259,6 +264,14 @@
 			color: #77849E;
 			background-color: rgba(0, 0, 0, 0);
 		}
+	}
+
+	.btn {
+		width: 100%;
+		height: 120rpx;
+		display: flex;
+		align-items: center;
+		background-color: #FFFFFF;
 
 		/* 底部添加成员按钮 */
 		.add-member {
diff --git a/miniprogram/pages/equipmentMember/equipmentMember.wxml b/miniprogram/pages/equipmentMember/equipmentMember.wxml
index 5b96ba7..2882f3d 100644
--- a/miniprogram/pages/equipmentMember/equipmentMember.wxml
+++ b/miniprogram/pages/equipmentMember/equipmentMember.wxml
@@ -10,72 +10,78 @@
 
 	<view class="seaction">
 		<!-- 设备卡 -->
-		<view class="device-card">
-			<image class="device-illustration" src="/images/device/{{ deviceCard.name }}.png" mode="aspectFit"></image>
-			<view class="device-info">
-				<view class="device-name">{{ deviceCard.name }}</view>
-				<view class="device-status">
-					<view class="status-dot {{ connected ? 'status-dot-on' : 'status-dot-off' }}"></view>
-					<view class="status-text">{{ connected ? '设备已连接' : '未连接' }}</view>
+		<view class="page-container">
+			<view class="device-card">
+				<image class="device-illustration" src="/images/device/{{ deviceCard.name }}.png" mode="aspectFit"></image>
+				<view class="device-info">
+					<view class="device-name">{{ deviceCard.name }}</view>
+					<view class="device-status">
+						<view class="status-dot {{ connected ? 'status-dot-on' : 'status-dot-off' }}"></view>
+						<view class="status-text">{{ connected ? '设备已连接' : '未连接' }}</view>
+					</view>
 				</view>
 			</view>
 		</view>
 
-		<!-- 成员卡(容量 + 列表) -->
-		<view class="member-card">
-			<!-- 设备容量(仅已连接态) -->
-			<block wx:if="{{ connected }}">
-				<view class="member-card-header">
-					<view class="capacity-label">设备容量</view>
-					<view class="capacity-value">
-						{{ deviceCard.capacityUsed }}/{{ deviceCard.capacityTotal }}
-					</view>
-				</view>
-			</block>
+		<scroll-view class="scrollView" scroll-y>
+			<view class="scrollViewContent page-container">
+				<!-- 成员卡(容量 + 列表) -->
+				<view class="member-card">
+					<!-- 设备容量(仅已连接态) -->
+					<block wx:if="{{ connected }}">
+						<view class="member-card-header">
+							<view class="capacity-label">设备容量</view>
+							<view class="capacity-value">
+								{{ deviceCard.capacityUsed }}/{{ deviceCard.capacityTotal }}
+							</view>
+						</view>
+					</block>
 
-			<!-- 成员列表 -->
-			<scroll-view scroll-y class="member-card-list">
-				<block wx:for="{{ memberList }}" wx:key="id">
-					<view class="member-item">
-						<!-- 头像：取名字第一个字 -->
-						<view class="member-avatar">{{ item.realname[0] }}</view>
+					<!-- 成员列表 -->
+					<block wx:for="{{ memberList }}" wx:key="id">
+						<view class="member-item">
+							<!-- 头像：取名字第一个字 -->
+							<view class="member-avatar">{{ item.realname[0] }}</view>
 
-						<!-- 信息列 -->
-						<view class="member-info">
-							<view class="member-name-row">
-								<view class="member-name">{{ item.realname }}</view>
-								<!-- 本人 badge -->
-								<block wx:if="{{ item.relationType == 1 }}">
-									<view class="badge badge-self">本人</view>
+							<!-- 信息列 -->
+							<view class="member-info">
+								<view class="member-name-row">
+									<view class="member-name">{{ item.realname }}</view>
+									<!-- 本人 badge -->
+									<block wx:if="{{ item.relationType == 1 }}">
+										<view class="badge badge-self">本人</view>
+									</block>
+								</view>
+								<view class="member-meta">
+									<text class="meta-text">{{ item.sex_dictText }}</text>
+									<text class="meta-divider">·</text>
+									<text class="meta-text">{{ item.ageDisplay }}岁</text>
+									<text class="meta-divider">|</text>
+									<text class="meta-text">{{ item.height }}cm</text>
+								</view>
+							</view>
+
+							<!-- 右侧:他人添加 badge 或 编辑/删除按钮 -->
+							<view class="member-actions">
+								<!-- 他人添加：仅展示 badge -->
+								<block wx:if="{{ item.relationType == 3 }}">
+									<view class="badge badge-other">他人添加</view>
+								</block>
+								<!-- 自己添加（relationType == 2）：显示编辑/删除 -->
+								<block wx:elif="{{ item.relationType != 1 }}">
+									<view class="action-text" data-id="{{ item.id }}" bind:tap="onTapEdit">编辑</view>
+									<view class="action-text action-text-danger" data-id="{{ item.id }}" bind:tap="onTapDelete">删除</view>
 								</block>
 							</view>
-							<view class="member-meta">
-								<text class="meta-text">{{ item.sex_dictText }}</text>
-								<text class="meta-divider">·</text>
-								<text class="meta-text">{{ item.ageDisplay }}岁</text>
-								<text class="meta-divider">|</text>
-								<text class="meta-text">{{ item.height }}cm</text>
-							</view>
 						</view>
+					</block>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
 
-						<!-- 右侧:他人添加 badge 或 编辑/删除按钮 -->
-						<view class="member-actions">
-							<!-- 他人添加：仅展示 badge -->
-							<block wx:if="{{ item.relationType == 3 }}">
-								<view class="badge badge-other">他人添加</view>
-							</block>
-							<!-- 自己添加（relationType == 2）：显示编辑/删除 -->
-							<block wx:elif="{{ item.relationType != 1 }}">
-								<view class="action-text" data-id="{{ item.id }}" bind:tap="onTapEdit">编辑</view>
-								<view class="action-text action-text-danger" data-id="{{ item.id }}" bind:tap="onTapDelete">删除</view>
-							</block>
-						</view>
-					</view>
-				</block>
-			</scroll-view>
-		</view>
-
-		<!-- 底部添加成员按钮 -->
+	<!-- 底部添加成员按钮 -->
+	<view class="btn">
 		<view class="add-member {{ connected ? '' : 'add-member-disabled' }}" bind:tap="onTapAddMember">
 			<view class="add-member-icon">+</view>
 			<view class="add-member-text">添加成员<text>（最多10位）</text></view>
diff --git a/miniprogram/pages/my/my.ts b/miniprogram/pages/my/my.ts
index cfb5ad2..ba424a9 100644
--- a/miniprogram/pages/my/my.ts
+++ b/miniprogram/pages/my/my.ts
@@ -32,7 +32,7 @@ Page({
         userInfo: null as PageUserInfo | null,
     },
 
-    onLoad() {
+    onShow() {
         const raw = wx.getStorageSync('userInfo') as StorageUserInfo | null
         if (!raw?.userId) return
         const userInfo: PageUserInfo = {