修改

my/order/pay.vue

@@ -57,7 +57,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="add-content">
+				<!--<view class="add-content">
 					<view class="" v-if="order.artificer">
 						<view class="flex align-center justify-between jusitify-line">
 							<view class="line-word title-font">客户姓名</view>
@@ -76,8 +76,17 @@
 							<view class="line-word-r value-font" style="width: 75%; text-align: right;">{{order.address}}</view>
 						</view>
 					</view>
+				</view>-->
+				<view class="add-content">
+					<view class="" v-if="order.artificer">
+						<view class="Service-add">服务地址</view>
+						<view class="Service-Address">{{order.address}}</view>
+						<view class="Service-name">
+							<span>{{order.userName}}</span>
+							<span>{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}</span>
+						</view>
+					</view>
 				</view>
-
 				<view class="margin-top-xl pay-ding">
 					<view class="flex align-center pay-ding-top">
 						<image :src="order.artificer.lifePhoto" class="d-touxiang"></image>
@@ -2972,11 +2981,12 @@ page {
   align-items: center;
 }
 .add-content{
-  background: #fff;
+	  background: #FFFFFF url(../../static/address/map.png)no-repeat top right;
-  padding: 30rpx;
+	  background-size:40%;
-  border-radius: 24rpx;
+	  padding: 30rpx;
-  margin-top: 24rpx;
+	  border-radius: 24rpx;
-}
+	  margin-top: 24rpx;
+	}
 .add-lin{
   height: 74rpx;
   line-height: 74rpx;
@@ -3055,4 +3065,32 @@ page {
 	font-size: 30rpx;
 	color: #333333;
 }
+.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>

my/order/payModify.vue

@@ -1,27 +1,6 @@
 <template>
 	<view class="content">
 		<view class="padding-bottom u-skeleton">
-			<view class="header-view header-padd header-margin flex justify-between add-content">
-				<view>
-					<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 class="jusitify-line" v-if="order.remark">
-						<view class="line-word title-font">备注内容</view>
-						<view class="flex">
-							<view class="value-font">
-								{{order.remark}}
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="Service-more" @click="getAddressList()"></view>
-			</view>
-
 			<view class="bgImg u-skeleton-fillet">
 				<view class="head-top">
 					<view class="pay-title">服务项目</view>
@@ -64,7 +43,26 @@
 					</view>
 				</view>
 			</view>
-
+			<view class="header-view header-padd header-margin flex justify-between add-content">
+				<view  @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 class="jusitify-line" v-if="order.remark">
+						<view class="line-word title-font">备注内容</view>
+						<view class="flex">
+							<view class="value-font">
+								{{order.remark}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="Service-more"></view>
+			</view>
 			<view class="header-view header-padd header-margin">
 				<view class="jusitify-line" @click="liliaoshi">
 					<view class="line-word title-font" >
@@ -2166,12 +2164,13 @@
 		margin-top:58rpx;
 		}
 	.server-yuhui{
-		background: linear-gradient(90deg, #fc5f28, #fe3d24);
+		background: #fdeee9;
-		border-radius:6rpx;
+	    font-size: 14px;
-		color: #fff;
+	    color: #FF6000;
-		font-size:24rpx;
+	    border-radius: 17px;
-		padding: 0rpx 10rpx;
+	    height: 28px;
-		line-height: 42rpx;
+	    line-height: 28px;
+	    padding: 0 14px;
 	}
 	.add-content{
 	  background: #FFFFFF url(../../static/address/map.png)no-repeat top right;

my/order/payModifyTc.vue

@@ -47,8 +47,9 @@
 					<view class="detail-foot-list" v-for="(item,index) in detailData" :key="index" @click="detail(item)">
 						<view class="detail-foot-list-top">
 							<span style="margin-right: 5px;">{{item.title}}</span>
-							<!-- <span style="display: none;">详情</span> -->
+							<!-- <span style="display: none;">详情</span> 
-							<span style="margin-left: 5px;">{{orderXm.levelName}}</span>
+							<span style="margin-left: 5px;">{{orderXm.levelName}}</span>-->
+							<image style="width:100rpx; height:38rpx;" :src="order.technicianType=='3'?'../../static/vip/grade1.gif':order.technicianType=='4'?'../../static/vip/grade2.gif':'../../static/vip/grade3.gif'" mode=""></image>
 						</view>
 						<view class="detail-view">
 							<image class="detail-view-img" :src="item.massageImg" mode=""></image>