diff --git a/miniprogram/images/data/add.png b/miniprogram/images/data/add.png
new file mode 100644
index 0000000..02d9d5f
Binary files /dev/null and b/miniprogram/images/data/add.png differ
diff --git a/miniprogram/images/data/sub.png b/miniprogram/images/data/sub.png
new file mode 100644
index 0000000..1f5a0b7
Binary files /dev/null and b/miniprogram/images/data/sub.png differ
diff --git a/miniprogram/pages/data/data.less b/miniprogram/pages/data/data.less
index 1b81553..ab61ca9 100644
--- a/miniprogram/pages/data/data.less
+++ b/miniprogram/pages/data/data.less
@@ -12,7 +12,7 @@
padding: 40rpx 30rpx 30rpx;
box-sizing: border-box;
border-radius: 24rpx;
- margin-bottom: 30rpx;
+ margin-bottom: 15rpx;
background-color: #FFFFFF;
&::before {
@@ -225,13 +225,37 @@
}
}
+ .data-user-title {
+ width: 100%;
+ height: 80rpx;
+ display: flex;
+ flex-wrap: nowrap;
+ box-sizing: border-box;
+ justify-content: space-between;
+
+ > view:nth-of-type(1) {
+ color: #252535;
+ height: 80rpx;
+ font-size: 32rpx;
+ font-weight: bolder;
+ line-height: 80rpx;
+ }
+
+ > view:nth-of-type(2) {
+ color: #808080;
+ height: 80rpx;
+ font-size: 26rpx;
+ line-height: 80rpx;
+ }
+ }
+
.data-user-list {
flex: 1;
overflow: hidden;
.scrollViewContent {
width: 100%;
- padding: 24rpx 30rpx;
+ padding: 0 30rpx;
box-sizing: border-box;
/* 历史记录列表 */
@@ -240,41 +264,145 @@
.list {
width: 100%;
- margin-bottom: 30rpx;
-
- >view:first-of-type {
+ padding: 30rpx 48rpx 30rpx 30rpx;
+ border-radius: 24rpx;
+ box-sizing: border-box;
+ background-color: #FFFFFF;
+ margin-bottom: 24rpx;
+
+ .list-examTime {
color: #808080;
width: 100%;
height: 24rpx;
font-size: 24rpx;
line-height: 24rpx;
- margin-bottom: 20rpx;
+ margin-bottom: 24rpx;
}
-
- >view:last-of-type {
+
+ .list-weight {
width: 100%;
- height: 96rpx;
+ height: 48rpx;
display: flex;
- justify-content: space-between;
- padding-left: 30rpx;
- padding-right: 50rpx;
- box-sizing: border-box;
flex-wrap: nowrap;
- border-radius: 16rpx;
- background-color: #FFFFFF;
-
- >view {
- color: #808080;
- font-size: 26rpx;
- height: 96rpx;
- line-height: 96rpx;
-
+ justify-content: space-between;
+ margin-bottom: 30rpx;
+
+ > view:nth-of-type(1) {
+ color: #252535;
+ height: 48rpx;
+ font-size: 48rpx;
+ font-weight: bolder;
+ line-height: 48rpx;
+
text {
+ color: #808080;
+ font-size: 24rpx;
+ margin-left: 6rpx;
+ font-weight: normal;
+ }
+ }
+
+ > view:nth-of-type(2) {
+ height: 48rpx;
+ padding: 0 16rpx;
+ display: flex;
+ flex-wrap: nowrap;
+ align-items: center;
+ border-radius: 8rpx;
+ background-color: #EAFAF6;
+
+ > view:nth-of-type(1) {
+ width: 14rpx;
+ height: 18rpx;
+ display: flex;
+ align-items: center;
+ margin-right: 8rpx;
+ }
+
+ > view:nth-of-type(2) {
+ color: #2AC79F;
+ font-size: 26rpx;
+ height: 26rpx;
+ line-height: 26rpx;
+ }
+ }
+
+ &.arrow::after {
+ right: -24rpx;
+ }
+ }
+
+ .list-bmi {
+ width: 100%;
+ height: 26rpx;
+ display: flex;
+ flex-wrap: nowrap;
+
+ > view {
+ height: 26rpx;
+ display: flex;
+ flex-wrap: nowrap;
+ margin-right: 55rpx;
+
+ > view:nth-of-type(1) {
+ height: 26rpx;
+ width: 26rpx;
+ display: flex;
+ align-items: center;
+ margin-right: 10rpx;
+ }
+
+ > view:nth-of-type(2) {
+ color: #77849E;
+ height: 26rpx;
+ font-size: 26rpx;
+ line-height: 26rpx;
+ margin-right: 20rpx;
+ }
+
+ > view:nth-of-type(3) {
color: #252535;
- font-weight: bold;
+ height: 26rpx;
+ font-size: 26rpx;
+ font-weight: bolder;
+ line-height: 26rpx;
}
}
}
+
+ // >view:first-of-type {
+ // color: #808080;
+ // width: 100%;
+ // height: 24rpx;
+ // font-size: 24rpx;
+ // line-height: 24rpx;
+ // margin-bottom: 20rpx;
+ // }
+
+ // >view:last-of-type {
+ // width: 100%;
+ // height: 96rpx;
+ // display: flex;
+ // justify-content: space-between;
+ // padding-left: 30rpx;
+ // padding-right: 50rpx;
+ // box-sizing: border-box;
+ // flex-wrap: nowrap;
+ // border-radius: 16rpx;
+ // background-color: #FFFFFF;
+
+ // >view {
+ // color: #808080;
+ // font-size: 26rpx;
+ // height: 96rpx;
+ // line-height: 96rpx;
+
+ // text {
+ // color: #252535;
+ // font-weight: bold;
+ // }
+ // }
+ // }
}
}
diff --git a/miniprogram/pages/data/data.wxml b/miniprogram/pages/data/data.wxml
index a3943b7..df9f911 100644
--- a/miniprogram/pages/data/data.wxml
+++ b/miniprogram/pages/data/data.wxml
@@ -56,6 +56,11 @@
+
+ 记录列表
+ 共 {{total}} 条记录
+
+
@@ -65,12 +70,38 @@
- {{ item.examTime }}
+ {{ item.examTime }}
+
+ {{ item.weight }}kg
+
+
+
+
+ 0.3
+
+
+
+
+
+
+
+ BMI
+ {{ item.bmi }}
+
+
+
+
+
+ 体脂率
+ {{ item.fatRate }}%
+
+
+