[AI Generated]: feat(*): 完善数据页切换成员、首页接口对接及我的页缓存信息展示

miniprogram/components/selectMemberDrawer/selectMemberDrawer.less

@@ -226,3 +226,23 @@
   background-color: #EAEDF1;
   margin: 24rpx 30rpx 0;
 }
+
+/* 空态占位 */
+.drawer-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-top: 80rpx;
+
+  .drawer-empty-icon {
+    width: 193rpx;
+    height: 138rpx;
+    margin-bottom: 30rpx;
+  }
+
+  .drawer-empty-text {
+    color: #808080;
+    font-size: 28rpx;
+    line-height: 28rpx;
+  }
+}

miniprogram/components/selectMemberDrawer/selectMemberDrawer.ts

@@ -13,6 +13,17 @@ interface AddMemberApiItem {
   avatar: string | null
 }
 
+/** GET /weighingScale/v3/select/history/user 返回的单条结构 */
+interface HistoryApiItem {
+  userId: string
+  realname: string
+  sex: number
+  height: number
+  birthday: string
+  avatar: string | null
+  relationType: number | string | null
+}
+
 /** 抽屉内部成员项（含回填所需全量字段） */
 interface ExistingMember {
   id: string
@@ -24,6 +35,11 @@ interface ExistingMember {
   idCard: string
   avatar?: string
   selected?: boolean
+  /** history 模式额外携带，供页面构建 userInfo */
+  userId?: string
+  sex?: number
+  birthday?: string
+  relationType?: number | string | null
 }
 
 /**
@@ -37,6 +53,11 @@ Component({
     show: {
       type: Boolean,
       value: false
+    },
+    /** 数据来源模式：addMember=新增成员选择 / history=历史数据切换成员 */
+    source: {
+      type: String,
+      value: 'addMember'
     }
   },
 
