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

style(data): 选择成员抽屉对齐设计稿样式并填充静态成员数据

Browse Source 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
17792275749
2026-08-19 09:13:37 +08:00
co-authored by Claude Opus 4.7
parent 7105363e13
commit cd11d711d5
5 changed files with 211 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniprogram/app.json
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"pages": [ "pages": [
"pages/connectedDevice/connectedDevice", "pages/data/data",
"pages/login/login", "pages/login/login",
"pages/supplementPersonal/supplementPersonal", "pages/supplementPersonal/supplementPersonal",
"pages/connectedDevice/connectedDevice",
"pages/connectedWifi/connectedWifi", "pages/connectedWifi/connectedWifi",
"pages/home/home", "pages/home/home",
"pages/equipment/equipment", "pages/equipment/equipment",
"pages/data/data",
"pages/my/my" "pages/my/my"
], ],
"usingComponents": { "usingComponents": {
miniprogram/components/selectMemberDrawer/selectMemberDrawer.less
+117 -154
View File
@@ -21,7 +21,6 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 100%; width: 100%;
/* 最大高度约 75% 屏幕 */
height: 85vh; height: 85vh;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 24rpx 24rpx 0 0; border-radius: 24rpx 24rpx 0 0;
@@ -36,36 +35,40 @@
} }
} }
/* 标题栏 */ /* 标题栏（标题居中，关闭按钮绝对定位右侧） */
.drawer-header { .drawer-header {
position: relative;
width: 100%; width: 100%;
height: 32rpx; height: 124rpx;
padding: 0 30rpx;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: center;
.drawer-title { .drawer-title {
color: #252535; color: #252535;
height: 32rpx; font-size: 36rpx;
font-size: 32rpx; font-weight: bolder;
font-weight: 700; line-height: 36rpx;
line-height: 32rpx;
} }
/* 关闭按钮 */ /* 关闭按钮：圆形浅灰底 + 灰色 × */
.drawer-close { .drawer-close {
width: 32rpx; position: absolute;
height: 32rpx; right: 32rpx;
top: 50%;
transform: translateY(-50%);
width: 48rpx;
height: 48rpx;
border-radius: 50%;
background-color: #F1F5F9;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
.drawer-close-icon { .drawer-close-icon {
width: 28rpx; width: 26rpx;
height: 28rpx; height: 26rpx;
position: relative; position: relative;
&::before, &::before,
@@ -76,7 +79,7 @@
left: 50%; left: 50%;
width: 100%; width: 100%;
height: 3rpx; height: 3rpx;
background-color: #252535; background-color: #77849E;
border-radius: 2rpx; border-radius: 2rpx;
} }
@@ -93,162 +96,122 @@
/* 顶部分隔线 */ /* 顶部分隔线 */
.drawer-divider { .drawer-divider {
width: 690rpx; width: 100%;
height: 2rpx; height: 2rpx;
background-color: #EAEDF1; background-color: #EAECFA;
margin: 39rpx 30rpx 0;
flex-shrink: 0; flex-shrink: 0;
} }
/* 用户滚动列表 */ .scrollViewContent {
.drawer-list {
flex: 1;
overflow: hidden;
padding-bottom: env(safe-area-inset-bottom);
}
/* 用户行 */
.member-item {
width: 100%; width: 100%;
height: 90rpx; height: 100%;
padding: 0 30rpx;
box-sizing: border-box; box-sizing: border-box;
display: flex;
flex-direction: row;
align-items: center;
margin-top: 24rpx;
/* 有图片头像 */ /* 用户行 */
.member-item {
.member-avatar { width: 100%;
width: 90rpx; padding: 24rpx 0;
height: 90rpx;
border-radius: 24rpx;
flex-shrink: 0;
&--selected {
border: 3rpx solid #50A6FF;
}
}
/* 纯色占位头像 */
.member-avatar-placeholder {
width: 90rpx;
height: 90rpx;
border-radius: 24rpx;
flex-shrink: 0;
/* 男：蓝色 */
&--male {
background-color: #C6E6FF;
}
/* 女：粉色 */
&--female {
background-color: #FFD5E3;
}
/* 选中男 */
&--selected-male {
border: 3rpx solid #50A6FF;
width: 96rpx;
height: 96rpx;
margin: -3rpx 0 0 -3rpx;
}
/* 选中女 */
&--selected-female {
border: 3rpx solid #FF8FB5;
width: 96rpx;
height: 96rpx;
margin: -3rpx 0 0 -3rpx;
}
}
/* 姓名 + 副标题 */
.member-info {
flex: 1;
height: 78rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: row;
justify-content: space-between; align-items: center;
margin-left: 23rpx; border-bottom: 2rpx solid #EAECF1;
.member-name { /* 有图片头像 */
color: #333333; .member-avatar {
font-size: 32rpx; width: 88rpx;
font-weight: 500; height: 88rpx;
line-height: 32rpx; overflow: hidden;
white-space: nowrap; margin-right: 15rpx;
border-radius: 24rpx;
&--selected {
border: 3rpx solid #50A6FF;
}
} }
.member-sub { /* 纯色占位头像 */
color: #77849E; .member-avatar-placeholder {
font-size: 26rpx; width: 88rpx;
line-height: 34rpx; height: 88rpx;
white-space: nowrap; overflow: hidden;
border-radius: 24rpx;
margin-right: 15rpx;
/* 男：蓝色 */
&--male {
background-color: #C6E6FF;
}
/* 女：粉色 */
&--female {
background-color: #FFD5E3;
}
/* 选中男 */
&--selected-male {
border: 3rpx solid #50A6FF;
width: 94rpx;
height: 94rpx;
margin: -3rpx 0 0 -3rpx;
}
/* 选中女 */
&--selected-female {
border: 3rpx solid #FF8FB5;
width: 94rpx;
height: 94rpx;
margin: -3rpx 0 0 -3rpx;
}
} }
}
.member-type { /* 姓名 + 副标题 */
height: 40rpx; .member-info {
flex-shrink: 0; flex: 1;
width: 0;
.member-type-tag { .member-name {
color: #252535;
width: 100%;
height: 32rpx;
font-size: 32rpx;
font-weight: bolder;
line-height: 32rpx;
margin-bottom: 16rpx;
}
.member-sub {
color: #808080;
width: 100%;
height: 26rpx;
font-size: 26rpx;
line-height: 26rpx;
}
}
.member-type {
height: 40rpx; height: 40rpx;
padding: 0 14rpx; flex-shrink: 0;
font-size: 22rpx;
line-height: 40rpx;
border-radius: 6rpx;
}
.member-type-tag--self { .member-type-tag {
color: #1385FA; height: 40rpx;
background-color: rgba(19, 133, 250, 0.12); padding: 0 10rpx;
} font-size: 24rpx;
line-height: 40rpx;
border-radius: 8rpx;
color: #FFFFFF;
}
.member-type-tag--employee { .member-type-tag--self {
color: #10B981; background-color: #1385FA;
background-color: rgba(16, 185, 129, 0.12); }
}
.member-type-tag--family { .member-type-tag--employee {
color: #F59E0B; background-color: #10B981;
background-color: rgba(245, 158, 11, 0.12); }
.member-type-tag--family {
background-color: #F59E0B;
}
} }
} }
} }
/* 行间水平分隔线 */
.member-separator {
width: 690rpx;
height: 2rpx;
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
+58 -7
View File
@@ -30,11 +30,6 @@ Component({
type: Boolean, type: Boolean,
value: false value: false
}, },
/** 数据来源模式：addMember=新增用户选择 / history=历史数据切换用户 */
source: {
type: String,
value: 'addMember'
},
/** 需要排除的用户 ID（history 模式下排除当前查看的用户） */ /** 需要排除的用户 ID（history 模式下排除当前查看的用户） */
excludeUserId: { excludeUserId: {
type: String, type: String,
@@ -47,8 +42,64 @@ Component({
innerShow: false, innerShow: false,
/** 控制 --visible 类，触发 CSS transition */ /** 控制 --visible 类，触发 CSS transition */
animVisible: false, animVisible: false,
/** 用户列表（组件内部拉取） */ /** 用户列表（静态假数据填充，后续接真实接口替换） */
members: [] as ExistingMember[] members: [
{
id: '1',
name: '张晓敏',
gender: '男',
age: 36,
height: 170,
weight: 89.6,
idCard: '',
relationType: 1,
selected: false
},
{
id: '2',
name: '李晓华',
gender: '女',
age: 34,
height: 162,
weight: 52,
idCard: '',
dataType: 1,
selected: false
},
{
id: '3',
name: '王建军',
gender: '男',
age: 40,
height: 175,
weight: 68,
idCard: '',
dataType: 1,
selected: false
},
{
id: '4',
name: '陈静',
gender: '女',
age: 28,
height: 158,
weight: 48,
idCard: '',
dataType: 0,
selected: false
},
{
id: '5',
name: '刘洋',
gender: '男',
age: 30,
height: 180,
weight: 72,
idCard: '',
dataType: 0,
selected: false
}
] as ExistingMember[]
}, },
observers: { observers: {
miniprogram/components/selectMemberDrawer/selectMemberDrawer.wxml
+32 -33
View File
@@ -7,7 +7,7 @@
<view class="drawer-panel {{ animVisible ? 'drawer-panel--visible' : '' }}"> <view class="drawer-panel {{ animVisible ? 'drawer-panel--visible' : '' }}">
<!-- 标题栏 --> <!-- 标题栏 -->
<view class="drawer-header"> <view class="drawer-header">
<text class="drawer-title">选择已有用户</text> <text class="drawer-title">切换用户</text>
<view class="drawer-close" bind:tap="onTapClose"> <view class="drawer-close" bind:tap="onTapClose">
<view class="drawer-close-icon"></view> <view class="drawer-close-icon"></view>
</view> </view>
@@ -18,40 +18,39 @@
<!-- 用户列表 --> <!-- 用户列表 -->
<block wx:if="{{ members.length }}"> <block wx:if="{{ members.length }}">
<scroll-view class="drawer-list" scroll-y> <scroll-view class="~scrollView" scroll-y>
<block wx:for="{{ members }}" wx:key="id"> <view class="scrollViewContent ~page-container">
<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' : '' }}" <block wx:if="{{ item.avatar }}">
src="{{ item.avatar }}" mode="aspectFill"></image> <image class="member-avatar {{ item.selected ? 'member-avatar--selected' : '' }}"
</block> 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 && item.gender === '男' ? '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> <view class="member-name">{{ item.name }}</view>
<text class="member-sub">{{ item.gender }}·{{ item.age }}岁 丨 {{ item.height }}cm</text> <view class="member-sub">{{ item.gender }}·{{ item.age }}岁 丨 {{ item.height }}cm</view>
</view>
<view class="member-type">
<block wx:if="{{ item.relationType == 1 }}">
<view class="member-type-tag member-type-tag--self">本人</view>
</block>
<block wx:elif="{{ item.dataType === 0 }}">
<view class="member-type-tag member-type-tag--employee">员工</view>
</block>
<block wx:elif="{{ item.dataType === 1 }}">
<view class="member-type-tag member-type-tag--family">家庭用户</view>
</block>
</view>
</view> </view>
</block>
<view class="member-type"> </view>
<block wx:if="{{ item.relationType == 1 }}">
<view class="member-type-tag member-type-tag--self">本人</view>
</block>
<block wx:elif="{{ item.dataType === 0 }}">
<view class="member-type-tag member-type-tag--employee">员工</view>
</block>
<block wx:elif="{{ item.dataType === 1 }}">
<view class="member-type-tag member-type-tag--family">家庭用户</view>
</block>
</view>
</view>
<!-- 水平分隔线 -->
<view class="member-separator"></view>
</block>
</scroll-view> </scroll-view>
</block> </block>
miniprogram/pages/data/data.wxml
-1
View File
@@ -85,7 +85,6 @@
<select-member-drawer <select-member-drawer
show="{{ showSelectDrawer }}" show="{{ showSelectDrawer }}"
source="history"
exclude-user-id="{{ userInfo.userId }}" exclude-user-id="{{ userInfo.userId }}"
bind:select="onSelectMember" bind:select="onSelectMember"
bind:close="onCloseDrawer" bind:close="onCloseDrawer"