fix: API升级v5、错误提示优化、体重必填移除等

- selectMemberDrawer: v3→v5 API升级
- lefu/service: 统一错误提示文案
- equipmentMember: 修复删除确认弹框文案
- home: 优化加载中提示
- supplementPersonal: 移除体重必填校验

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
17792275749
2026-06-12 15:57:43 +08:00
co-authored by Claude Opus 4.7
parent ea8f828702
commit e8d40d7dfc
6 changed files with 9 additions and 14 deletions
@@ -150,7 +150,7 @@ Component({
})
} else {
const sn = lefuService.deviceInfo?.serialNumber ?? ''
get<AddMemberApiItem[]>('weighingScale/v3/select/addMembers/user', { userId, sn }, { loading: false })
get<AddMemberApiItem[]>('weighingScale/v5/select/addMembers/user', { userId, sn }, { loading: false })
.then((res: any) => {
const members: ExistingMember[] = (res.result ?? []).map((item: AddMemberApiItem) => ({
id: item.id,
+6 -6
View File
@@ -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<void> {
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
@@ -133,7 +133,7 @@
<view class="delete-modal-title">确认删除</view>
<view class="delete-modal-content">
<block wx:if="{{ deleteTarget.relationType == 3 }}">
<text class="delete-modal-warning">"{{ deleteTarget.realname }}"用户为他人添加,请确认是否删除</text>
"<text class="delete-modal-warning">{{ deleteTarget.realname }}</text>"用户为他人添加,请确认是否删除
</block>
<block wx:else>
确定删除"{{ deleteTarget.realname }}"吗?删除后将不再显示
+1 -1
View File
@@ -151,7 +151,7 @@ Page({
this._otaChecked = true
lefuService.checkAndUpgrade()
.then(() => {
wx.showLoading({ title: '固件升级中...', mask: true })
wx.showLoading({ title: '加载中...', mask: true })
setTimeout(() => {
wx.hideLoading()
// 升级完成后设备重启,旧连接与订阅失效,重新扫描连接
@@ -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)
@@ -105,7 +105,6 @@
<!-- 体重 -->
<view class="form-row">
<view class="form-label">
<text class="label-star">*</text>
<text class="label-text">体重</text>
</view>
<view class="form-control">