From 7ebbc708416713b90f9b4300396b687ef75ecd32 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 22 Jul 2024 21:04:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8C=89=E9=92=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/pay.vue                     |  9 ++--
 my/order/payShengji.vue              | 68 +++++++++++++++--------
 pages/therapist/therapistDingdan.vue | 80 +++++++++++++++++++---------
 3 files changed, 105 insertions(+), 52 deletions(-)

diff --git a/my/order/pay.vue b/my/order/pay.vue
index d1d76f0..f06f1b3 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -461,8 +461,7 @@
                   class="btns">联系客服</u-button>
       </view>
       <view class="showBtn tabber" v-if="order.status ==8">
-        <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
-        >
+        <u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
           取消订单
         </u-button>
         <u-button
@@ -2517,8 +2516,10 @@ export default {
   flex-direction: column;
 }
 /deep/.btns{
-  color: #019C88 !important;
-  margin-left: 10rpx !important;
+ color: #019C88 !important;
+ margin-left: 10rpx !important;
+ height:70rpx;
+ font-size: 30rpx;
 }
 .eject-btns{
   height:60rpx;
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index 2c0cf52..c1da3ae 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -526,7 +526,7 @@
 				<view class="showBtn-mian" v-if="order.status=='6'">
 					<view class="showBtn">
 						<view class="gengduo" @click.stop="gengBtn">更多</view>
-
+						<view style="display: flex;flex-direction: row;align-items: center;justify-content: flex-end">
 						<u-button
 							shape="circle" :plain="true"
 							@click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId)"
@@ -545,17 +545,17 @@
 							class="btns">
 							加钟
 						</u-button>
-
+						</view>
 					</view>
-					<view class="yincang" v-show="btnShow==true">
-						<u-button style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
-							class="btns">联系客服</u-button>
-						<u-button :custom-style="customStyle2"
+					<view class="showBtn-view" v-show="btnShow==true">
+						<view style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
+							class="eject-btns">联系客服</view>
+						<view :custom-style="customStyle2"
 							shape="circle" :plain="true"
 							@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
-							class="dingshi">
+							class="eject-btns">
 							去投诉
-						</u-button>
+						</view>
 					</view>
 				</view>
 				<view class="showBtn-mian" v-else>
@@ -2097,6 +2097,32 @@
 </script>
 
 <style lang="scss" scoped>
