diff --git a/my/order/pay.vue b/my/order/pay.vue
index f216c02..8b32c64 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -202,14 +202,25 @@
 							<view class="justify-title-nav-bor"></view>
 						</view>
 						<view class="flex justify-between add-lin">
+<<<<<<< .mine
 							<view class="add-con-title">订单费用：</view>
 							<view class="add-con-cont">￥<text
 									style="font-size: 26rpx; font-weight: bold;">{{order.price}}</text></view>
+=======
+							<view class="add-con-title">订单费用：</view>
+							<view class="add-con-cont">￥<text>{{order.price}}</text></view>
+
+>>>>>>> .theirs
 						</view>
+<<<<<<< .mine
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">出行费用：</view>
+=======
+						<view>
+							<view class="add-con-title">出行费用：</view>
+>>>>>>> .theirs
 							<view class="add-con-cont">￥<text
-									style="font-weight: bold;">{{order.taxiMoney}}</text></view>
+									>{{order.taxiMoney}}</text></view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">优惠券：</view>
diff --git a/my/order/payding.vue b/my/order/payding.vue
index 071017f..c6df1a3 100644
--- a/my/order/payding.vue
+++ b/my/order/payding.vue
@@ -7,7 +7,7 @@
 			<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
 				style="padding: 0 29rpx;">
 				<view class="head-top">
-					<view class="pay-title" style="">服务项目1111</view>
+					<view class="pay-title">服务项目1111</view>
 					<view class="flex justify-around">
 						<view class="" style="width: 160upx;height: 160upx;">
 							<image :src="order.ordersMassageList[0].massageType.massageImg"
@@ -15,7 +15,7 @@
 						</view>
 						<view class="u-flex-1  margin-left-sm">
 							<view class="flex head-title-right">
-								<view class="margin-right-xs text-df u-skeleton-fillet head-title">
+								<view class="head-text">
 									{{order.ordersMassageList[0].massageType.title}}
 								</view>
 								<view class="zhuangtai">
@@ -62,21 +62,21 @@
 				</view>
 				<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
 					<view class="" v-if="order.artificer">
-						<view class="flex align-center justify-between">
-							<view class="" style="color: #999;font-size: 26rpx;">下单人</view>
-							<view style="color: #333;font-size: 26rpx;">
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">下单人</view>
+							<view class="add-con-cont">
 								{{order.userName}}
 							</view>
 						</view>
-						<view class="flex align-center justify-between" style="margin-top: 19rpx;">
-							<view class="" style="color: #999;font-size: 26rpx;">联系方式</view>
-							<view style="color: #333;font-size: 26rpx;">
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">联系方式</view>
+							<view class="add-con-cont">
 								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
 							</view>
 						</view>
 						<view class="serverAddress">
-							<view style="color: #999;font-size: 26rpx;margin-top: 19rpx;">服务地址</view>
-							<view style="color: #333333;margin-top: 8rpx;font-size: 26rpx;width: 73%;">{{order.address}}</view>
+							<view class="add-con-title">服务地址</view>
+							<view style="color: #666;margin-top: 8rpx;font-size: 30rpx;width: 73%; text-align: right;">{{order.address}}</view>
 						</view>
 					</view>
 				</view>
@@ -94,7 +94,7 @@
 								<!-- <image src="../../static/img/phone.png" class="phone-pay"
 									@click="bindphone(order.artificer.phone)"></image> -->
 							</view>
