From 0c0da011a5f93e0d4a782dcc2f65bd7124c7369a Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Wed, 3 Jul 2024 10:09:31 +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 | 79 ++++++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 25 deletions(-)

diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue
index 00f239d..a7e5034 100644
--- a/pages/therapist/orderDetail.vue
+++ b/pages/therapist/orderDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="bg" style="padding-bottom: 10px;">
+		<view class="bg">
 			<view class="swiperBac">
 				<swiper style="height: 745.83rpx;" autoplay="1500" :indicator-dots="false" :circular='true'
 					indicator-active-color="#ffffff" indicator-color="#cccccc">
@@ -26,23 +26,20 @@
 						<span>平台担保</span>
 					</view>
 				</view>
-				<view class="oder-foot-left-right" v-if="order.consortiaName">
-					<image src="../../static/orderDetail/chengchi.png" mode=""></image>
-					<span>{{order.consortiaName}}</span>
-				</view>
 			</view>
 			<view class="view-head">
 				<view class="jian-view">
 					<view class="jian-view-left">
 						<span>{{order.artificerName}}</span>
-					</view>
-					<view class="jian-view-right">
-						<view class="oder-mian-right">
-							<view class="oder-mian-view oder-mian-jin">
+						<view class="keyuyue">
+							<view >
 								{{order.status == 1?"可服务":"休息中"}}
 							</view>
-							<view class="oder-mian-view oder-mian-time"><span v-if="order.status == 1">{{order.time}}</span></view>
+							<view v-if="order.status == 1">{{order.time}}</view>
 						</view>
+					</view>
+					<view class="jian-view-right">
+						
 						<view class="jian-view-right-weizhi">
 							<image class="jian-view-right-img" src="../../static/orderDetail/dingwei.png"></image>
 							<span>{{order.distance}}</span>
@@ -53,6 +50,7 @@
 				<view class="oder-mian">
 					<view class="oder-mian-left">
 						<span>ID:{{order.artificerId}}</span>
+						<span>·</span>
 						<span>{{order.collectCount}}人 关注</span>
 					</view>
 					<view class="oder-mian-tjia">
@@ -73,6 +71,10 @@
 						</view>
 					</view>
 				</view>
+				<view class="flex order-sname" v-if="order.consortiaName">
+					<image class="order-sname-img" src="../../static/orderDetail/chengchi.png" mode=""></image>
+					<span class="order-sname-text">{{order.consortiaName}}</span>
+				</view>
 				<!-- <view class="padding-bottom flex justify-between">
 					<view class="flex align-center">
 						<view class="margin-right-sm flex align-center"
@@ -633,7 +635,7 @@
 		transition-property: background-color, color;
 		height: 40px;
 		line-height: 40px;
-		font-size: 13px;
+		font-size: 15px;
 		color: #000000;
 		transition-duration: 0.5s;
 		width: 100%;
@@ -644,7 +646,7 @@
 		height: 126px;
 		background: #FFFFFF;
 		border-radius: 10px;
-		margin: 0px auto 10px auto;
+		margin: 20rpx auto 15rpx auto;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
@@ -652,9 +654,8 @@
 	}
 	.jieshao{
 		width: 100%;
-		margin-top: 15px;
+		margin-top: 15rpx;
 		font-size: 26rpx;
-		line-height: 40rpx;
 		color: #888;
 		display: -webkit-box;
 		-webkit-box-orient: vertical;
@@ -899,6 +900,7 @@
 		width: 60rpx;
 		height: 60rpx;
 		margin-top: 3px;
+		margin-right: 8rpx;
 	}
 	.xiangmu-cont-top-left{
 		font-weight: normal;
@@ -1104,15 +1106,17 @@
 		border-radius: 7rpx;
 	}
 	.oder-mian-left span:nth-child(1){
-		font-weight: 400;
 		font-size: 26rpx;
 		color: #666666;
-		margin-right: 15px;
+		margin-right: 8px;
 	}
 	.oder-mian-left span:nth-child(2){
-		font-weight: bold;
+		font-size: 50rpx;
+		color: #666666;margin-right: 8px;
+	}
+	.oder-mian-left span:nth-child(3){
 		font-size: 26rpx;
-		color: #222222;
+		color: #666666;
 	}
 	.oder-mian-left{
 		width: 50%;
@@ -1141,13 +1145,13 @@
 		margin: 15px 24px 0px 24px;
 	}
 	.jian-view-right span{
-		font-weight: bold;
-		font-size: 25rpx;
+		font-size: 26rpx;
 		color: #848485;
 	}
 	.jian-view-right-img{
-		width: 18.75rpx;
-		height: 21.53rpx;
+		width: 23rpx;
+		height: 26rpx;
+		margin-right: 10rpx;
 	}
 	.jian-view-right{
 		display: flex;
@@ -1156,7 +1160,7 @@
 	}
 	.jian-view-left span{
 		font-weight: bold;
-		font-size: 35rpx;
+		font-size: 36rpx;
 		color: #13141A;
 		margin-right: 5px;
 	}
@@ -1243,6 +1247,31 @@
 	.swiper {
 		height: 662rpx;
 	}
-
-	
+	.keyuyue{
+		width: 160rpx;
+		height: 20px;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		background: linear-gradient(90deg, #fe912e, #ff996a, #35C495);
+		border-radius: 30rpx 30rpx 30rpx 2rpx;
+		padding: 3rpx 15rpx;
+		color:#fff;
+		font-size: 22rpx;
+		margin-left: 15rpx;
+	}
+	.order-sname{
+		width: 100%;
+		margin-top: 15rpx;
+	}
+	.order-sname-img{
+		width: 30rpx;
+		height: 30rpx;
+		margin-right: 8rpx;
+		margin-top: 3rpx;
+	}
+	.order-sname-text{
+		font-size: 30rpx;
+		font-weight: bold;
+	}
 </style>
\ No newline at end of file