diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue index 5be847b..c55beb0 100644 --- a/pages/therapist/orderDetail.vue +++ b/pages/therapist/orderDetail.vue @@ -45,17 +45,11 @@ {{order.technicianTypeName}} - - - {{order.status == 1?"可服务":"休息中"}} - - {{order.time}} - - + {{order.distance}} @@ -75,23 +69,27 @@ {{order.collectCount}}人关注 - - - - - 打赏技师 - - - - - 请TA上线 - + 关注 + + + + 打赏技师 + + + + + + {{order.status == 1?"可服务":"休息中"}} + {{order.time}} + + + {{order.consortiaName}} @@ -230,7 +228,7 @@ 打赏技师 - x + @@ -692,9 +690,9 @@ text-align: right; } .headset-text2{ - background: linear-gradient(90deg, #bd6ed4, #9533b8); + background: linear-gradient(90deg, #f8f8f8, #dfdfdf); font-size: 22rpx; - color: #f6dcff; + color: #333; height: 30rpx; line-height: 30rpx; border-radius:5rpx 30rpx 30rpx 30rpx; @@ -837,7 +835,7 @@ flex-direction: row; justify-content: space-between; align-items: center; - margin-top: 10px; + margin-top: 40rpx; } .popup-mian{ @@ -853,8 +851,6 @@ text-align: center; font-size: 24px; color: #15AB8D; - border-radius: 50%; - border: 1px solid #15AB8D; } .popup-head span:nth-child(1){ font-weight: bold; @@ -891,20 +887,27 @@ justify-content: flex-end; } .oder-mian-guan{ - width: 65rpx; - height: 65rpx; + width: 116rpx; + height: 50rpx; + border-radius: 30rpx; + font-size: 24rpx; } .activeQ{ - background: url('../../static/orderDetail/technician7-1.png'); + background: url('../../static/follow.png') 14rpx 8rpx; background-repeat: no-repeat; - background-size: 100% 100%; - padding: 10rpx; + background-size:28rpx 28rpx; + line-height: 48rpx; + text-indent:46rpx; + border: 1px solid #999999; } .activeG{ - background: url('../../static/orderDetail/technician7.png'); + background:#2dbe93 url('../../static/follow2.png') 14rpx 8rpx; background-repeat: no-repeat; - background-size: 100% 100%; - padding: 10rpx; + background-size:28rpx 28rpx; + line-height: 48rpx; + text-indent:46rpx; + border: 1px solid #2dbe93; + color:#ffffff; } .oder-mian-qing{ width: 70px; @@ -987,20 +990,20 @@ display: flex; align-items: center; justify-content: center; - background: #ffede8; + background: linear-gradient(90deg, #ffe0d8, #ffe0d8, #eaeaea); border-radius: 30rpx; - height: 56rpx; - padding: 0 12rpx; + height:46rpx; + padding: 0 10rpx; } .shouchang-img{ - width: 50rpx; - height:50rpx; - padding: 10rpx; + width: 30rpx; + height:30rpx; + margin-right: 5rpx; } .shouchang-text{ - color: #ff7e5b; + color: #ff6942; font-size: 24rpx; - padding: 0 15rpx 0 0 ; + padding: 0 12rpx 0 0 ; font-weight: bold; } .xiangmu-cont-top-left{ @@ -1046,7 +1049,6 @@ font-size: 25rpx; } .xiangmu-foot-left-dazhe{ - font-weight: bold; font-size: 31rpx; color: #848484; text-decoration-line: line-through; @@ -1215,7 +1217,6 @@ color: #666666;margin-right: 3px; } .oder-mian-left span:nth-child(3){ - font-size: 26rpx; color: #019c88; } .oder-mian-left{ @@ -1348,17 +1349,34 @@ height: 662rpx; } .keyuyue{ - height: 20px; + width: 200rpx; + height: 42rpx; 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; + } + .timea-img{ + background:#2dbe93 url('../../static/timea.png'); + width: 40rpx; + height: 40rpx; + border-radius: 8rpx 0 0 8rpx; + } + .timea-fu{ + font-size: 22rpx; + color: #2dbe93; + line-height: 44rpx; + margin-left: 8rpx; + } + .timea-time{ + font-size: 24rpx; + color: #029d88; + line-height: 44rpx; + } .order-sname{ width: 100%; diff --git a/static/follow.png b/static/follow.png new file mode 100644 index 0000000..9e34d32 Binary files /dev/null and b/static/follow.png differ diff --git a/static/follow2.png b/static/follow2.png new file mode 100644 index 0000000..f84fa2c Binary files /dev/null and b/static/follow2.png differ