@@ -82,27 +103,55 @@ Component({
       return Math.max(0, age)
     },
 
-    /** 调接口获取可选成员列表 */
+    /** 调接口获取可选成员列表，根据 source 调不同接口 */
     _fetchMembers() {
       const userInfo = wx.getStorageSync('userInfo') as { userId?: string } | null
-      const sn = lefuService.deviceInfo?.serialNumber ?? ''
+      const userId = userInfo?.userId ?? ''
-      get<AddMemberApiItem[]>('weighingScale/v3/select/addMembers/user', {
+
-        userId: userInfo?.userId ?? '',
+      wx.showLoading({ title: '加载中...', mask: true })
-        sn,
+
-      }, { loading: false })
+      if (this.properties.source === 'history') {
-        .then((res: any) => {
+        get<HistoryApiItem[]>('weighingScale/v3/select/history/user', { userId }, { loading: false })
-          const members: ExistingMember[] = (res.result ?? []).map((item: AddMemberApiItem) => ({
+          .then((res: any) => {
-            id: item.id,
+            const members: ExistingMember[] = (res.result ?? []).map((item: HistoryApiItem) => ({
-            name: item.realname,
+              id: item.userId,
-            gender: item.sex_dictText,
+              name: item.realname,
-            age: this._calcAge(item.birthday),
+              gender: item.sex === 1 ? '男' : '女',
-            height: item.height,
+              age: this._calcAge(item.birthday),
-            weight: item.weight,
+              height: item.height,
-            idCard: item.idCard ?? '',
+              weight: 0,
-            avatar: item.avatar ?? '',
+              idCard: '',
-          }))
+              avatar: item.avatar ?? '',
-          this.setData({ members })
+              userId: item.userId,
-        })
+              sex: item.sex,
+              birthday: item.birthday,
+              relationType: item.relationType,
+            }))
+            this.setData({ members })
+          })
+          .finally(() => {
+            wx.hideLoading()
+          })
+      } else {
+        const sn = lefuService.deviceInfo?.serialNumber ?? ''
+        get<AddMemberApiItem[]>('weighingScale/v3/select/addMembers/user', { userId, sn }, { loading: false })
+          .then((res: any) => {
+            const members: ExistingMember[] = (res.result ?? []).map((item: AddMemberApiItem) => ({
+              id: item.id,
+              name: item.realname,
+              gender: item.sex_dictText,
+              age: this._calcAge(item.birthday),
+              height: item.height,
+              weight: item.weight,
+              idCard: item.idCard ?? '',
+              avatar: item.avatar ?? '',
+            }))
+            this.setData({ members })
+          })
+          .finally(() => {
+            wx.hideLoading()
+          })
+      }
     },
 
     /** 点击遮罩关闭 */

miniprogram/components/selectMemberDrawer/selectMemberDrawer.wxml

@@ -21,33 +21,43 @@
     <view class="drawer-divider"></view>
 
     <!-- 成员列表 -->
-    <scroll-view class="drawer-list" scroll-y>
+    <block wx:if="{{ members.length }}">
-      <block wx:for="{{ members }}" wx:key="id">
+      <scroll-view class="drawer-list" scroll-y>
-        <view class="member-item" bind:tap="onTapMember" data-member="{{ item }}">
+        <block wx:for="{{ members }}" wx:key="id">
-          <!-- 头像 -->
+          <view class="member-item" bind:tap="onTapMember" data-member="{{ item }}">
-          <block wx:if="{{ item.avatar }}">
+            <!-- 头像 -->
-            <image class="member-avatar {{ item.selected ? 'member-avatar--selected' : '' }}" src="{{ item.avatar }}" mode="aspectFill"></image>
+            <block wx:if="{{ item.avatar }}">
-          </block>
+              <image class="member-avatar {{ item.selected ? 'member-avatar--selected' : '' }}" src="{{ item.avatar }}" mode="aspectFill"></image>
-          <block wx:else>
+            </block>
-            <view class="member-avatar-placeholder {{ item.gender === '女' ? 'member-avatar-placeholder--female' : 'member-avatar-placeholder--male' }} {{ item.selected ? 'member-avatar-placeholder--selected-male' : '' }} {{ item.selected && item.gender === '女' ? 'member-avatar-placeholder--selected-female' : '' }}"></view>
+            <block wx:else>
-          </block>
+              <view class="member-avatar-placeholder {{ item.gender === '女' ? 'member-avatar-placeholder--female' : 'member-avatar-placeholder--male' }} {{ item.selected ? 'member-avatar-placeholder--selected-male' : '' }} {{ item.selected && item.gender === '女' ? 'member-avatar-placeholder--selected-female' : '' }}"></view>
+            </block>
 
-          <!-- 姓名 + 性别·年龄 -->
+            <!-- 姓名 + 性别·年龄 -->
-          <view class="member-info">
+            <view class="member-info">
-            <text class="member-name">{{ item.name }}</text>
+              <text class="member-name">{{ item.name }}</text>
-            <text class="member-sub">{{ item.gender }}·{{ item.age }}岁</text>
+              <text class="member-sub">{{ item.gender }}·{{ item.age }}岁</text>
+            </view>
+
+            <!-- 竖向分隔线 -->
+            <view class="member-divider"></view>
+
+            <!-- 身高 -->
+            <text class="member-height">{{ item.height }}cm</text>
           </view>
 
-          <!-- 竖向分隔线 -->
+          <!-- 水平分隔线 -->
-          <view class="member-divider"></view>
+          <view class="member-separator"></view>
+        </block>
+      </scroll-view>
+    </block>
 
-          <!-- 身高 -->
+    <!-- 无成员：占位 -->
-          <text class="member-height">{{ item.height }}cm</text>
+    <block wx:else>
-        </view>
+      <view class="drawer-empty">
-
+        <image class="drawer-empty-icon" src="/images/home/noData.png" mode="aspectFit"/>
-        <!-- 水平分隔线 -->
+        <text class="drawer-empty-text">暂无可选成员</text>
-        <view class="member-separator"></view>
+      </view>
-      </block>
+    </block>
-    </scroll-view>
   </view>
 </block>

miniprogram/pages/data/data.json

@@ -1,3 +1,5 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "select-member-drawer": "/components/selectMemberDrawer/selectMemberDrawer"
+  }
 }

