From 77e768f6c73781899bbe3a7e3c53718edfc0f40c Mon Sep 17 00:00:00 2001
From: 17792275749 <812100002@qq.com>
Date: Thu, 28 May 2026 16:52:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(addMember):=20=E9=80=89=E6=8B=A9=E5=B7=B2?=
 =?UTF-8?q?=E6=9C=89=E6=88=90=E5=91=98=E8=A1=A5=E6=9C=8D=E5=8A=A1=E7=AB=AF?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=9B=E8=A1=A8=E5=8D=95=E5=8A=A0scroll-vi?=
 =?UTF-8?q?ew=EF=BC=9B=E4=B8=8A=E9=99=9010=E4=BA=BA=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- onSelectMember 选中后调用 fetchUserInfoByIdCard 走服务端校验
- 表单区域包裹 scroll-view，适配小屏滚动
- equipmentMember 添加按钮超10人弹 toast 提示

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 miniprogram/pages/addMember/addMember.less    |   8 +-
 miniprogram/pages/addMember/addMember.ts      |   3 +
 miniprogram/pages/addMember/addMember.wxml    | 282 +++++++++---------
 .../pages/equipmentMember/equipmentMember.ts  |   4 +
 4 files changed, 156 insertions(+), 141 deletions(-)

diff --git a/miniprogram/pages/addMember/addMember.less b/miniprogram/pages/addMember/addMember.less
index 6c3d4e3..070b0a8 100644
--- a/miniprogram/pages/addMember/addMember.less
+++ b/miniprogram/pages/addMember/addMember.less
@@ -41,8 +41,12 @@
 		width: 100%;
 		flex: 1;
 		overflow: hidden;
-		padding: 0 30rpx;
-		box-sizing: border-box;
+
+		.scrollViewContent {
+			width: 100%;
+			padding: 0 30rpx;
+			box-sizing: border-box;
+		}
 
 		/* 表单卡片 */
 		.form-card {
diff --git a/miniprogram/pages/addMember/addMember.ts b/miniprogram/pages/addMember/addMember.ts
index ede020f..ac2aaf2 100644
--- a/miniprogram/pages/addMember/addMember.ts
+++ b/miniprogram/pages/addMember/addMember.ts
@@ -299,6 +299,9 @@ Page({
 			'form.height': String(member.height),
 			'form.weight': String(member.weight),
 		})
+		if (member.name.trim() && this.isIdCardValid(member.idCard)) {
+			this.fetchUserInfoByIdCard(member.name.trim(), member.idCard)
+		}
 	},
 
 	/** 确认弹框 - 确认 */
diff --git a/miniprogram/pages/addMember/addMember.wxml b/miniprogram/pages/addMember/addMember.wxml
index 946e787..b134d12 100644
--- a/miniprogram/pages/addMember/addMember.wxml
+++ b/miniprogram/pages/addMember/addMember.wxml
@@ -1,153 +1,157 @@
 <view class="add-member">
 
-	<!-- 顶部浅蓝提示条 -->
-	<view class="tips">
-		<view class="tips-icon">!</view>
-		<text class="tips-text">最多支持 10 位成员</text>
-	</view>
+    <!-- 顶部浅蓝提示条 -->
+    <view class="tips">
+        <view class="tips-icon">!</view>
+        <text class="tips-text">最多支持 10 位成员</text>
+    </view>
 
-	<view class="form">
-		<!-- 白色圆角表单卡片 -->
-		<view class="form-card">
+    <view class="form">
+        <scroll-view class="scrollView">
+            <view class="scrollViewContent">
+                <!-- 白色圆角表单卡片 -->
+                <view class="form-card">
 
-			<!-- 姓名 -->
-			<view class="form-row">
-				<view class="form-label">
-					<text class="label-text">姓名</text>
-					<text class="label-star">*</text>
-				</view>
-				<view class="form-control">
-					<input class="form-input"
-						   type="text"
-						   maxlength="20"
-						   placeholder="请填写真实姓名"
-						   placeholder-class="form-placeholder"
-						   value="{{ form.name }}"
-						   disabled="{{ readonly }}"
-						   bind:input="onNameInput" />
-				</view>
-			</view>
+                    <!-- 姓名 -->
+                    <view class="form-row">
+                        <view class="form-label">
+                            <text class="label-text">姓名</text>
+                            <text class="label-star">*</text>
+                        </view>
+                        <view class="form-control">
+                            <input class="form-input"
+                                   type="text"
+                                   maxlength="20"
+                                   placeholder="请填写真实姓名"
+                                   placeholder-class="form-placeholder"
+                                   value="{{ form.name }}"
+                                   disabled="{{ readonly }}"
+                                   bind:input="onNameInput"/>
+                        </view>
+                    </view>
 
