yuchunlei/bodyWeight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 详细报告接入 v3 测量历史接口，设备列表接入设备接口

Browse Source 
- 详细报告按 scaleType 区分 4/8 电极渲染，节段卡片 8 电极专属
- 设备列表改为接口驱动并新增空态
- 登录后统一跳首页，请求层兼容 code 0 返回风格

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
17792275749
2026-08-20 17:20:07 +08:00
co-authored by Claude Opus 4.7
parent fce9701254
commit d6e59df4e9
11 changed files with 581 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniprogram/pages/equipment/equipment.ts
+66 -21
View File
@@ -1,29 +1,74 @@
// pages/equipment/equipment.ts
import { get } from '../../utils/request/index'
/** 体重设备（对应 /weighingScale/list/device 返回的 result 元素） */
interface ScaleDevice {
/** 设备ID */
id: string
/** 设备名称 */
equipmentName: string
/** 设备SN */
equipmentCode: string
/** 状态 */
status: number
canteenId: string | null
/** MAC 地址 */
macAddress: string
/** WiFi 名称 */
wifiName: string
isSync: number
/** 成员人数 */
subUserNum: number
}
/** 获取体重设备列表 */
const getDeviceList = () =>
get<ScaleDevice[]>('weighingScale/list/device')
/** 展示用设备项 */
interface DeviceItem {
id: string
name: string
status: string
connected: boolean
model: string
serial: string
subUserNum: number
}
Page({
data: {
devices: [
{
id: 1,
name: '家庭蓝牙体脂秤 S1',
status: '已连接',
connected: true,
model: 'BS-A100',
serial: 'BL2024A00158',
},
{
id: 2,
name: '家庭蓝牙体脂秤 S1',
status: '未连接',
connected: false,
model: 'BW-B200',
serial: 'BL2024B00321',
}
],
loadingShow: true,
devices: [] as DeviceItem[],
loadingShow: false,
loadingTitle: '正在连接设备',
loadingContent: '请确保设备处于开启状态\n请勿离开...'
},
onLoad() {
this.loadDevices()
},
/** 拉取体重设备列表 */
async loadDevices() {
try {
const res = await getDeviceList()
this.setData({
devices: res.result.map(item => ({
id: item.id,
name: item.equipmentName,
// status 具体枚举待确认，先按 1 = 已连接处理
status: item.status === 1 ? '已连接' : '未连接',
connected: item.status === 1,
// 接口无独立「型号」字段，先用设备名称占位
model: item.equipmentName,
serial: item.equipmentCode,
subUserNum: item.subUserNum,
})),
})
} catch {
// 请求失败已由 request 层统一 toast
}
},
/** 取消配对：使用小程序自带 showModal */
onTapUnpair() {
wx.showModal({
@@ -63,7 +108,7 @@ Page({
},
onTapAdd() {
// 添加设备（待接入）
wx.navigateTo({ url: '/pages/connectedDevice/connectedDevice' })
},
/** 关闭运维模式 */
miniprogram/pages/equipment/equipment.wxml
+50 -44
View File
@@ -1,4 +1,4 @@
<view class="equipment">
<view class="equipment">
<!-- 运维模式提示行 -->
<view class="ops-bar">
<view class="ops-mode">当前为：运维模式</view>
@@ -7,14 +7,14 @@
<!-- 顶部卡片（渐变背景 + 设备图片占位） -->
<view class="top-banner">
<image src="/images/equipment/bg.png" />
<image src="/images/equipment/bg.png"/>
</view>
<!-- 已配对设备行 -->
<view class="section-bar">
<view class="section-left">
<view class="bt-icon">
<image src="/images/equipment/bluetooth.png" />
<image src="/images/equipment/bluetooth.png"/>
</view>
<view class="section-title">已配对设备</view>
</view>
@@ -22,65 +22,71 @@
</view>
<!-- 设备列表 -->
<block wx:for="{{ devices }}" wx:key="id">
<view class="device-card">
<view class="device-top">
<view class="device-icon"></view>
<view class="device-info">
<view class="device-info_">
<view class="device-name">{{ item.name }}</view>
<view class="device-unpair" bind:tap="onTapUnpair">取消配对</view>
</view>
<view class="device-status">
<view class="device-status--connected">
<view class="status-dot"></view>
<view class="status-text">{{ item.status }}</view>
<block wx:if="{{ devices && devices.length }}">
<block wx:for="{{ devices }}" wx:key="id">
<view class="device-card">
<view class="device-top">
<view class="device-icon"></view>
<view class="device-info">
<view class="device-info_">
<view class="device-name">{{ item.name }}</view>
<view class="device-unpair" bind:tap="onTapUnpair">取消配对</view>
</view>
<view class="device-status">
<view class="device-status--connected">
<view class="status-dot"></view>
<view class="status-text">{{ item.status }}</view>
</view>
</view>
</view>
</view>
</view>
<view class="device-meta">
<view class="meta-row">
<view class="meta-label">型号</view>
<view class="meta-value">{{ item.model }}</view>
<view class="device-meta">
<view class="meta-row">
<view class="meta-label">型号</view>
<view class="meta-value">{{ item.model }}</view>
</view>
<view class="meta-row">
<view class="meta-label">设备编号</view>
<view class="meta-value">{{ item.serial }}</view>
</view>
</view>
<view class="meta-row">
<view class="meta-label">设备编号</view>
<view class="meta-value">{{ item.serial }}</view>
</view>
</view>
<view class="device-actions">
<view class="device-action-btn">
<view>
<image src="/images/equipment/wifi.png" />
<view class="device-actions">
<view class="device-action-btn">
<view>
<image src="/images/equipment/wifi.png"/>
</view>
<view>设备WIFI</view>
</view>
<view>设备WIFI</view>
</view>
<view class="device-action-btn" bind:tap="onTapUser">
<view>
<image src="/images/equipment/users.png" />
<view class="device-action-btn" bind:tap="onTapUser">
<view>
<image src="/images/equipment/users.png"/>
</view>
<view>用户({{ item.subUserNum }})</view>
</view>
<view>用户(4)</view>
</view>
<view class="device-action-btn">
<view>
<image src="/images/equipment/reload.png" />
<view class="device-action-btn">
<view>
<image src="/images/equipment/reload.png"/>
</view>
<view>数据补传</view>
</view>
<view>数据补传</view>
</view>
</view>
</view>
</block>
</block>
<block wx:else>
<empty-data containerStyle="margin: 100rpx 0 200rpx;" />
</block>
<!-- 添加设备按钮 -->
<view class="add-btn" bind:tap="onTapAdd">
<view class="add-icon">
<image src="/images/addBtn.png" />
<image src="/images/addBtn.png"/>
</view>
<view class="add-text">添加设备</view>
</view>
<equipment-dialog show="{{ loadingShow }}" title="{{ loadingTitle }}" content="{{ loadingContent }}" bind:close="onCloseLoading" />
<equipment-dialog show="{{ loadingShow }}" title="{{ loadingTitle }}" content="{{ loadingContent }}"
bind:close="onCloseLoading"/>
</view>