+	.showBtn-view{
+	  display: flex;
+	  flex-direction: column;
+	  align-items: center;
+	  position: absolute;
+	  background-color: #ffffff;
+	  padding: 10px;
+	  bottom:90rpx;
+	  left:50rpx;
+	  box-shadow: 0px 0px 3px 0px #b5b5b5;
+	  border-radius: 10rpx;
+	}
+	.showBtn-view:before {
+	  position: absolute;
+	  left: 20rpx;
+	  bottom:-12rpx;
+	  width: 20rpx;
+	  height: 20rpx;
+	  background: #ffffff;
+	  margin-top: -2px;
+	  border-right: 1px solid #e5e5e5;
+	  border-bottom: 1px solid #e5e5e5;
+	  transform: rotate(45deg);
+	  -webkit-transform: rotate(45deg);
+	  content: '';
+	}
 	.yincang{
 		background-color: #fff;
 		position: absolute;
@@ -2296,11 +2322,10 @@
 	/deep/.btns{
 	  color: #019C88 !important;
 	  margin-left: 10rpx !important;
-	  height:64rpx;
-	  font-size: 28rpx;
+	  height:70rpx;
+	  font-size: 30rpx;
 	}
 	/deep/.u-size-default{
-		margin: 5px 0px 0px 0px;
 	}
 	.showBtn-mian{
 		width: 100%;
@@ -2312,16 +2337,11 @@
 	}
 	.gengduo{
 		font-weight: 400;
-		font-size: 25rpx;
+		font-size: 28rpx;
 		color: #7D7D7D;
+		margin-left: 26rpx;
 	}
-	.showBtn-view{
-		width: 100%;
-		justify-content: flex-end;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
+	
 	.showBtn,.hideBtn{
 		width: 100%;
 		display: flex;
@@ -2329,10 +2349,7 @@
 		align-items: center;
 		flex-wrap: wrap;
 		justify-content: space-between;
-
 	}
-
-
 	.dingshi{
 		border: 0.5px solid #e5e5e5;
 		color: #333333 !important;
@@ -2747,4 +2764,11 @@
 	  border-radius: 24rpx;
 	  margin-top: 24rpx;
 	}
+	.eject-btns{
+	 height:60rpx;
+	 line-height: 60rpx;
+	 border-bottom: 1px solid #f7f7f7;
+	 padding: 0 20rpx;
+	 color: #666666;
+	}
 </style>
diff --git a/pages/therapist/therapistDingdan.vue b/pages/therapist/therapistDingdan.vue
index 3cbb293..63b61c6 100644
--- a/pages/therapist/therapistDingdan.vue
+++ b/pages/therapist/therapistDingdan.vue
@@ -18,10 +18,9 @@
 					<view class="flex align-center touxiang-left-view" v-if="item.status=='1'" v-for="(item, index) in orderList" :key='index'
 						@click="goOrder(item)">
 						<view class="touxiang-left-content">
-							
 							<image class="touxiang-left-content-img" :src="item.artificerImg ? item.artificerImg : '../../static/logo.png'"
 								@click.stop="saveImgs(item.artificerImg)" mode="aspectFill"></image>
-							<image class="touxiang-frame"  :src="item.technicianType=='3'?'../../static/vip/grade4.png':item.technicianType=='4'?'../../static/vip/grade5.png':'../../static/vip/grade6.png'"></image>
+							<image class="touxiang-frame"  :src="item.technicianType=='3'?'../../static/vip/grade1.gif':item.technicianType=='4'?'../../static/vip/grade2.gif':'../../static/vip/grade3.gif'"></image>
 							
 						</view>
 						<view class="list-right">
@@ -32,12 +31,18 @@
 											{{ item.artificerName }}
 										</view>
 										<view class="keyuyue">
+										<view class="flex">
+											<view class="timea-fu">{{item.status == 1?"可服务":"休息中"}}</view>
+											<view class="timea-time" v-if="item.status == 1">{{item.time}}</view>
+										</view>
+										</view>
+										<!--<view class="keyuyue">
 											<view>
 												 {{item.state == 1?"可服务":item.state == 2?"今日可约":"休息中"}}
 											</view>
 											<view v-if="item.status == 1 && item.time">{{ item.time
 										}}</view>
-										</view>
+										-->
 									</view>
 								</view>
 							</view>
@@ -1099,8 +1104,10 @@
 	}
 	.touxiang-frame{
 		position: absolute;
-		width: 230.08rpx;
-		height: 146px;
+		width: 100rpx;
+		height: 38rpx;
+		left: 44rpx;
+		top:140rpx;
 	}
 	.dituList{
 		width: 85%;
@@ -1208,18 +1215,37 @@
 		color: #13141A;
 	}
 	.keyuyue{
-		// width: 160rpx;
-		height: 20px;
+		padding: 0rpx 10rpx;
+		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;
+		background: #eefdf8;
+		border-radius:  30rpx 20rpx 20rpx 30rpx ;
 		color:#8d500f;
-		font-size: 22rpx;
-		margin-left: 15rpx;
+		font-size: 24rpx;
+	}
+	.timea-img{
+		background:#2dbe93 url('../../static/timea.png') 2rpx 1rpx;
+		background-size: 28rpx 28rpx;
+		background-repeat: no-repeat;
+		width: 30rpx;
+		height: 30rpx;
+		border-radius:8rpx;
+		margin-top: 8rpx;
+	}
+	.timea-fu{
+		font-size: 24rpx;
+		color: #2dbe93;
+		line-height: 44rpx;
+		margin-left: 8rpx;
+		margin-right: 5rpx;
+	}
+	.timea-time{
+		font-size: 25rpx;
+		color: #2dbe93;
+		line-height: 44rpx;
+		padding-right: 10rpx;
 	}
 	.keyuyue .keyuyue-btn{
 		width: 50%;
@@ -1263,12 +1289,12 @@
 		align-items: center;
 	}
 	.list-right{
-		width: 67%;
+		width: 72%;
 		height: 100%;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
-		padding: 10px 5px 0px 5px;
+		padding: 16rpx;
 	}
 	.zpmore_view {
 		position: absolute;
@@ -1314,26 +1340,28 @@
 		height: 306.94rpx;
 	}
 	.touxiang-left-content{
-		//width: 212.08rpx;
+		width: 180rpx;
+		//width: 235.08rpx;
 		height: auto;
 		border-radius: 10rpx;
+		position: relative;
 	}
 	.touxiang-left-content-img{
-		width: 230.08rpx;
-		height: 150px;
-		border-radius:5rpx;
-		padding: 20rpx;
-		position:absolute;
+		width: 150rpx;
+		height: 150rpx;
+		border-radius:120rpx;
+		margin: 14rpx 22rpx;
 	}
 	.touxiang-left-view{
 		width: 100%;
-		height: 150px;
-		border-radius: 20rpx;
+		height: 126px;
+		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{
@@ -1689,9 +1717,9 @@
 	.terap-button{
 		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
 		color: #ffffff;
-		width:200rpx;
+		width:130rpx;
 		height: 60rpx;
-		border-radius: 30upx;
+		border-radius: 10upx;
 		line-height: 58rpx;
 	}
 </style>
\ No newline at end of file