[AI Generated]: feat(*): 完善数据页切换成员、首页接口对接及我的页缓存信息展示
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 ?? ''
|
||||
get<AddMemberApiItem[]>('weighingScale/v3/select/addMembers/user', {
|
||||
userId: userInfo?.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 })
|
||||
})
|
||||
const userId = userInfo?.userId ?? ''
|
||||
|
||||
wx.showLoading({ title: '加载中...', mask: true })
|
||||
|
||||
if (this.properties.source === 'history') {
|
||||
get<HistoryApiItem[]>('weighingScale/v3/select/history/user', { userId }, { loading: false })
|
||||
.then((res: any) => {
|
||||
const members: ExistingMember[] = (res.result ?? []).map((item: HistoryApiItem) => ({
|
||||
id: item.userId,
|
||||
name: item.realname,
|
||||
gender: item.sex === 1 ? '男' : '女',
|
||||
age: this._calcAge(item.birthday),
|
||||
height: item.height,
|
||||
weight: 0,
|
||||
idCard: '',
|
||||
avatar: item.avatar ?? '',
|
||||
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()
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
/** 点击遮罩关闭 */
|
||||
|
||||
@@ -21,33 +21,43 @@
|
||||
<view class="drawer-divider"></view>
|
||||
|
||||
<!-- 成员列表 -->
|
||||
<scroll-view class="drawer-list" scroll-y>
|
||||
<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>
|
||||
<block wx:else>
|
||||
<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>
|
||||
<block wx:if="{{ members.length }}">
|
||||
<scroll-view class="drawer-list" scroll-y>
|
||||
<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>
|
||||
<block wx:else>
|
||||
<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">
|
||||
<text class="member-name">{{ item.name }}</text>
|
||||
<text class="member-sub">{{ item.gender }}·{{ item.age }}岁</text>
|
||||
<!-- 姓名 + 性别·年龄 -->
|
||||
<view class="member-info">
|
||||
<text class="member-name">{{ item.name }}</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>
|
||||
</view>
|
||||
|
||||
<!-- 水平分隔线 -->
|
||||
<view class="member-separator"></view>
|
||||
</block>
|
||||
</scroll-view>
|
||||
<!-- 无成员:占位 -->
|
||||
<block wx:else>
|
||||
<view class="drawer-empty">
|
||||
<image class="drawer-empty-icon" src="/images/home/noData.png" mode="aspectFit"/>
|
||||
<text class="drawer-empty-text">暂无可选成员</text>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</block>
|
||||
|
||||
Reference in New Issue
Block a user