diff --git a/miniprogram/components/selectMemberDrawer/selectMemberDrawer.ts b/miniprogram/components/selectMemberDrawer/selectMemberDrawer.ts index 82cffdc..4ea9d18 100644 --- a/miniprogram/components/selectMemberDrawer/selectMemberDrawer.ts +++ b/miniprogram/components/selectMemberDrawer/selectMemberDrawer.ts @@ -150,7 +150,7 @@ Component({ }) } else { const sn = lefuService.deviceInfo?.serialNumber ?? '' - get('weighingScale/v3/select/addMembers/user', { userId, sn }, { loading: false }) + get('weighingScale/v5/select/addMembers/user', { userId, sn }, { loading: false }) .then((res: any) => { const members: ExistingMember[] = (res.result ?? []).map((item: AddMemberApiItem) => ({ id: item.id, diff --git a/miniprogram/lefu/service.ts b/miniprogram/lefu/service.ts index 09c1de2..b92b824 100644 --- a/miniprogram/lefu/service.ts +++ b/miniprogram/lefu/service.ts @@ -352,7 +352,7 @@ class LeFuService { if (!needUpdate) { resolve(false); return } this._activeProtocol.codeOtaUpdate((status: number) => { console.log(`codeOtaUpdatecodeOtaUpdatecodeOtaUpdate ${status}`) - status != 0 ? reject(new Error('OTA 升级失败')) : resolve(true) + status != 0 ? reject(new Error('请求失败')) : resolve(true) }) }) .catch(reject) @@ -399,14 +399,14 @@ class LeFuService { }, 2000) } - // ─── 清除设备用户(不下发) ───────────────────── + // ─── 请求用户(不下发) ───────────────────── clearDeviceMembers(): Promise { return new Promise((resolve, reject) => { if (!this._activeProtocol) { reject(new Error('设备未连接')); return } - const timer = setTimeout(() => reject(new Error('清除设备用户超时')), 15000) + const timer = setTimeout(() => reject(new Error('请求超时')), 15000) this._activeProtocol.codeClearDeviceData('01', (res: number) => { clearTimeout(timer) - res === 0 ? resolve() : reject(new Error('清除设备用户失败')) + res === 0 ? resolve() : reject(new Error('请求失败')) }) }) } @@ -418,10 +418,10 @@ class LeFuService { const mainUser = members.find(m => m.isSelf) if (!mainUser) { reject(new Error('缺少主用户')); return } - const clearTimer = setTimeout(() => reject(new Error('清除设备用户超时')), 15000) + const clearTimer = setTimeout(() => reject(new Error('请求超时')), 15000) this._activeProtocol.codeClearDeviceData('01', (clearRes: number) => { clearTimeout(clearTimer) - if (clearRes != 0) { reject(new Error('清除设备用户失败')); return } + if (clearRes != 0) { reject(new Error('请求失败')); return } let index = 0 let syncTimer: number | null = null diff --git a/miniprogram/pages/equipmentMember/equipmentMember.wxml b/miniprogram/pages/equipmentMember/equipmentMember.wxml index af3da23..28a0da6 100644 --- a/miniprogram/pages/equipmentMember/equipmentMember.wxml +++ b/miniprogram/pages/equipmentMember/equipmentMember.wxml @@ -133,7 +133,7 @@ 确认删除 - "{{ deleteTarget.realname }}"用户为他人添加,请确认是否删除 + "{{ deleteTarget.realname }}"用户为他人添加,请确认是否删除 确定删除"{{ deleteTarget.realname }}"吗?删除后将不再显示 diff --git a/miniprogram/pages/home/home.ts b/miniprogram/pages/home/home.ts index 997604b..2173b18 100644 --- a/miniprogram/pages/home/home.ts +++ b/miniprogram/pages/home/home.ts @@ -151,7 +151,7 @@ Page({ this._otaChecked = true lefuService.checkAndUpgrade() .then(() => { - wx.showLoading({ title: '固件升级中...', mask: true }) + wx.showLoading({ title: '加载中...', mask: true }) setTimeout(() => { wx.hideLoading() // 升级完成后设备重启,旧连接与订阅失效,重新扫描连接 diff --git a/miniprogram/pages/supplementPersonal/supplementPersonal.ts b/miniprogram/pages/supplementPersonal/supplementPersonal.ts index 8eecec8..810de53 100644 --- a/miniprogram/pages/supplementPersonal/supplementPersonal.ts +++ b/miniprogram/pages/supplementPersonal/supplementPersonal.ts @@ -253,10 +253,6 @@ Page({ wx.showToast({ title: '请填写身高', icon: 'none' }) return } - if (!weight || isNaN(weightNum) || weightNum <= 0) { - wx.showToast({ title: '请填写体重', icon: 'none' }) - return - } const parsed = this.parseIdCard(idCard) diff --git a/miniprogram/pages/supplementPersonal/supplementPersonal.wxml b/miniprogram/pages/supplementPersonal/supplementPersonal.wxml index 5f90061..aa2ff4c 100644 --- a/miniprogram/pages/supplementPersonal/supplementPersonal.wxml +++ b/miniprogram/pages/supplementPersonal/supplementPersonal.wxml @@ -105,7 +105,6 @@ - * 体重