diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue
index f54bccf..b29fe50 100644
--- a/pages/therapist/orderDetail.vue
+++ b/pages/therapist/orderDetail.vue
@@ -1345,7 +1345,7 @@
}
.keyuyue{
padding: 0rpx;
- height: 45rpx;
+ height: 44rpx;
display: flex;
flex-direction: row;
align-items: center;
diff --git a/pages/therapist/therapist.vue b/pages/therapist/therapist.vue
index 114e63b..0dc3afc 100644
--- a/pages/therapist/therapist.vue
+++ b/pages/therapist/therapist.vue
@@ -4,8 +4,8 @@
-
- {{ city }}
+
+ {{ city }}
+
@@ -25,7 +29,6 @@
-
-
- {{item.state == 1?"可服务":item.state == 2?"今日可约":"休息中"}}
+
+
+ {{order.status == 1?"可服务":"休息中"}}
+ {{order.time}}
+
+
+
+
+
+ {{item.state == 1?"可服务":item.state == 2?"今日可约":"休息中"}}
+ {{ item.time}}
- {{ item.time
- }}
@@ -80,7 +90,7 @@
{{item.consortiaName}}
-
+
{{ item.distance }}
@@ -1271,7 +1281,7 @@ import permision from "@/components/permission.js";
// }
.item-view-jianjie{
font-weight: 400;
- font-size: 23rpx;
+ font-size: 24rpx;
color: #999;
display: -webkit-box;
-webkit-box-orient: vertical;
@@ -1283,8 +1293,8 @@ import permision from "@/components/permission.js";
.touxiang-frame{
position: absolute;
width: 110rpx;
- height: 40rpx;
- left: 60rpx;
+ height: 43rpx;
+ left: 44rpx;
bottom:5rpx;
}
@@ -1297,7 +1307,7 @@ import permision from "@/components/permission.js";
}
.liebiao{
//height: 100vh;
- margin-top: 110px;
+ margin-top: 100px;
display: flex;
flex-direction: column;
}
@@ -1306,7 +1316,7 @@ import permision from "@/components/permission.js";
top: 0rpx;
z-index: 999;
width: 100%;
- background:#ffffff;
+ background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
// background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), #f7f7f7), url('../../static/background-img.png');
// background-position: center center;
// background-repeat: no-repeat;
@@ -1314,7 +1324,7 @@ import permision from "@/components/permission.js";
// overflow: auto;
}
.therapist-bottom-dingwei-text{
- font-size: 26rpx;
+ font-size: 24rpx;
color: #848485;
}
.therapist-bottom-dingwei{
@@ -1394,32 +1404,39 @@ import permision from "@/components/permission.js";
color: #13141A;
}
.keyuyue{
- // width: 160rpx;
- height: 20px;
+ padding: 0rpx;
+ height: 44rpx;
display: flex;
flex-direction: row;
align-items: center;
- background: linear-gradient(90deg, #fee9ca, #fde4c6);
- border: 1px #decbae solid;
- border-radius: 30rpx 30rpx 30rpx 2rpx;
- padding: 3rpx 18rpx;
+ border: 1px #2dbe93 solid;
+ border-radius: 20rpx 30rpx 30rpx 20rpx;
color:#8d500f;
font-size: 22rpx;
- margin-left: 15rpx;
+ margin-left: 6rpx;
}
-
- .keyuyue-jinri{
- border-top-left-radius: 7rpx;
- border-bottom-left-radius: 7rpx;
- border-radius:7rpx 0 0 7rpx;
- color: #fff;
- background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+ .timea-img{
+ background:#2dbe93 url('../../static/timea.png') 4rpx 3rpx;
+ background-size: 35rpx 35rpx;
+ background-repeat: no-repeat;
+ width: 40rpx;
+ height: 40rpx;
+ border-radius: 8rpx 0 0 8rpx;
+ margin-top: 1rpx;
}
- .keyuyue-time{
- border-top-right-radius: 7rpx;
- border-bottom-right-radius: 7rpx;
- color: #039E89;
- background: #EBEBEB;
+ .timea-fu{
+ font-size: 22rpx;
+ color: #2dbe93;
+ line-height: 44rpx;
+ margin-left: 8rpx;
+ margin-right: 5rpx;
+ }
+ .timea-time{
+ font-size: 24rpx;
+ color: #2dbe93;
+ line-height: 44rpx;
+ padding-right: 10rpx;
+
}
.list-right-top-view image{
width: 168.75rpx;
@@ -1439,12 +1456,12 @@ import permision from "@/components/permission.js";
align-items: center;
}
.list-right{
- width: 64%;
+ width: 72%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
- padding: 16px 9px 3px 0px;
+ padding: 16rpx;
}
.zpmore_view {
position: absolute;
@@ -1490,6 +1507,7 @@ import permision from "@/components/permission.js";
height: 306.94rpx;
}
.touxiang-left-content{
+ width: 180rpx;
//width: 235.08rpx;
height: auto;
border-radius: 10rpx;
@@ -1497,20 +1515,22 @@ import permision from "@/components/permission.js";
}
.touxiang-left-content-img{
- width: 200rpx;
- height: 200rpx;
+ width: 150rpx;
+ height: 150rpx;
border-radius:120rpx;
- margin: 15rpx;
+ margin: 14rpx 22rpx;
+
}
.touxiang-left-view{
width: 100%;
- /*ight: 150px;*/
+ height: 130px;
border-radius: 18rpx;
align-items: flex-start;
- justify-content: space-between;
background: #fff;
margin-bottom: 12px;
padding-bottom: 10px;
+ justify-content: space-between;
+ padding: 10rpx;
}
.touxiang-left{
width: 100%;
@@ -1556,17 +1576,32 @@ import permision from "@/components/permission.js";
// overflow: auto;
}
/deep/.u-content{
+ height: 55rpx!important;
border-radius: 30px !important;
}
.flex-sub{
- width: 353rpx;
- height: 63rpx !important;
+ width: 260rpx !important;
+ height:60rpx !important;
+ }
+ .map-list{
+ padding: 0 12rpx;
+ width: 110rpx;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-between;
+
+ }
+ .map-img{
+ width: 40rpx;
+ height: 40rpx;
}
.localName{
+ width: 100rpx;
margin-left: 4rpx;
font-weight: bold;
font-size: 28rpx;
- color: #333333;
+ color: #fff;
}
.dingwei-img{
width:33.33rpx;
@@ -1879,6 +1914,7 @@ import permision from "@/components/permission.js";
justify-content: space-between;
}
.therap-pin{
+ font-size: 24rpx;
display: flex;
align-items: flex-end;
margin-right: 10rpx;
diff --git a/static/map1.png b/static/map1.png
new file mode 100644
index 0000000..f8f6298
Binary files /dev/null and b/static/map1.png differ
diff --git a/static/map2.png b/static/map2.png
new file mode 100644
index 0000000..95c47f2
Binary files /dev/null and b/static/map2.png differ
diff --git a/static/reminder.png b/static/reminder.png
new file mode 100644
index 0000000..cb19de2
Binary files /dev/null and b/static/reminder.png differ
diff --git a/static/vip/grade1.gif b/static/vip/grade1.gif
index dedbc43..b0b47cd 100644
Binary files a/static/vip/grade1.gif and b/static/vip/grade1.gif differ