[AI Generated]: feat(device): 配网/绑定后下发主用户到设备并兜底超时

- configWifi 加 20s 超时与 settled 互锁,避免回调不触发导致 loading 死转
- supplementPersonal 提交后、connectedWifi 二次配网确认后均下发主用户
- 设备成员唯一标识从 idCard 切换为 userId,清理 MemberDisplay.idCard

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
17792275749
2026-05-21 15:56:44 +08:00
co-authored by Claude Opus 4.7
parent e4404a6b0c
commit ea52c495f6
5 changed files with 81 additions and 11 deletions
@@ -40,6 +40,8 @@ interface SysUserDevice {
/** 页面展示用成员模型 */
interface MemberDisplay {
id: string
/** 成员 ID */
userId: string
realname: string
/** '男' | '女' */
sex_dictText: string
@@ -54,8 +56,6 @@ interface MemberDisplay {
sex: number
/** 周岁数值,供 lefu 层使用 */
age: number
/** 身份证号,下发设备时作为用户唯一标识 */
idCard: string
}
/** 设备卡展示模型 */
@@ -84,7 +84,7 @@ const calcAge = (birthday: string): number => {
}
const toDeviceMember = (m: MemberDisplay): DeviceMember => ({
id: m.idCard,
id: m.userId,
name: m.realname,
gender: m.sex === 1 ? 1 : 0,
age: m.age,
@@ -181,10 +181,11 @@ Page({
get<SysUserDevice[]>('weighingScale/v3/selectUserBySn/user', { sn, userId })
.then(res => {
const list = res.result.map<MemberDisplay>(item => {
const list = res.result.map((item): MemberDisplay => {
const age = calcAge(item.birthday)
return {
id: item.id,
userId: item.userId,
realname: item.realname,
sex_dictText: item.sex === 1 ? '男' : '女',
ageDisplay: String(age),
@@ -194,7 +195,6 @@ Page({
avatar: item.avatar,
sex: item.sex,
age,
idCard: item.idCard ?? '',
}
})
this.setData({