diff --git a/app.less b/app.less
index c38bd33..d9a3305 100644
--- a/app.less
+++ b/app.less
@@ -5,6 +5,7 @@ page {
--td-brand-color: #005BA2; // 任何你想要的主题色
--td-bg-color: #F8F8F8;
--td-text-color: #222222;
+ --td-radius-default: 16rpx;
font-size: 28rpx;
color: #222222;
.t-cell__title-text {
@@ -53,7 +54,9 @@ page {
.t-overlay {
top: 0!important;
}
-
+ .t-button{
+ border-radius: 16rpx;
+ }
}
diff --git a/pages/clockIn/index.less b/pages/clockIn/index.less
index 041554f..230d381 100644
--- a/pages/clockIn/index.less
+++ b/pages/clockIn/index.less
@@ -1,10 +1,13 @@
+
+
.page {
background-color: rgba(248,248,248,1.000000);
position: relative;
- overflow: hidden;
display: flex;
flex-direction: column;
padding: 0 24rpx;
+ padding-bottom: 24rpx;
+ height: 100%;
}
.group_1 {
background-color: rgba(255,255,255,1.000000);
@@ -148,15 +151,15 @@
.block_1 {
background-color: rgba(255,255,255,1.000000);
border-radius: 16rpx;
- flex-direction: row;
- display: flex;
+ // display: flex;
padding: 24rpx 50rpx 24rpx 24rpx;
+ width: 100%;
+ // justify-content: space-between;
+ position: relative;
}
.image-text_1 {
- width: 298rpx;
- flex-direction: row;
display: flex;
- justify-content: space-between;
+ padding-right: 134rpx;
}
.section_4 {
border-radius: 16rpx;
@@ -164,13 +167,14 @@
width: 100rpx;
height: 100rpx;
border: 1px solid rgba(0,91,162,0.1);
- display: flex;
- flex-direction: column;
+ flex: none;
}
.text-group_1 {
- display: flex;
- flex-direction: column;
+ flex: auto;
+ // display: flex;
+ // flex-direction: column;
margin: 10rpx 0 8rpx 0;
+ padding-left: 20rpx;
}
.text_5 {
overflow-wrap: break-word;
@@ -178,10 +182,7 @@
font-size: 32rpx;
font-family: Alibaba-PuHuiTi-M;
font-weight: normal;
- text-align: right;
- white-space: nowrap;
line-height: 32rpx;
- margin-right: 86rpx;
}
.text_6 {
overflow-wrap: break-word;
@@ -200,7 +201,10 @@
height: 62rpx;
display: flex;
flex-direction: column;
- margin: 20rpx 0 18rpx 114rpx;
+ position: absolute;
+ right: 166rpx;
+ top: 50%;
+ transform: translateY(-50%);
}
.text_7 {
overflow-wrap: break-word;
@@ -211,7 +215,10 @@
text-align: right;
white-space: nowrap;
line-height: 32rpx;
- margin: 34rpx 0 0 50rpx;
+ position: absolute;
+ right: 50rpx;
+ top: 50%;
+ transform: translateY(-50%);
}
.section_5 {
width: 112rpx;
@@ -378,10 +385,14 @@
.text-wrapper_3 {
background-color: rgba(0,91,162,1.000000);
border-radius: 32rpx;
- display: flex;
- flex-direction: column;
- margin: 22rpx 0 22rpx 24rpx;
- padding: 12rpx 40rpx 12rpx 40rpx;
+
+ padding: 10rpx 32rpx 10rpx 32rpx;
+ // width: 70rpx;
+ text-align: center;
+ position: absolute;
+ right: 24rpx;
+ top: 50%;
+ transform: translateY(-50%);
}
.text_14 {
overflow-wrap: break-word;
diff --git a/pages/clockIn/index.wxml b/pages/clockIn/index.wxml
index 0c3a3aa..6a5a55d 100644
--- a/pages/clockIn/index.wxml
+++ b/pages/clockIn/index.wxml
@@ -18,8 +18,8 @@
- {{detail.name}}
- {{detail.dose}} {{detail.time}}
+ {{detail.name}}
+ {{detail.dose}} {{detail.time}}
diff --git a/pages/followUp/index.js b/pages/followUp/index.js
index 452eb16..c22c2aa 100644
--- a/pages/followUp/index.js
+++ b/pages/followUp/index.js
@@ -225,7 +225,7 @@ Page({
data.nutritional_indicator_image = data.nutritional_indicator_image.length > 0 ? data.nutritional_indicator_image.join(',') : ''
data.is_have_cyst = data.is_have_cyst ? Number(data.is_have_cyst) : 0
data.is_have_ascites = data.is_have_ascites ? Number(data.is_have_ascites) : 0
- await request('patient/follow_questionnaire', 'post',{plan_id: Number(this.planId), ...data})
+ await request('patient/follow_questionnaire', 'post',{plan_id: Number(this.planId), questionnaire_id: Number(this.planId), ...data})
wx.showToast({
title: '提交成功',
icon: 'success',
diff --git a/pages/home/index.less b/pages/home/index.less
index af71fd5..5192820 100644
--- a/pages/home/index.less
+++ b/pages/home/index.less
@@ -309,17 +309,14 @@
border-radius: 16rpx;
position: relative;
z-index: 1;
- flex-direction: row;
- display: flex;
- justify-content: flex-center;
+
padding: 24rpx 24rpx 24rpx 24rpx;
margin-left: 30rpx;
+ margin-bottom: 20rpx;
}
.image-text_5 {
- width: 298rpx;
- flex-direction: row;
+ padding-right: 145rpx;
display: flex;
- justify-content: space-between;
}
.box_10 {
border-radius: 16rpx;
@@ -327,14 +324,12 @@
width: 100rpx;
height: 100rpx;
border: 1px solid rgba(0,91,162,0.1);
- display: flex;
- flex-direction: column;
box-sizing: border-box;
margin-right:16rpx ;
+ flex: none;
}
.text-group_5 {
- display: flex;
- flex-direction: column;
+ flex: auto;
margin: 12rpx 0 12rpx 0;
}
.text_21 {
@@ -342,9 +337,7 @@
color: rgba(34,34,34,1);
font-size: 32rpx;
font-family: Alibaba-PuHuiTi-M;
- white-space: nowrap;
line-height: 32rpx;
- margin-right: 86rpx;
}
.text_22 {
overflow-wrap: break-word;
@@ -363,15 +356,22 @@
height: 62rpx;
display: flex;
flex-direction: column;
- margin: 20rpx 0 18rpx 100rpx;
+ position: absolute;
+ right: 166rpx;
+ top: 50%;
+ transform: translateY(-50%);
}
.text-wrapper_6 {
border-radius: 32rpx;
- display: flex;
- flex-direction: column;
- margin: 22rpx 0 22rpx 24rpx;
- padding: 12rpx 40rpx 12rpx 40rpx;
+
+ padding: 10rpx 32rpx 10rpx 32rpx;
+ // width: 70rpx;
+ text-align: center;
+ position: absolute;
+ right: 24rpx;
+ top: 50%;
+ transform: translateY(-50%);
.text_23 {
color:rgba(0,91,162,1.000000);
}
diff --git a/pages/home/index.wxml b/pages/home/index.wxml
index d70778d..cb86dea 100644
--- a/pages/home/index.wxml
+++ b/pages/home/index.wxml
@@ -44,8 +44,8 @@
- {{item2.name}}
- {{item2.frequency}}片，{{item2.time}}服用
+ {{item2.name}}
+ {{item2.frequency}}片，{{item2.time}}服用
diff --git a/pages/medicationRecord/index.less b/pages/medicationRecord/index.less
index 1d945ec..8610195 100644
--- a/pages/medicationRecord/index.less
+++ b/pages/medicationRecord/index.less
@@ -1,7 +1,7 @@
/* pages/clockIn/index.wxss */
.clockin{
// padding: 28rpx;
- padding-bottom: 120rpx;
+ // padding-bottom: 120rpx;
.tip{
font-size: 24rpx;
color: #FF8E00;
@@ -77,13 +77,14 @@
// 滚动容器样式
.scroll-container {
height: calc(100vh - 200rpx);
- padding-bottom: 120rpx;
+ // padding-bottom: 120rpx;
}
// 加载更多提示样式
.loading-more {
text-align: center;
padding: 30rpx 0;
+ padding-top: 0rpx;
color: #999;
font-size: 28rpx;
}
@@ -91,6 +92,7 @@
.no-more {
text-align: center;
padding: 30rpx 0;
+ padding-top: 0rpx;
color: #ccc;
font-size: 26rpx;
}
@@ -200,19 +202,17 @@
margin: 16rpx 0 0 34rpx;
}
.block_1 {
- width: 100%;
- box-sizing: border-box;
background-color: rgba(255,255,255,1.000000);
border-radius: 16rpx;
- flex-direction: row;
- display: flex;
+ // display: flex;
padding: 24rpx 50rpx 24rpx 24rpx;
+ width: 100%;
+ // justify-content: space-between;
+ position: relative;
}
.image-text_1 {
- width: 298rpx;
- flex-direction: row;
display: flex;
- justify-content: space-between;
+ padding-right: 160rpx;
}
.section_4 {
border-radius: 16rpx;
@@ -220,13 +220,14 @@
width: 100rpx;
height: 100rpx;
border: 1px solid rgba(0,91,162,0.1);
- display: flex;
- flex-direction: column;
+ flex: none;
}
.text-group_1 {
- display: flex;
- flex-direction: column;
+ flex: auto;
+ // display: flex;
+ // flex-direction: column;
margin: 10rpx 0 8rpx 0;
+ padding-left: 20rpx;
}
.text_5 {
overflow-wrap: break-word;
@@ -234,10 +235,7 @@
font-size: 32rpx;
font-family: Alibaba-PuHuiTi-M;
font-weight: normal;
- text-align: right;
- white-space: nowrap;
line-height: 32rpx;
- margin-right: 86rpx;
}
.text_6 {
overflow-wrap: break-word;
@@ -256,7 +254,10 @@
height: 62rpx;
display: flex;
flex-direction: column;
- margin: 20rpx 0 18rpx 114rpx;
+ position: absolute;
+ right: 140rpx;
+ top: 50%;
+ transform: translateY(-50%);
}
.text_7 {
overflow-wrap: break-word;
@@ -267,7 +268,10 @@
text-align: right;
white-space: nowrap;
line-height: 32rpx;
- margin: 34rpx 0 0 50rpx;
+ position: absolute;
+ right: 24rpx;
+ top: 50%;
+ transform: translateY(-50%);
.active{
color: rgba(0,91,162,1);
}
@@ -437,10 +441,14 @@
.text-wrapper_3 {
background-color: rgba(0,91,162,1.000000);
border-radius: 32rpx;
- display: flex;
- flex-direction: column;
- margin: 22rpx 0 22rpx 24rpx;
+
padding: 12rpx 40rpx 12rpx 40rpx;
+ // width: 70rpx;
+ text-align: center;
+ position: absolute;
+ right: 24rpx;
+ top: 50%;
+ transform: translateY(-50%);
}
.text_14 {
overflow-wrap: break-word;
diff --git a/pages/medicationRecord/index.wxml b/pages/medicationRecord/index.wxml
index 55cf535..015b872 100644
--- a/pages/medicationRecord/index.wxml
+++ b/pages/medicationRecord/index.wxml
@@ -46,8 +46,8 @@
- {{detail.name}}
- {{detail.dose}} {{detail.time}}
+ {{detail.name}}
+ {{detail.dose}} {{detail.time}}
diff --git a/pages/message/index.js b/pages/message/index.js
index da8a44a..e62cd6e 100644
--- a/pages/message/index.js
+++ b/pages/message/index.js
@@ -29,7 +29,7 @@ Page({
}
// If within 7 days and status is 1, update to 2
if (diffDays <= 7 && diffDays >= 0 && item.status === 1) {
- return { ...item, status: 3 };
+ return { ...item, status: 3, diffDays};
}
return item;
});
diff --git a/pages/message/index.wxml b/pages/message/index.wxml
index 9236981..257a7d1 100644
--- a/pages/message/index.wxml
+++ b/pages/message/index.wxml
@@ -10,13 +10,16 @@
已完成
未开始
- 待开始
+
+ 待开始
+ {{item.diffDays}}天后
+
{{item.plan_date}}
{{item.plan_name}}
- 填写随访问卷
+ 填写随访问卷
预约挂号