-			<!-- 身份证号 -->
-			<view class="form-row">
-				<view class="form-label">
-					<text class="label-text">身份证号</text>
-					<text class="label-star">*</text>
-				</view>
-				<view class="form-control">
-					<input class="form-input"
-						   type="idcard"
-						   maxlength="18"
-						   placeholder="请填写身份证号"
-						   placeholder-class="form-placeholder"
-						   value="{{ form.idCard }}"
-						   disabled="{{ readonly }}"
-						   bind:input="onIdCardInput" />
-				</view>
-			</view>
+                    <!-- 身份证号 -->
+                    <view class="form-row">
+                        <view class="form-label">
+                            <text class="label-text">身份证号</text>
+                            <text class="label-star">*</text>
+                        </view>
+                        <view class="form-control">
+                            <input class="form-input"
+                                   type="idcard"
+                                   maxlength="18"
+                                   placeholder="请填写身份证号"
+                                   placeholder-class="form-placeholder"
+                                   value="{{ form.idCard }}"
+                                   disabled="{{ readonly }}"
+                                   bind:input="onIdCardInput"/>
+                        </view>
+                    </view>
 
-			<!-- 性别(由身份证自动生成) -->
-			<view class="form-row">
-				<view class="form-label">
-					<text class="label-text">性别</text>
-				</view>
-				<view class="form-control">
-					<view class="form-readonly">
-						<block wx:if="{{ form.gender }}">
-							<text class="readonly-text">{{ form.gender }}</text>
-						</block>
-						<block wx:else>
-							<text class="readonly-placeholder">自动生成,无需填写</text>
-						</block>
-					</view>
-				</view>
-			</view>
+                    <!-- 性别(由身份证自动生成) -->
+                    <view class="form-row">
+                        <view class="form-label">
+                            <text class="label-text">性别</text>
+                        </view>
+                        <view class="form-control">
+                            <view class="form-readonly">
+                                <block wx:if="{{ form.gender }}">
+                                    <text class="readonly-text">{{ form.gender }}</text>
+                                </block>
+                                <block wx:else>
+                                    <text class="readonly-placeholder">自动生成,无需填写</text>
+                                </block>
+                            </view>
+                        </view>
+                    </view>
 
-			<!-- 年龄(由身份证自动生成) -->
-			<view class="form-row">
-				<view class="form-label">
-					<text class="label-text">年龄</text>
-				</view>
-				<view class="form-control">
-					<view class="form-readonly form-readonly-with-suffix">
-						<block wx:if="{{ form.age }}">
-							<text class="readonly-text">{{ form.age }}</text>
-						</block>
-						<block wx:else>
-							<text class="readonly-placeholder">自动生成,无需填写</text>
-						</block>
-						<text class="form-suffix">岁</text>
-					</view>
-				</view>
-			</view>
+                    <!-- 年龄(由身份证自动生成) -->
+                    <view class="form-row">
+                        <view class="form-label">
+                            <text class="label-text">年龄</text>
+                        </view>
+                        <view class="form-control">
+                            <view class="form-readonly form-readonly-with-suffix">
+                                <block wx:if="{{ form.age }}">
+                                    <text class="readonly-text">{{ form.age }}</text>
+                                </block>
+                                <block wx:else>
+                                    <text class="readonly-placeholder">自动生成,无需填写</text>
+                                </block>
+                                <text class="form-suffix">岁</text>
+                            </view>
+                        </view>
+                    </view>
 
-			<!-- 身高 -->
-			<view class="form-row">
-				<view class="form-label">
-					<text class="label-text">身高</text>
-					<text class="label-star">*</text>
-				</view>
-				<view class="form-control">
-					<view class="form-input-wrap">
-						<input class="form-input form-input-with-suffix"
-							   type="digit"
-							   maxlength="5"
-							   placeholder="请填写身高"
-							   placeholder-class="form-placeholder"
-							   value="{{ form.height }}"
-							   disabled="{{ readonly }}"
-							   bind:input="onHeightInput" />
-						<text class="form-suffix form-suffix-inside">cm</text>
-					</view>
-				</view>
-			</view>
+                    <!-- 身高 -->
+                    <view class="form-row">
+                        <view class="form-label">
+                            <text class="label-text">身高</text>
+                            <text class="label-star">*</text>
+                        </view>
+                        <view class="form-control">
+                            <view class="form-input-wrap">
+                                <input class="form-input form-input-with-suffix"
+                                       type="digit"
+                                       maxlength="5"
+                                       placeholder="请填写身高"
+                                       placeholder-class="form-placeholder"
+                                       value="{{ form.height }}"
+                                       disabled="{{ readonly }}"
+                                       bind:input="onHeightInput"/>
+                                <text class="form-suffix form-suffix-inside">cm</text>
+                            </view>
+                        </view>
+                    </view>
 
