From 16b051d18627bd5e0b50b43ff01b68f53d446d08 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Thu, 8 Aug 2024 10:53:36 +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/payModifyTcMy.vue   | 65 ++++++++++++++++++++++++++++--------
 pages/my/pTuanOderDrtail.vue | 45 ++++++++-----------------
 2 files changed, 66 insertions(+), 44 deletions(-)

diff --git a/my/order/payModifyTcMy.vue b/my/order/payModifyTcMy.vue
index 8c2882c..4bd1991 100644
--- a/my/order/payModifyTcMy.vue
+++ b/my/order/payModifyTcMy.vue
@@ -1,22 +1,19 @@
 <template>
 	<view class="content">
 		<view class="padding-bottom u-skeleton">
-			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
+			<view class="bgImg u-skeleton-fillet" style="padding: 0 20rpx;">
 				<view class="head-top">
 					<view class="pay-title">服务项目</view>
 					<view class="flex">
 						<view class="" style="width: 160upx;height: 160upx;">
-							<image :src="orderXm.massageImg"
-								style="width: 100%;height: 100%;border-radius: 19upx;"></image>
+							<image :src="orderXm.massageImg" style="width: 100%;height: 100%;border-radius: 19upx;"></image>
 						</view>
 						<view class="u-flex-1  margin-left-sm">
 							<view class="flex head-title-right">
 								<view class="margin-right-xs u-skeleton-fillet head-title">
 									{{orderXm.title}}
 								</view>
-								<view class="xiaoer item-view-biao">
-									{{orderXm.levelName}}
-								</view>
+								<image style="width: 120rpx; height: 45rpx;" :src="order.technicianType=='3'?'../../static/vip/grade1.gif':order.technicianType=='4'?'../../static/vip/grade2.gif':'../../static/vip/grade3.gif'" mode=""></image>
 							</view>
 							<view class="flex align-center">
 								<view style="width: 100%;">
@@ -41,9 +38,17 @@
 						</view>
 					</view>
 				</view>
-
 			</view>
-			<view class="header-padd header-view header-margin">
+			<view class="add-content header-margin" @click="getAddressList()">
+				<view class="Service-add">服务地址</view>
+				<view class="Service-Address">{{province}}/{{city}}/{{district}}/{{detailaddress}}</view>
+				<view v-if="!detailaddress">请选择地址</view>
+				<view class="Service-name" >
+					<span>{{name}}</span>
+					<span>{{mobile}}</span>
+				</view>
+			</view>
+			<!--<view class="header-padd header-view header-margin">
 				<view v-if="!detailaddress">请选择地址</view>
 				<view class="margin-right-xs">
 					<view class="jusitify-line">
@@ -67,9 +72,8 @@
 								</span>
 						</view>
 					</view>
-
 				</view>
-			</view>
+			</view>-->
 			<view class="header-view header-padd header-margin ">
 				<view class="jusitify-line" @click="liliaoshi">
 				 	<view class="line-word title-font" >
@@ -86,8 +90,8 @@
 					<view class="line-word title-font">
 						服务时间
 					</view>
-					<view class="flex align-center justify-between value-font"	style="margin-top: 15rpx;">
-						<view class="flex justify-between margin-tb-sm" @click="openData()">
+					<view class="flex align-center justify-between value-font">
+						<view class="flex justify-between" @click="openData()">
 							<view v-if="startTime">{{startTime}}</view>
 							<view class="line-word-r value-font" v-else>请选择预约时间<span class="view-more"></span></view>
 							</view>
@@ -2259,7 +2263,7 @@
 		align-items: center;
 	}
 	.header-margin{
-		margin: 26rpx;
+		margin:20rpx;
 	}
 	.header-padd{
 		padding: 36rpx;
@@ -2309,4 +2313,39 @@
 		background-color:#f1f8d7;
 		color: #58b314;
 	}
