[AI Generated]: feat(*): 完善成员下发进度提示、头像取首字、图片资源分目录及选人回填逻辑优化
This commit is contained in:
@@ -160,9 +160,12 @@
|
||||
height: 90rpx;
|
||||
border-radius: 20rpx;
|
||||
margin-right: 24rpx;
|
||||
box-sizing: border-box;
|
||||
border: 3rpx solid #50A6FF;
|
||||
background: var(--avatar-bg);
|
||||
background-color: #1385FA;
|
||||
color: #ffffff;
|
||||
font-size: 36rpx;
|
||||
font-weight: bold;
|
||||
line-height: 90rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.member-info {
|
||||
|
||||
@@ -54,6 +54,8 @@ interface MemberDisplay {
|
||||
sex: number
|
||||
/** 周岁数值,供 lefu 层使用 */
|
||||
age: number
|
||||
/** 身份证号,下发设备时作为用户唯一标识 */
|
||||
idCard: string
|
||||
}
|
||||
|
||||
/** 设备卡展示模型 */
|
||||
@@ -82,7 +84,7 @@ const calcAge = (birthday: string): number => {
|
||||
}
|
||||
|
||||
const toDeviceMember = (m: MemberDisplay): DeviceMember => ({
|
||||
id: m.id,
|
||||
id: m.idCard,
|
||||
name: m.realname,
|
||||
gender: m.sex === 1 ? 1 : 0,
|
||||
age: m.age,
|
||||
@@ -92,8 +94,11 @@ const toDeviceMember = (m: MemberDisplay): DeviceMember => ({
|
||||
|
||||
const syncToDevice = (members: MemberDisplay[]): void => {
|
||||
const deviceMembers = members.map(toDeviceMember)
|
||||
wx.showLoading({ title: '正在同步成员...', mask: true })
|
||||
lefuService.syncMembersToDevice(deviceMembers)
|
||||
const total = deviceMembers.length
|
||||
wx.showLoading({ title: `正在下发第1/${total}个用户...`, mask: true })
|
||||
lefuService.syncMembersToDevice(deviceMembers, (current, t) => {
|
||||
wx.showLoading({ title: `正在下发第${current}/${t}个用户...`, mask: true })
|
||||
})
|
||||
.then(() => {
|
||||
wx.hideLoading()
|
||||
wx.showToast({ title: '成员同步成功', icon: 'success' })
|
||||
@@ -183,6 +188,7 @@ Page({
|
||||
avatar: item.avatar,
|
||||
sex: item.sex,
|
||||
age,
|
||||
idCard: item.idCard ?? '',
|
||||
}
|
||||
})
|
||||
this.setData({
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
<scroll-view scroll-y class="member-card-list">
|
||||
<block wx:for="{{ memberList }}" wx:key="id">
|
||||
<view class="member-item">
|
||||
<!-- 头像色块 -->
|
||||
<view class="member-avatar" style="--avatar-bg: {{ item.avatar }};"></view>
|
||||
<!-- 头像:取名字第一个字 -->
|
||||
<view class="member-avatar">{{ item.realname[0] }}</view>
|
||||
|
||||
<!-- 信息列 -->
|
||||
<view class="member-info">
|
||||
|
||||
Reference in New Issue
Block a user