-			<!-- 体重 -->
-			<view class="form-row">
-				<view class="form-label">
-					<text class="label-text">体重</text>
-					<text class="label-star">*</text>
-				</view>
-				<view class="form-control">
-					<view class="form-input-wrap">
-						<input class="form-input form-input-with-suffix"
-							   type="digit"
-							   maxlength="6"
-							   placeholder="请填写体重"
-							   placeholder-class="form-placeholder"
-							   value="{{ form.weight }}"
-							   disabled="{{ readonly }}"
-							   bind:input="onWeightInput" />
-						<text class="form-suffix form-suffix-inside">kg</text>
-					</view>
-				</view>
-			</view>
-		</view>
+                    <!-- 体重 -->
+                    <view class="form-row">
+                        <view class="form-label">
+                            <text class="label-text">体重</text>
+                            <text class="label-star">*</text>
+                        </view>
+                        <view class="form-control">
+                            <view class="form-input-wrap">
+                                <input class="form-input form-input-with-suffix"
+                                       type="digit"
+                                       maxlength="6"
+                                       placeholder="请填写体重"
+                                       placeholder-class="form-placeholder"
+                                       value="{{ form.weight }}"
+                                       disabled="{{ readonly }}"
+                                       bind:input="onWeightInput"/>
+                                <text class="form-suffix form-suffix-inside">kg</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
 
-        <!-- 从已有成员中选择(编辑模式隐藏) -->
-        <block wx:if="{{ !isEdit }}">
-            <view class="ghost-btn" bind:tap="onTapSelectExisting">从已有成员中选择</view>
-        </block>
-	</view>
+                <!-- 从已有成员中选择(编辑模式隐藏) -->
+                <block wx:if="{{ !isEdit }}">
+                    <view class="ghost-btn" bind:tap="onTapSelectExisting">从已有成员中选择</view>
+                </block>
+            </view>
+        </scroll-view>
+    </view>
 
-	<!-- 底部双按钮:取消 / 保存成员信息 -->
-	<view class="actions">
-		<view class="btn-cancel" bind:tap="onCancel">取消</view>
-		<view class="btn-primary" bind:tap="onSubmit">保存成员信息</view>
-	</view>
+    <!-- 底部双按钮:取消 / 保存成员信息 -->
+    <view class="actions">
+        <view class="btn-cancel" bind:tap="onCancel">取消</view>
+        <view class="btn-primary" bind:tap="onSubmit">保存成员信息</view>
+    </view>
 
-	<!-- 选择已有成员抽屉 -->
-	<select-member-drawer
-		show="{{ showSelectDrawer }}"
-		bind:close="onSelectMemberClose"
-		bind:select="onSelectMember">
-	</select-member-drawer>
+    <!-- 选择已有成员抽屉 -->
+    <select-member-drawer
+            show="{{ showSelectDrawer }}"
+            bind:close="onSelectMemberClose"
+            bind:select="onSelectMember">
+    </select-member-drawer>
 
-	<!-- 确认弹框 -->
-	<user-info-confirm-modal
-		show="{{ showConfirmModal }}"
-		userInfo="{{ serverResult }}"
-		bind:confirm="onConfirmModalConfirm"
-		bind:cancel="onConfirmModalCancel">
-	</user-info-confirm-modal>
+    <!-- 确认弹框 -->
+    <user-info-confirm-modal
+            show="{{ showConfirmModal }}"
+            userInfo="{{ serverResult }}"
+            bind:confirm="onConfirmModalConfirm"
+            bind:cancel="onConfirmModalCancel">
+    </user-info-confirm-modal>
 </view>
diff --git a/miniprogram/pages/equipmentMember/equipmentMember.ts b/miniprogram/pages/equipmentMember/equipmentMember.ts
index 97e954d..4120efe 100644
--- a/miniprogram/pages/equipmentMember/equipmentMember.ts
+++ b/miniprogram/pages/equipmentMember/equipmentMember.ts
@@ -292,6 +292,10 @@ Page({
     /** 添加成员：未连接态禁用 */
     onTapAddMember() {
         if (!this.data.connected) return
+        if (this.data.memberList.length >= 10) {
+            wx.showToast({ title: '超过最大用户限制', icon: 'none' })
+            return
+        }
         wx.navigateTo({ url: '/pages/addMember/addMember' })
     },
 })