From d53ad7a29a65c7c62dfe1a54f709b20fc43ed83f Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Wed, 17 Jul 2024 19:09:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/therapist/orderDetail.vue | 116 ++++++++++++++++++-------------- static/follow.png | Bin 0 -> 4218 bytes static/follow2.png | Bin 0 -> 4047 bytes 3 files changed, 67 insertions(+), 49 deletions(-) create mode 100644 static/follow.png create mode 100644 static/follow2.png 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 0000000000000000000000000000000000000000..9e34d329854c0883f839efc4151e4fff9375d477 GIT binary patch literal 4218 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 Q2mk;807*qoM6N<$g2Dih)&Kwi literal 0 HcmV?d00001 diff --git a/static/follow2.png b/static/follow2.png new file mode 100644 index 0000000000000000000000000000000000000000..f84fa2cc9085ffc329f5b3dfa4b58d6414bb8694 GIT binary patch literal 4047 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 literal 0 HcmV?d00001