diff --git a/miniprogram/pages/equipment/equipment.ts b/miniprogram/pages/equipment/equipment.ts index bc61699..086f6ed 100644 --- a/miniprogram/pages/equipment/equipment.ts +++ b/miniprogram/pages/equipment/equipment.ts @@ -294,43 +294,39 @@ Page({ const mac = formatMac(sn) const bat = deviceInfo?.devicePower != null ? String(deviceInfo.devicePower / 100) : '' - let remain = dataList.length - dataList.forEach((data) => { - const payload: Record = { - sn, - type, - mac, - bat, - userid: data.memberId || mainUserId, - dateStr: data.dateStr ?? '', - weight: (data.weight ?? 0) / 100, - heartRate: data.heartRate ?? 0, - impedance: data.impedance ?? 0, - memberId: data.memberId ?? '', - isEnd: data.isEnd ?? false, - z20KhzLeftArmEnCode: data.z20KhzLeftArmEnCode ?? 0, - z20KhzRightArmEnCode: data.z20KhzRightArmEnCode ?? 0, - z20KhzLeftLegEnCode: data.z20KhzLeftLegEnCode ?? 0, - z20KhzRightLegEnCode: data.z20KhzRightLegEnCode ?? 0, - z20KhzTrunkEnCode: data.z20KhzTrunkEnCode ?? 0, - z100KhzLeftArmEnCode: data.z100KhzLeftArmEnCode ?? 0, - z100KhzRightArmEnCode: data.z100KhzRightArmEnCode ?? 0, - z100KhzLeftLegEnCode: data.z100KhzLeftLegEnCode ?? 0, - z100KhzRightLegEnCode: data.z100KhzRightLegEnCode ?? 0, - z100KhzTrunkEnCode: data.z100KhzTrunkEnCode ?? 0, - } - uploadHistoryData(payload) - .then(() => { - console.log('[数据补传] 上传成功:', payload) - }) - .catch(() => { - console.error('[数据补传] 上传失败:', payload) - }) - .finally(() => { - remain-- - if (remain === 0) done?.() - }) - }) + const list = dataList.map((data) => ({ + sn, + type, + mac, + bat, + userid: data.memberId || mainUserId, + dateStr: data.dateStr ?? '', + weight: (data.weight ?? 0) / 100, + heartRate: data.heartRate ?? 0, + impedance: data.impedance ?? 0, + // memberId: data.memberId ?? '', + isEnd: data.isEnd ?? false, + z20KhzLeftArmEnCode: data.z20KhzLeftArmEnCode ?? 0, + z20KhzRightArmEnCode: data.z20KhzRightArmEnCode ?? 0, + z20KhzLeftLegEnCode: data.z20KhzLeftLegEnCode ?? 0, + z20KhzRightLegEnCode: data.z20KhzRightLegEnCode ?? 0, + z20KhzTrunkEnCode: data.z20KhzTrunkEnCode ?? 0, + z100KhzLeftArmEnCode: data.z100KhzLeftArmEnCode ?? 0, + z100KhzRightArmEnCode: data.z100KhzRightArmEnCode ?? 0, + z100KhzLeftLegEnCode: data.z100KhzLeftLegEnCode ?? 0, + z100KhzRightLegEnCode: data.z100KhzRightLegEnCode ?? 0, + z100KhzTrunkEnCode: data.z100KhzTrunkEnCode ?? 0, + })) + + uploadHistoryData({ list }) + .then(() => { + console.log('[数据补传] 上传成功') + done?.() + }) + .catch(() => { + console.error('[数据补传] 上传失败') + done?.() + }) }, onTapAdd() { diff --git a/miniprogram/pages/helpCenter/helpCenter.wxml b/miniprogram/pages/helpCenter/helpCenter.wxml index 7f5de3a..359077e 100644 --- a/miniprogram/pages/helpCenter/helpCenter.wxml +++ b/miniprogram/pages/helpCenter/helpCenter.wxml @@ -13,14 +13,19 @@ - - - - - {{ item.title }} - - - - + + + + + + {{ item.title }} + + + + + + + + diff --git a/miniprogram/pages/my/my.less b/miniprogram/pages/my/my.less index 3354f80..aeaed14 100644 --- a/miniprogram/pages/my/my.less +++ b/miniprogram/pages/my/my.less @@ -113,6 +113,7 @@ width: 100%; height: 110rpx; font-size: 32rpx; + font-weight: bolder; text-align: center; line-height: 110rpx; border-radius: 24rpx; diff --git a/miniprogram/pages/userManagement/userManagement.ts b/miniprogram/pages/userManagement/userManagement.ts index 080267f..97858b5 100644 --- a/miniprogram/pages/userManagement/userManagement.ts +++ b/miniprogram/pages/userManagement/userManagement.ts @@ -67,7 +67,7 @@ const markSynced = (data: { sn: string; list: string[] }) => /** 删除设备成员 */ const deleteMember = (id: string) => - del('weighingScale/v2/del/user', { id }, { loading: false }) + del('weighingScale/v6/del/user', { id }, { loading: false }) /** equipment 页传入的目标设备 */ let targetDevice: { sn: string; deviceId: string; name: string; connected: boolean; connectDeviceInfo: string } | null = null