From fd543d3608669022b4bbd53b426826a5b5167ef8 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Thu, 18 Jul 2024 16:33:28 +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

---
 my/order/pay.vue                |   2 -
 pages/order/index.vue           |  22 ++---
 pages/therapist/orderDetail.vue | 138 ++++++++++++++++----------------
 3 files changed, 77 insertions(+), 85 deletions(-)

diff --git a/my/order/pay.vue b/my/order/pay.vue
index 1e55f9f..129b4ae 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -2529,8 +2529,6 @@
 		border-bottom: 1px solid #f7f7f7;
 		padding: 0 20rpx;
 		color: #666666;
-	
-		
 	}
 	/deep/.u-size-default{
 		// margin: 5px 0px 0px 0px;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 6fa68db..1fd4219 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -12,7 +12,7 @@
 		</view>
 		<!-- 数据列表 -->
 		<view v-if="goods.length > 0" class="margin-sm bg ding-view" v-for="(item,index) in goods" :key='index'
-			@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" style="border-radius: 20rpx;padding: 36rpx;">
+			@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" style="border-radius: 20rpx;padding: 30rpx;">
 			<view class="flex justify-between">
 				<view class="flex align-center profile-img">
 					<image src="../../static/logo.png" style="width: 55rpx;height: 55rpx;border: 1px solid#d7f2ee;border-radius: 50%;">
@@ -134,7 +134,7 @@
 							<u-button
 								v-if="item.addNum==null&&item.oldOrdersId==null"
 								:custom-style="customStyle" shape="circle" :plain="true"
-								 class="btns xianshi"
+								 class="btns"
 								@click="cancelOrder(item)">
 								取消订单
 							</u-button>
@@ -404,7 +404,7 @@
 					border: "8rpx",
 					width: '180rpx',
 					height: '60rpx',
-					margin: "0 0 0 20rpx",
+					margin: "0 0 0 10rpx",
 					fontSize: '26rpx'
 				},
 				yhqxSel: '否',
@@ -872,7 +872,6 @@
 	}
 	.gengduo{
 		font-weight: 400;
-		font-size: 25rpx;
 		color: #7D7D7D;
 	}
 	.profile-img{
@@ -896,15 +895,12 @@
 		border-radius:20rpx 20rpx  20rpx 1rpx;
 	}
 	.showBtn{
-	}
-	.showBtn{
+		margin: 30rpx 0;
 		width: 100%;
 		display: flex;
 		flex-direction: row;
-		align-items: center;
-		flex-wrap: wrap;
-		justify-content: flex-end;
-		margin: 30rpx 0;
+		align-items: right;
+		justify-content: center;
 	}
 	
 	.popup-mian-btn span:nth-child(1){
@@ -987,16 +983,14 @@
 		background: #fff !important;
 		// border: 1px solid #019C88 !important;
 		color: #019C88 !important;
-		width: 145rpx !important;
-		height: 47rpx !important;
-		line-height: 47px !important;
+		width: 164rpx !important;
 		border-radius: 23rpx !important;
 	}
 	.text-green span:nth-child(1){
 		font-weight: 400;
 		font-size: 25rpx;
 		color: #7D7D7D;
-		margin-right: 10px;
+		margin-right: 3px;
 	}
 	.text-green span:nth-child(2){
 		font-weight: 400;
diff --git a/pages/therapist/orderDetail.vue b/pages/therapist/orderDetail.vue
index c55beb0..ae39119 100644
--- a/pages/therapist/orderDetail.vue
+++ b/pages/therapist/orderDetail.vue
@@ -47,52 +47,46 @@
 						</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>
+						<view class="oder-mian-qing" @click="shangxian" v-if="order.status == 2">请TA上线</view>
+						<view class="keyuyue">
+								<view class="flex">
+									<image class="timea-img"></image>
+									<view class="timea-fu">{{order.status == 1?"可服务":"休息中"}}</view>
+									<view class="timea-time" v-if="order.status == 1">{{order.time}}</view>
+								</view>
 						</view>
-					</view>
-				</view>
-				<view class="excel-line">
-					<view>
-						<image class="excel" src="../../static/excel.png" mode=""></image>
-					</view>
-					<view class="jieshao">
-						{{order.content}}
+						<!--<view class="jian-view-right-weizhi">
+							<image class="jian-view-right-img" src="../../static/orderDetail/dingwei.png"></image>
+							<span>{{order.distance}}</span>
+						</view>-->
 					</view>
 				</view>
 				<view class="oder-mian">
 					<view class="oder-mian-left">
-						<span>ID:{{order.invitationCode}}</span>
-						<span>·</span>
-						<span>{{order.collectCount}}人关注</span>
+						<view class="oder-mian-guan" :class="[isFollow?'activeG':'activeQ']" @click="guanzhu(order)">
+							收藏
+						</view>
+						<view class="shouchang-view" @click="toggle('center')">
+							<image class="shouchang-img" src="../../static/orderDetail/technician6.png"></image>
+							<span class="shouchang-text">打赏</span>
+									<!-- <image src="../../static/orderDetail/technician6-1.png"
+										style="width: 45rpx;height: 45rpx;position: relative;top: 4upx;" v-else></image> -->
+						</view>
+						
 					</view>
 					<view class="oder-mian-tjia">
-						<view class="oder-mian-qing" @click="shangxian" v-if="order.status == 2">请TA上线</view>
-						<view class="oder-mian-guan" :class="[isFollow?'activeG':'activeQ']" @click="guanzhu(order)">
-							关注
-						</view>
+						<!---<span>{{order.collectCount}}人关注</span>-->
+						<span>ID:{{order.invitationCode}}</span>
 					</view>
 				</view>
+				
+				
 				<view class="flex" style="margin-top: 20rpx;">
-					<view class="shouchang-view" @click="toggle('center')">
-						<image class="shouchang-img" src="../../static/orderDetail/technician6.png"></image>
-						<span class="shouchang-text">打赏技师</span>
-								<!-- <image src="../../static/orderDetail/technician6-1.png"
-									style="width: 45rpx;height: 45rpx;position: relative;top: 4upx;" v-else></image> -->
+					<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="keyuyue">
-							<view class="flex">
-								<image class="timea-img" src="../../static/timea.png" mode=""></image>
-								<view class="timea-fu">{{order.status == 1?"可服务":"休息中"}}</view>
-								<view class="timea-time" v-if="order.status == 1">{{order.time}}</view>
-							</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">
@@ -129,7 +123,14 @@
 				</view>
 			</view>
 		</view> -->
-		
+		<view class="excel-line">
+			<view>
+				<image class="excel" src="../../static/excel.png" mode=""></image>
+			</view>
+			<view class="jieshao">
+				{{order.content}}
+			</view>
+		</view>
 		
 		<view class="oder-footer">
 			<u-tabs :list="tabs" :is-scroll="true" :current="tabIndex" @change="tabChange" active-color="#000000"
@@ -660,11 +661,11 @@
 		position: relative;
 	}
 	.headset-img{
-		width: 55rpx;
-		height: 55rpx;
+		width: 35rpx;
+		height: 35rpx;
 		position: absolute;
-		top:-13rpx;
-		left:-6rpx;
+		top:1rpx;
+		left:-1rpx;
 		
 	}
 	.headset-text{
@@ -696,7 +697,7 @@
 		height: 30rpx;
 		line-height: 30rpx;
 		border-radius:5rpx 30rpx 30rpx 30rpx;
-		width: 85rpx;
+		width: 72rpx;
 		padding: 5rpx 15rpx;
 		text-align: right;
 	}