+	.add-content{
+	  background: #FFFFFF url(../../static/address/map.png)no-repeat top right;
+	  background-size:40%;
+	  padding: 30rpx;
+	  border-radius: 24rpx;
+	  margin-top: 24rpx;
+	}
+	.Service-add{
+		font-size:30rpx;
+		color: #333;
+		border-radius:5rpx;
+	}
+	.Service-Address{
+		font-size:34rpx;
+		color: #333;
+		font-weight: bold;
+		padding: 6rpx 0;
+		flex-direction: column;
+	}
+	.Service-name{
+		font-size: 30rpx;
+		color: #333;
+		display: flex;
+		align-items: flex-end;
+		padding:4rpx 0;
+		}
+	.Service-name span:nth-child(1){
+		font-size:28rpx;
+		color:#333;
+		margin-right: 15rpx;
+	}
+	.Service-name span:nth-child(2){
+		font-size:28rpx;
+		color:#666;
+	}
 </style>
diff --git a/pages/my/pTuanOderDrtail.vue b/pages/my/pTuanOderDrtail.vue
index f8c9a66..1e79dc4 100644
--- a/pages/my/pTuanOderDrtail.vue
+++ b/pages/my/pTuanOderDrtail.vue
@@ -5,7 +5,7 @@
 				<image src="../../static/activate2.png" mode="widthFix" v-if="isVip=='1'"></image>
 				<image src="../../static/servicePackage/member_ba.png" mode="widthFix" v-else></image>
 			</view>
-			<view class="header-bottom-top-list">
+			<!--<view class="header-bottom-top-list">
 				<view class="header-bottom-foot-view2">
 					<image class="header-bottom-foot-view2-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
 					<span>实名认证</span>
@@ -18,7 +18,7 @@
 					<image class="header-bottom-foot-view2-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
 					<span>平台担保</span>
 				</view>
-			</view>
+			</view>-->
 			<view class="header-bottom">
 				<view class="header-bottom-top">
 					
@@ -49,7 +49,6 @@
 				</view>
 				<view class="header-bottom-foot">
 					<view class="header-bottom-foot-cont">
-						<!-- <view class="header-fubz">保障</view> -->
 						<view class="header-bottom-foot-view">
 							<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
 							<span>未服务全额退款</span>
@@ -64,23 +63,6 @@
 						</view>
 					</view>	
 				</view>
-				<!--<view class="header-bottom-foot">
-					<view class="header-bottom-foot-title">服务保障</view>
-					<view class="header-bottom-foot-cont">
-						<view class="header-bottom-foot-view">
-							<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
-							<span>未服务全额退款</span>
-						</view>
-						<view class="header-bottom-foot-view" style="margin: 0px 7px;">
-							<image class="header-bottom-foot-view-img2" src="../../static/servicePackage/money.png" mode=""></image>
-							<span>不满意重做</span>
-						</view>
-						<view class="header-bottom-foot-view">
-							<image class="header-bottom-foot-view-img3" src="../../static/servicePackage/shuangyue.png" mode=""></image>
-							<span>最快30分钟上门</span>
-						</view>
-					</view>	
-				</view>-->
 			</view>
 		</view>
 		<view class="detail-foot">
@@ -431,7 +413,7 @@
 		height: 26rpx;
 	}
 	.header-bottom-foot-view image{
-		margin-right: 3px;
+		margin-right: 1px;
 	}
 	.header-bottom-foot-view{
 		display: flex;
@@ -441,10 +423,9 @@
 		padding: 1px 8px;
 		height: 22px;
 		line-height: 22px;
-		background-color: rgba(230, 246, 243, 1);
 		border-radius: 15px;
 		font-weight: 400;
-		font-size: 10px;
+		font-size: 11px;
 		color: #029c88;
 	}
 	.header-bottom-foot-view2-img1{
@@ -487,13 +468,6 @@
 		color: #08A28A;
 		margin-top: 5px;
 	}
-	.header-bottom-foot-cont{
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
 	.header-bottom-top-list{
 		width: 100%;
 		display: flex;
@@ -501,12 +475,21 @@
 		align-items: center;
 		background-color: rgba(230, 246, 243, 0.6);
 	}
+	.header-bottom-foot-cont{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 	.header-bottom-foot{
 		width: 100%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		margin-top: 26rpx;
+		margin-top: 20rpx;
+		border-top: 1px solid #f7f7f7;
+		padding: 20rpx  20rpx 0rpx 20rpx;
 	}
 	.header-bottom-money-jia{
 		font-size: 28rpx;