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 @@ - - - ! - 最多支持 10 位成员 - + + + ! + 最多支持 10 位成员 + - - - + + + + + - - - - 姓名 - * - - - - - + + + + 姓名 + * + + + + + - - - - 身份证号 - * - - - - - + + + + 身份证号 + * + + + + + - - - - 性别 - - - - - {{ form.gender }} - - - 自动生成,无需填写 - - - - + + + + 性别 + + + + + {{ form.gender }} + + + 自动生成,无需填写 + + + + - - - - 年龄 - - - - - {{ form.age }} - - - 自动生成,无需填写 - - - - - + + + + 年龄 + + + + + {{ form.age }} + + + 自动生成,无需填写 + + + + + - - - - 身高 - * - - - - - cm - - - + + + + 身高 + * + + + + + cm + + + - - - - 体重 - * - - - - - kg - - - - + + + + 体重 + * + + + + + kg + + + + - - - 从已有成员中选择 - - + + + 从已有成员中选择 + + + + - - - 取消 - 保存成员信息 - + + + 取消 + 保存成员信息 + - - - + + + - - - + + + 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' }) }, })