-							<view>{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view>
+							<view class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view>
 							<!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
 								<view class="margin-right">
 									<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
@@ -107,18 +107,21 @@
 						</view>
 					</view>
 					<view class="list-pay">
-						<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">订单信息</view>
-						<view class="flex justify-between" style="margin-top: 19rpx;">
-							<view style="color: #999;font-size: 26rpx;">订单编号</view>
+						<view class="justify-title-nav ">
+							<view class="justify-title">订单信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view  class="add-con-title">订单编号</view>
 							<view class="flex align-center" @tap="copy(order.ordersNo)"
-								style="color: #333;font-size: 26rpx;">
+								style="color: #333;font-size: 30rpx;">
 								<view class="">{{order.ordersNo}}</view>
 								<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
 							</view>
 						</view>
-						<view class="flex justify-between" style="margin-top: 19rpx;">
-							<view style="color: #999;font-size: 26rpx;">预约时间</view>
-							<view class="" style="color: #333;font-size: 26rpx;">{{order.serveTime}}</view>
+						<view class="flex justify-between add-lin">
+							<view  class="add-con-title">预约时间</view>
+							<view class="add-con-cont">{{order.serveTime}}</view>
 						</view>
 						
 						<!-- <view class="flex justify-between" v-if="order.startTime" style="margin-top: 19rpx;">
@@ -137,68 +140,79 @@
 							<view style="color: #999;font-size: 26rpx;">预计结束服务时间</view>
 							<view class="" style="color: #333;font-size: 26rpx;">{{order.endTime}}</view>
 						</view> -->
-						<view class="flex justify-between bottom-view">
-							<view style="color: #999;font-size: 26rpx;">下单时间</view>
-							<view class="" style="color: #333;font-size: 26rpx;">{{order.createTime}}</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">下单时间</view>
+							<view class="add-con-cont">{{order.createTime}}</view>
 						</view>
-						
-						<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">订单费用</view>
-						<view class="flex justify-between" style="margin-top: 19rpx;">
-							<view style="color: #999;font-size: 26rpx;">项目名称</view>
-							<view class="" style="color: #333;font-size: 26rpx;">{{order.ordersMassageList[0].massageType.title}}</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav ">
+							<view class="justify-title">订单费用</view>
+							<view class="justify-title-nav-bor"></view>
 						</view>
-						<view class="flex justify-between" style="margin-top: 19rpx;">
-							<view style="color: #999;font-size: 26rpx;">服务时长</view>
-							<view class="" style="color: #333;font-size: 26rpx;">{{order.ordersMassageList[0].massageType.duration}}分钟</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">项目名称</view>
+							<view class="add-con-cont">{{order.ordersMassageList[0].massageType.title}}</view>
 						</view>
-						<view class="flex justify-between">
-							<view style="color: #999;font-size: 26rpx;">项目价格</view>
-							<view class="" style="color: #333;font-size: 26rpx;">￥{{order.massagePrice}}</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">服务时长</view>
+							<view class="add-con-cont">{{order.ordersMassageList[0].massageType.duration}}分钟</view>
+						</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">项目价格</view>
+							<view class="add-con-cont">￥{{order.massagePrice}}</view>
 						</view> 
-						<view class="flex justify-between" style="margin-top: 19rpx;">
-							<view style="color: #999;font-size: 26rpx;">会员折扣</view>
-							<view class="" style="color: #333;font-size: 26rpx;">{{order.vipRate}}%</view>
+						<view class="flex justify-between add-lin" >
+							<view class="add-con-title">会员折扣</view>
+							<view class="add-con-cont">{{order.vipRate}}%</view>
 						</view> 
-						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;border-bottom:1px solid #ccc;padding-bottom:5px ;margin: 5px 0px;">
+						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
 							<view style="color: #333;font-size: 26rpx;">小计：</view>
 							<view class="" style="color: #333;">￥<text
 									style="font-size: 35rpx;font-weight: bold;">{{order.massagePrice}}</text></view>
 						</view>
 						
-						<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">出行费用</view>
-						<view class="flex justify-between" v-if="order.tripWay" style="margin-top: 19rpx;">
-							<view style="color: #999;font-size: 26rpx;">出行方式</view>
-							<view v-if="order.tripWay == 1">公交</view>
-							<view v-if="order.tripWay == 2">出租</view>
-							<view v-if="order.tripWay == 3">免费</view>
-						</view>
-						<view class="flex justify-between" v-if="order.km" style="margin-top: 19rpx;">
-							<view style="color: #999;font-size: 26rpx;">全程距离</view>
-							<view class="" style="color: #333;font-size: 26rpx;">{{order.km}}km</view>
-						</view>
-						<view class="flex justify-between bottom-view" v-if="order.taxiMoney">
-							<view style="color: #999;font-size: 26rpx;">出行交通费用</view>
-							<view class="" style="color: #333;font-size: 26rpx;">￥{{order.taxiMoney}}</view>
-						</view>
+						<view class="jusitify-line-end"></view>
 						
-						<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">优惠券信息</view>
-						<view class="flex justify-between justify-between" v-if="order.couponMoney">
-							<view style="color: #999;font-size: 26rpx;">优惠券</view>
-							<view class="" style="color: #F93731;font-size: 26rpx;">-￥{{order.couponMoney}}</view>
+						<view class="justify-title-nav ">
+							<view class="justify-title">出行费用</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.tripWay">
+							<view class="add-con-title">出行方式</view>
+							<view class="add-con-cont" v-if="order.tripWay == 1">公交</view>
+							<view class="add-con-cont" v-if="order.tripWay == 2">出租</view>
+							<view class="add-con-cont" v-if="order.tripWay == 3">免费</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.km">
+							<view class="add-con-title">全程距离</view>
+							<view class="add-con-cont">{{order.km}}km</view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.taxiMoney">
+							<view class="add-con-title">出行交通费用</view>
+							<view class="add-con-cont">￥{{order.taxiMoney}}</view>
+						</view>
+						<view class="jusitify-line-end"></view>
+						<view class="justify-title-nav ">
+							<view class="justify-title">优惠券信息</view>
+							<view class="justify-title-nav-bor"></view>
+						</view>
+						<view class="flex justify-between add-lin" v-if="order.couponMoney">
+							<view class="add-con-title">优惠券</view>
+							<view class="add-con-cont" style="color: rgb(249, 55, 49); font-weight: bold;">-￥{{order.couponMoney}}</view>
 						</view>
 						
 						
-						<view class="flex justify-between" v-if="order.addNum" style="margin-top: 19rpx;">
-							<view style="color: #999;font-size: 26rpx;">加钟次数</view>
-							<view class="" style="color: #333;font-size: 26rpx;">{{order.addNum}}</view>
+						<view class="flex justify-between add-lin" v-if="order.addNum" style="margin-top: 19rpx;">
+							<view class="add-con-title">加钟次数</view>
+							<view class="add-con-cont">{{order.addNum}}</view>
 						</view>
-						<view class="flex justify-between" v-if="order.addTime" style="margin-top: 19rpx;">
-							<view style="color: #999;font-size: 26rpx;">加钟时长</view>
-							<view class="" style="color: #333;font-size: 26rpx;">{{order.addTime}}分钟</view>
+						<view class="flex justify-between add-lin" v-if="order.addTime" style="margin-top: 19rpx;">
+							<view class="add-con-title">加钟时长</view>
+							<view class="add-con-cont">{{order.addTime}}分钟</view>
 						</view>
-						<view class="flex justify-between" v-if="order.addMoney" style="margin-top: 19rpx;">
-							<view style="color: #999;font-size: 26rpx;">加钟费用</view>
-							<view class="" style="color: #F93731;font-size: 26rpx;">￥{{order.addMoney}}</view>
+						<view class="flex justify-between add-lin" v-if="order.addMoney" style="margin-top: 19rpx;">
+							<view class="add-con-title">加钟费用</view>
+							<view class="add-con-cont">￥{{order.addMoney}}</view>
 						</view>
 						<!-- <view class="textarea-pay-list">
 							<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
@@ -230,19 +244,19 @@
 				<view class="pay-ding feiuong">
 					<view class="fei-title">费用明细</view>
 					<view class="fei-view">
-						<view class="flex align-center margin-top-lg justify-between">
-							<view style="color: #333;font-size: 26rpx;">订单费用：</view>
-							<view class="" style="color: #333;">￥<text
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">订单费用：</view>
+							<view class="add-con-cont">￥<text
 									style="font-size: 26rpx;font-weight: bold;">{{order.massagePrice}}</text></view>
 						</view>
-						<view class="flex align-center margin-top-lg justify-between" v-if="order.taxiMoney">
-							<view style="color: #333;font-size: 26rpx;">出行费用：</view>
-							<view class="" style="color: #333;">￥<text
+						<view class="flex justify-between add-lin" v-if="order.taxiMoney">
+							<view class="add-con-title">出行费用：</view>
+							<view class="add-con-cont">￥<text
 									style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
 						</view>
-						<view class="flex align-center margin-top-lg justify-between">
-							<view style="color: #333;font-size: 26rpx;">优惠券：</view>
-							<view class="" style="color: #F93731;" v-if="order.couponMoney">
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">优惠券：</view>
+							<view class="add-con-cont" style="color: #F93731;" v-if="order.couponMoney">
 								-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view>
 							<view class="" v-else>-</view>
 						</view>
@@ -269,21 +283,17 @@
 							<span>出行费用</span>
 							<span>￥{{order.taxiMoney}}</span>
 						</view> -->
-						<view class="fei-view-list-z">
-							<span>总金额</span>
-							<span style="color: #FF3939;font-size: 29rpx;">￥{{order.sumMoney}}</span>
-						</view>
+					<view class="fei-view-list-z">
+						<span>总金额</span>
+						<span style="color: #FF3939;font-size: 32rpx;">￥{{order.sumMoney}}</span>
+					</view>	
 					</view>
 				</view>
 			</view>
 
 			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
 				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
-					v-if="order.status != 3 &&
-						order.status != 4 && 
-						order.status != 5&& 
-						order.status != 10"
-					>取消订单
+					v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
 				</u-button>
 				<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
 					v-if="order.status == 1"
@@ -1735,13 +1745,13 @@
 	}
 	.zhuangtai{
 		color: #029D88;
+		font-weight: bold;
 	}
 	.head-title-right{
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
-		font-weight: bold;
 	}
 	.head-title{
 		margin-top: -2px;display: inline-block;
@@ -1757,8 +1767,8 @@
 	.fei-view-list-z{
 		height: 65rpx;
 		background-color: rgba(247, 247, 247, 0.8);
-		border-radius: 33rpx;
-		padding: 0px 5px;
+		border-radius:30rpx;
+		padding: 0 20rpx;
 	}
 	.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
 		color: #666666;
@@ -1820,11 +1830,11 @@
 	}
 	.pay-ding-top{
 		width: 100%;
-		height: 80rpx;
-		background-image: linear-gradient(to bottom, rgba(8, 162, 138, 0.5), #fff);
-		border-top-left-radius: 24rpx;
-		border-top-right-radius: 24rpx;
-		padding: 0px 29rpx;
+		height: 50px;
+		background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
+		border-top-left-radius: 12px;
+		border-top-right-radius: 12px;
+		padding: 0px 14px;
 	}
 	.pay-ding,.feiuong{
 		background-color: #ffffff;
@@ -1838,8 +1848,9 @@
 	}
 	.d-title{
 		font-weight: 400;
-		font-size: 25rpx;
+		font-size: 32rpx;
 		color: #333333;
+		font-weight: bold;
 	}
 	.d-touxiang{
 		width: 46rpx;
@@ -1887,9 +1898,9 @@
 	}
 	.pay-title{
 		font-weight: bold;
-		font-size: 28rpx;
+		font-size: 32rpx;
 		color: #333333;
-		margin-bottom: 5px;
+		margin-bottom: 8px;
 	}
 	page {
 		background: #f7f7f7;
@@ -2068,4 +2079,63 @@
 		justify-content: space-between;
 		align-items: center;
 	}
+	.head-text{
+		font-size:30rpx;
+	}
+	.zhuangtai{
+		color: #029D88;
+	}
+	.level_button{
+		padding: 3rpx 13rpx;
+		background: linear-gradient(to right, #fe9131, #ff9869);
+		border-radius: 16rpx 16rpx 16rpx 1rpx ;
+		color: #fff;
+		font-size: 12px;
+	}
+	.add-lin{
+		height: 80rpx;
+		line-height: 80rpx;
+	}
+	.add-con-title{
+		color: #999;
+		font-size: 30rpx;
+	}
+	.add-con-cont{
+		color: #666;
+		font-size: 30rpx;
+		line-height: 80rpx;
+		text-align:right;
+	}
+	.level_button{
+		padding: 3rpx 13rpx;
+		background: linear-gradient(to right, #fe9131, #ff9869);
+		border-radius: 16rpx 16rpx 16rpx 1rpx ;
+		color: #fff;
+		font-size: 12px;
+	}
+	.justify-title-nav{
+		width: 90%;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		margin: 10px 0;
+	}
+	.justify-title-nav-bor{
+		width: 64px;
+		height: 5px;
+		border-radius: 3px;
+		position: absolute;
+		bottom: 0;
+		background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7));
+	}
+	.justify-title{
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333;
+	}
+	.jusitify-line-end{
+	    height: 1px;
+	    border-bottom: 1px #f4f4f4 solid;
+	    margin: 15px 0;
+	}
 </style>
\ No newline at end of file