miniprogram/pages/data/data.ts

@@ -1,8 +1,5 @@
 import { get } from '../../utils/request/index'
 
-/** 加载状态机 */
-type LoadStatus = 'idle' | 'loading' | 'loaded'
-
 /** 接口 type 参数：0=全部 1=近7天 2=近30天 3=近3月 */
 type RangeType = 0 | 1 | 2 | 3
 
@@ -69,7 +66,6 @@ function calcAge(birthday: string): number {
 
 Page({
     data: {
-        status: 'idle' as LoadStatus,
         activeType: 1 as RangeType,
         rangeTabs: [
             { key: 1, label: '近7天' },
@@ -85,18 +81,19 @@ Page({
         pageNo: 1,
         total: 0,
         hasMore: false,
-        hasData: false,
         refresherTriggered: false,
+        showSelectDrawer: false,
     },
 
     onLoad() {
         const raw = wx.getStorageSync('userInfo') as StorageUserInfo | null
         if (!raw?.userId) return
+        const storedUserId = raw.userId
         const userInfo: PageUserInfo = {
             ...raw,
             sex_dictText: raw.sex === 1 ? '男' : raw.sex === 2 ? '女' : '',
             age: calcAge(raw.birthday),
-            isSelf: String(raw.relationType ?? '') === '1',
+            isSelf: raw.userId === storedUserId,
         }
         this.setData({ userInfo })
         this.loadData()
@@ -146,12 +143,11 @@ Page({
                     records,
                     total,
                     hasMore: records.length < total,
-                    hasData: records.length > 0,
                 })
             })
             .finally(() => {
                 wx.hideLoading()
-                this.setData({ status: 'loaded', refresherTriggered: false })
+                this.setData({ refresherTriggered: false })
             })
     },
 
@@ -213,8 +209,45 @@ Page({
         })
     },
 
-    /** 切换成员占位 */
+    /** 打开切换成员抽屉 */
     onTapSwitchMember() {
-        wx.showToast({ title: '切换成员', icon: 'none' })
+        this.setData({ showSelectDrawer: true })
+    },
+
+    /** 抽屉关闭 */
+    onCloseDrawer() {
+        this.setData({ showSelectDrawer: false })
+    },
+
+    /** 选中成员后更新 userInfo 并重新请求数据 */
+    onSelectMember(e: WechatMiniprogram.CustomEvent) {
+        const m = e.detail as {
+            userId?: string
+            id: string
+            name: string
+            gender: '男' | '女'
+            age: number
+            height: number
+            sex?: number
+            birthday?: string
+            relationType?: number | string | null
+            avatar?: string
+        }
+        const selectedUserId = m.userId ?? m.id
+        const storedUserId = (wx.getStorageSync('userInfo') as StorageUserInfo | null)?.userId ?? ''
+        const userInfo: PageUserInfo = {
+            userId: selectedUserId,
+            realname: m.name,
+            sex: m.sex ?? (m.gender === '男' ? 1 : 2),
+            height: m.height,
+            birthday: m.birthday ?? '',
+            avatar: m.avatar ?? null,
+            relationType: m.relationType ?? null,
+            sex_dictText: m.gender,
+            age: m.age,
+            isSelf: selectedUserId === storedUserId,
+        }
+        this.setData({ showSelectDrawer: false, userInfo })
+        this.loadData()
     },
 })

miniprogram/pages/data/data.wxml

@@ -69,7 +69,7 @@
 		</view>
 
 		<!-- 有数据：记录列表 -->
-		<block wx:if="{{ hasData }}">
+		<block wx:if="{{ records.length }}">
 			<view class="data-list">
 				<block wx:for="{{ records }}" wx:key="recordId">
 					<view class="list" bind:tap="onTapRecord" data-record-id="{{ item.recordId }}">
@@ -85,7 +85,7 @@
 		</block>
 
 		<!-- 无数据：占位 -->
-		<block wx:elif="{{ status === 'loaded' }}">
+		<block wx:else>
 			<view class="empty-state">
 				<view class="empty-icon">
 					<image src="/images/home/noData.png" mode="aspectFit"/>
@@ -96,3 +96,10 @@
 
 	</view>
 </scroll-view>
+
+<select-member-drawer
+	show="{{ showSelectDrawer }}"
+	source="history"
+	bind:select="onSelectMember"
+	bind:close="onCloseDrawer"
+/>

miniprogram/pages/home/home.ts

@@ -1,8 +1,4 @@
-import { mockLatestRecord } from '../../mock/home.mock'
+import { get } from '../../utils/request/index'
-import type { WeightRecord } from '../../mock/home.mock'
-
-/** 加载状态机 */
-type LoadStatus = 'idle' | 'loading' | 'loaded'
 
 /** 设备信息 */
 interface DeviceInfo {
@@ -10,9 +6,57 @@ interface DeviceInfo {
     connected: boolean
 }
 
+/** GET /weighingScale/v3/getMeasureHistory result 结构 */
+interface MeasureHistoryVO {
+    recordId: string
+    height: number
+    weight: number
+    weightChange: number
+    bmi: number
+    bmiType: string
+    standardWeight: number
+    fatRate: number
+    fatValue: number
+    basalMetabolism: number
+    examTime: string
+    sn: string
+    userInfo: {
+        realname: string
+        sex: number
+        [key: string]: any
+    } | null
+}
+
+/** 页面渲染用测量记录 */
+interface WeightRecord {
+    weight: number
+    weightDecimal: string
+    date: string
+    diff: number
+    height: number
+    bmi: number
+    bmiLabel: string
+    stdWeight: number
+    bodyFat: number
+    bodyFatMass: number
+    bmr: number
+}
+
+/** 缓存中的用户信息 */
+interface StorageUserInfo {
+    userId: string
+    [key: string]: any
+}
+
+/** 将体重数字拆成整数 + 小数字符串 */
+function splitWeight(weight: number): { int: number; decimal: string } {
+    const str = weight.toFixed(2)
+    const [intPart, decPart] = str.split('.')
+    return { int: Number(intPart), decimal: `.${decPart}` }
+}
+
 Page({
     data: {
-        status: 'idle' as LoadStatus,
         hasData: false,
         device: {
             name: '智能体重秤',
@@ -25,13 +69,6 @@ Page({
         this.loadData()
     },
 
-    onReady() {},
-    onShow() {},
-    onHide() {},
-    onUnload() {},
-    onPullDownRefresh() {},
-    onReachBottom() {},
-
     onShareAppMessage(): WechatMiniprogram.Page.ICustomShareContent {
         return {
             title: '智能蓝牙秤',
@@ -40,17 +77,40 @@ Page({
         }
     },
 
-    /** 加载首页数据（当前使用 mock，后续替换为真实接口） */
+    /** 拉取最新一次测量记录 */
     loadData() {
-        this.setData({ status: 'loading' })
+        const raw = wx.getStorageSync('userInfo') as StorageUserInfo | null
-        // 模拟异步加载
+        if (!raw?.userId) return
-        setTimeout(() => {
+
-            this.setData({
+        wx.showLoading({ title: '加载中...', mask: true })
-                status: 'loaded',
+        get<MeasureHistoryVO>('weighingScale/v3/getMeasureHistory', {
-                hasData: true,
+            userId: raw.userId,
-                record: mockLatestRecord,
+        }, { loading: false })
+            .then((res: any) => {
+                const d: MeasureHistoryVO = res.result
+                if (!d) {
+                    this.setData({ hasData: false, record: null })
+                    return
+                }
+                const { int, decimal } = splitWeight(d.weight ?? 0)
+                const record: WeightRecord = {
+                    weight: int,
+                    weightDecimal: decimal,
+                    date: d.examTime ?? '',
+                    diff: d.weightChange ?? 0,
+                    height: d.height ?? 0,
+                    bmi: d.bmi ?? 0,
+                    bmiLabel: d.bmiType ?? '',
+                    stdWeight: d.standardWeight ?? 0,
+                    bodyFat: d.fatRate ?? 0,
+                    bodyFatMass: d.fatValue ?? 0,
+                    bmr: d.basalMetabolism ?? 0,
+                }
+                this.setData({ hasData: true, record })
+            })
+            .finally(() => {
+                wx.hideLoading()
             })
-        }, 300)
     },
 
     /** 跳转历史数据页 */

miniprogram/pages/home/home.wxml

@@ -139,7 +139,7 @@
         <block wx:else>
             <view class="empty-state">
                 <view class="empty-icon">
-					<image src="/images/home/noData.png" mode=""/>
+					<image src="/images/home/noData.png" mode="aspectFit"/>
 				</view>
                 <view class="empty-text">暂无称重数据</view>
             </view>

miniprogram/pages/my/my.less

@@ -20,10 +20,16 @@
 		.user-avatar {
 			width: 120rpx;
 			height: 120rpx;
-			border-radius: 16rpx;
 			margin-right: 30rpx;
+			border-radius: 24rpx;
+			color: #FFFFFF;
+			font-size: 48rpx;
+			font-weight: bold;
+			line-height: 110rpx;
+			text-align: center;
 			box-sizing: border-box;
 			border: 5rpx solid #ffffff;
+			background-color: #1385FA;
 		}
 
 		.user-info {

miniprogram/pages/my/my.ts

@@ -1,7 +1,48 @@
-Page({
+/** 缓存中的用户信息 */
-    data: {},
+interface StorageUserInfo {
+    userId: string
+    realname: string
+    sex: number
+    height: number
+    birthday: string
+    [key: string]: any
+}
 
-    onLoad() {},
+/** 页面展示用用户信息 */
+interface PageUserInfo {
+    realname: string
+    sex_dictText: '男' | '女' | ''
+    age: number
+    height: number
+}
+
+/** 从生日字符串（YYYY-MM-DD）计算周岁 */
+function calcAge(birthday: string): number {
+    if (!birthday) return 0
+    const [year, month, day] = birthday.split('-').map(Number)
+    if (!year || !month || !day) return 0
+    const now = new Date()
+    let age = now.getFullYear() - year
+    if (now.getMonth() + 1 < month || (now.getMonth() + 1 === month && now.getDate() < day)) age -= 1
+    return Math.max(0, age)
+}
+
+Page({
+    data: {
+        userInfo: null as PageUserInfo | null,
+    },
+
+    onLoad() {
+        const raw = wx.getStorageSync('userInfo') as StorageUserInfo | null
+        if (!raw?.userId) return
+        const userInfo: PageUserInfo = {
+            realname: raw.realname ?? '',
+            sex_dictText: raw.sex === 1 ? '男' : raw.sex === 2 ? '女' : '',
+            age: calcAge(raw.birthday),
+            height: raw.height ?? 0,
+        }
+        this.setData({ userInfo })
+    },
 
     onShareAppMessage(): WechatMiniprogram.Page.ICustomShareContent {
         return {

miniprogram/pages/my/my.wxml

@@ -4,15 +4,15 @@
 	</view>
 
 	<view class="user">
-		<view class="user-avatar"></view>
+		<view class="user-avatar">{{ userInfo.realname[0] }}</view>
 		<view class="user-info">
-			<view class="user-name">陈知夏</view>
+			<view class="user-name">{{ userInfo.realname }}</view>
 			<view class="user-meta">
-				<text class="meta-text">男</text>
+				<text class="meta-text">{{ userInfo.sex_dictText }}</text>
 				<text class="meta-divider">·</text>
-				<text class="meta-text">56岁</text>
+				<text class="meta-text">{{ userInfo.age }}岁</text>
 				<text class="meta-divider">|</text>
-				<text class="meta-text">182cm</text>
+				<text class="meta-text">{{ userInfo.height }}cm</text>
 			</view>
 		</view>
 	</view>