@@ -711,11 +712,12 @@
 		position: relative;
 	}
 	.excel-line{
-		margin: 20rpx 0;
-		height: 80rpx;
+		margin: 20rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
+		background: #ffffff;
+		padding: 20rpx;
 	}
 	.excel{
 		width: 60rpx;
@@ -754,6 +756,7 @@
 		-webkit-line-clamp: 2;
 		overflow: hidden;
 		text-overflow: ellipsis;
+		align-items:flex-start;
 		}
 	/deep/.padding-tb-sm{
 		background: #fff;
@@ -885,6 +888,7 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: flex-end;
+		color: #666;
 	}
 	.oder-mian-guan{
 		width: 116rpx;
@@ -910,16 +914,15 @@
 		color:#ffffff;
 	}
 	.oder-mian-qing{
-		width: 70px;
-		height: 60rpx;
-		line-height:60rpx;
+		width: 60px;
+		height: 47rpx;
+		line-height:47rpx;
 		text-align: center;
 		font-weight: 400;
 		font-size: 23rpx;
 		color: #029D88;
 		background: #fff;
 		border-radius: 60rpx;
-		margin: 0px 6px;
 		border: 1px solid #029D88;
 	}
 	.video-item{
@@ -992,17 +995,20 @@
 		justify-content: center;
 		background: linear-gradient(90deg, #ffe0d8, #ffe0d8, #eaeaea);
 		border-radius: 30rpx;
-		height:46rpx;
+		height:50rpx;
+		line-height: 52rpx;
 		padding: 0 10rpx;
+		margin-left: 8rpx;
+		border: 1px #fcd7cf solid;
 	}
 	.shouchang-img{
 		width: 30rpx;
 		height:30rpx;
-		margin-right: 5rpx;
+		margin-right: 8rpx;
 	}
 	.shouchang-text{
 		color: #ff6942;
-		font-size: 24rpx;
+		font-size: 25rpx;
 		padding: 0 12rpx 0  0 ;
 		font-weight: bold;
 	}
@@ -1207,27 +1213,17 @@
 		align-items: center;
 		border-radius: 7rpx;
 	}
-	.oder-mian-left span:nth-child(1){
-		font-size: 26rpx;
-		color: #666666;
-		margin-right: 3px;
-	}
-	.oder-mian-left span:nth-child(2){
-		font-size: 50rpx;
-		color: #666666;margin-right: 3px;
-	}
-	.oder-mian-left span:nth-child(3){
-		color: #019c88;
-	}
+	
 	.oder-mian-left{
-		width: 50%;
+		width: 78%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
+		margin-left: -6rpx;
 	}
 	.oder-mian{
 		width: 100%;
-		margin-top: 3px;
+		margin-top: 8px;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
@@ -1349,8 +1345,8 @@
 		height: 662rpx;
 	}
 	.keyuyue{
-		width: 200rpx;
-		height: 42rpx;
+		padding: 0rpx;
+		height: 45rpx;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
@@ -1361,26 +1357,30 @@
 		margin-left: 6rpx;
 	}
 	.timea-img{
-		background:#2dbe93 url('../../static/timea.png');
+		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;
 	}
 	.timea-fu{
 		font-size: 22rpx;
 		color: #2dbe93;
 		line-height: 44rpx;
 		margin-left: 8rpx;
+		margin-right: 5rpx;
 	}
 	.timea-time{
 		font-size: 24rpx;
-		color: #029d88;
+		color: #2dbe93;
 		line-height: 44rpx;
+		padding-right: 10rpx;
 		
 	}
 	.order-sname{
 		width: 100%;
-		margin-top: 15rpx;
 	}
 	.order-sname-img{
 		width: 30rpx;