diff --git a/my/hongbao/xinrenhongbao.vue b/my/hongbao/xinrenhongbao.vue
index 451bff1..f9f798b 100644
--- a/my/hongbao/xinrenhongbao.vue
+++ b/my/hongbao/xinrenhongbao.vue
@@ -33,7 +33,7 @@
 				</checkbox-group>
 			</template> 
 		</t-refresh>
-		<view class="queding" @tap="shiYong()">
+		<view class="push-button" @tap="shiYong()">
 			<span class="que-btn">立即使用</span>
 		</view>
 		<empty v-if="hongbao.length==0"></empty>
@@ -150,6 +150,16 @@
 		height: 870px !important;
 		margin-bottom: 60rpx;
 	}
+	.push-button{
+		    width: 100%;
+		    height: 48px;
+		    position: fixed;
+		    bottom: 0px;
+		    display: flex;
+		    flex-direction: column;
+		    align-items: center;
+			margin: 0 auto;
+	}
 	.que-btn{
 		display: inline-block;
 		width: 90%;
@@ -160,6 +170,7 @@
 		color: #ffffff;
 		line-height: 38px;
 		margin-top: 4px;
+		font-size: 34rpx;
 	}
 	/deep/.page-box{
 		width: 100%;
@@ -168,17 +179,7 @@
 		width: 111.81rpx;
 		height: 111.81rpx;
 	}
-	.queding{
-		    width: 100%;
-		    height: 48px;
-		    background-color: #fff;
-		    position: fixed;
-		    bottom: 0px;
-		    display: flex;
-		    flex-direction: column;
-		    align-items: center;
-			margin: 0 auto;
-	}
+
 	.youhui-view-right-time{
 		font-weight: 400;
 		font-size: 22rpx;
diff --git a/my/order/pay.vue b/my/order/pay.vue
index 638a540..0b2bf8a 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -150,7 +150,7 @@
 						</view>
 					
 						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
-							<view style="color: #333;font-size: 26rpx;">
+							<view class="add-con-title">
 								小计：
 						    </view>
 							<view class="" style="color: #333;">
@@ -197,7 +197,11 @@
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">订单费用：</view>
+<<<<<<< .mine
 							<view class="add-con-cont">￥<text style="font-size: 26rpx; font-weight: bold;">{{order.priceMarkup}}</text></view>
+=======
+							<view class="add-con-cont">￥<text>{{order.massageMoney}}</text></view>
+>>>>>>> .theirs
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">出行费用：</view>
@@ -271,7 +275,7 @@
 						</view>
 						
 						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
-							<view style="color: #333;font-size: 26rpx;">
+							<view class="add-con-title">
 								小计：
 						    </view>
 							<view class="" style="color: #333;">
@@ -318,7 +322,7 @@
 						</view>
 						<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.massageMoney}}</text></view>
+							<view class="add-con-cont">￥<text>{{order.massageMoney}}</text></view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">出行费用：</view>
@@ -361,10 +365,10 @@
 					修改订单
 				</u-button> -->
 				<u-button @click="zhifu(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
-					class="dingshi">立即支付
+					class="btns">立即支付
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==2">
 				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
@@ -375,35 +379,35 @@
 					:custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
-					class="dingshi">
+					class="btns">
 					修改订单
 				</u-button>
 			
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==3">
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true"
 					@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
-					class="dingshi">
+					class="btns">
 					去评价
 				</u-button>
 				<u-button :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="btns">
 					去投诉
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==4">
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==5">
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status==6" :style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}">
 				<view class="gengduo" @click.stop="gengBtn">更多</view>
@@ -438,7 +442,7 @@
 				</view>
 				<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
 					<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-						class="dingshi">联系客服</u-button>
+						class="btns">联系客服</u-button>
 					<u-button @click="cancelOrder(order)" shape="circle" class="btns" :hair-line="false">
 						取消订单
 					</u-button>
@@ -451,7 +455,7 @@
 					<u-button :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="btns">
 						去投诉
 					</u-button>
 					
@@ -467,11 +471,11 @@
 					:custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
-					class="dingshi">
+					class="btns">
 					修改订单
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==8">
 				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
@@ -483,25 +487,25 @@
 					:custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
-					class="dingshi">
+					class="btns">
 					修改订单
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==9">
-				<u-button class="dingshi" @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 v-if="order.refusalContent" :custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="toggleQ('center',order)"
-					class="dingshi">
+					class="btns">
 					拒单详情
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==10">
 				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
@@ -512,17 +516,17 @@
 					v-if="order.packageType=='104'||order.packageType=='105'||order.packageType=='106'"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
-					class="dingshi">
+					class="btns">
 					立即预约
 				</u-button>
 				<u-button v-else :custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
-					class="dingshi">
+					class="btns">
 					立即预约
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 		</view>
 		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
@@ -714,8 +718,9 @@
 				orderList: [],
 				loading: true,
 				customStyle: {
-					backgroundColor: '#e5e5e5',
-					color: '#FFFFFF',
+					backgroundColor: '#ffffff',
+					border:' 1px solid #999',
+					color: '#333',
 
 					// #ifdef MP-WEIXIN
 					width: "310upx",
@@ -2344,7 +2349,7 @@
 <style lang="scss" scoped>
 	
 	/deep/.u-size-default{
-		width: 80px !important;
+		width: 85px !important;
 	}
 	/deep/.padding-bottom{
 		padding-bottom: 20rpx;
@@ -2526,8 +2531,8 @@
 		flex-direction: column;
 	}
 	/deep/.btns{
-		background: #019C88 !important;
-		color: #fff !important;
+		color: #333333 !important;
+		margin-left: 10rpx !important;
 	}
 	/deep/.u-size-default{
 		// margin: 5px 0px 0px 0px;
@@ -2923,8 +2928,8 @@
 		margin-top: 24rpx;
 	}
 	.add-lin{
-		height: 80rpx;
-		line-height: 80rpx;
+		height: 74rpx;
+		line-height: 74rpx;
 	}
 	.add-con-title{
 		color: #999;
@@ -2933,7 +2938,7 @@
 	.add-con-cont{
 		color: #666;
 		font-size: 30rpx;
-		line-height: 80rpx;
+		line-height: 74rpx;
 		text-align:right;
 	}
 	.level_button{
diff --git a/my/order/payJaZ.vue b/my/order/payJaZ.vue
index 385b6a1..a6df5e4 100644
--- a/my/order/payJaZ.vue
+++ b/my/order/payJaZ.vue
@@ -149,9 +149,8 @@
 							<view class="add-con-title">会员减免</view>
 							<view class="add-con-cont" >-￥{{order.vipReductionMoney}}</view>
 						</view>
-						
 						<view class="jusitify-line">
-							<view style="color: #333;font-size: 26rpx;">
+							<view class="line-word">
 								小计：
 						    </view>
 							<view class="" style="color: #333;">
@@ -221,9 +220,9 @@
 								<view class="add-con-title">会员减免</view>
 								<view class="add-con-cont" >-￥{{order.addVipReductionMoney}}</view>
 							</view>
-							
+
 							<view class="jusitify-line">
-								<view style="color: #333;font-size: 26rpx;">小计：</view>
+								<view  class="line-word">小计：</view>
 								<view class="" style="color: #333;">￥<text
 										style="font-size: 35rpx;font-weight: bold;">{{order.addMoney}}</text></view>
 							</view>
@@ -237,10 +236,8 @@
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">订单费用：</view>
-							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
-							<view class="line-word-r" v-else>￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
+							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text>{{order.massageMoney}}</text></view>
+							<view class="line-word-r" v-else>￥<text>{{order.oldMassageMoney}}</text></view>
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">出行费用：</view>
@@ -250,7 +247,7 @@
 						<view class="jusitify-line">
 							<view class="line-word">优惠券：</view>
 							<view class="" style="color: #F93731;" v-if="order.couponMoney">
-								-￥<text style="font-size: 26rpx;font-weight: bold;">
+								-￥<text style="font-size: 30rpx;font-weight: bold;">
 									{{order.couponMoney}}
 								</text>
 							</view>
@@ -258,16 +255,16 @@
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">加钟费用：</view>
-							<view class="" style="color: #333;" >
-								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
+							<view class="line-word-r"  >
+								<text v-if="order.addMoney">
 									￥{{order.addMoney}}
 								</text>
-								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+								<text class="line-word-r" v-else>-</text>
 							</view>
 						</view>
 						
 						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
-							<view style="color: #333;font-size: 26rpx;">合计：</view>
+							<view class="line-word">合计：</view>
 							<view class="line-word-r">￥
 								<text style="font-size: 35rpx;font-weight: bold;">
 									{{order.payMoneyTotal}}
@@ -286,7 +283,7 @@
 						<view class="jusitify-line">
 							<view class="line-word">订单编号</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>
@@ -327,7 +324,7 @@
 						
 						
 						<view class="jusitify-line">
-							<view style="color: #333;font-size: 26rpx;">
+							<view class="line-word">
 								小计：
 						    </view>
 							<view class="" style="color: #333;">
@@ -397,9 +394,9 @@
 								<view class="add-con-title">会员减免</view>
 								<view class="add-con-cont" >-￥{{order.addVipReductionMoney}}</view>
 							</view>
-							
+
 							<view class="jusitify-line">
-								<view style="color: #333;font-size: 26rpx;">小计：</view>
+								<view class="line-word">小计：</view>
 								<view class="" style="color: #333;">￥<text
 										style="font-size: 35rpx;font-weight: bold;">{{order.addMoney}}</text></view>
 							</view>
@@ -413,20 +410,18 @@
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">订单费用：</view>
-							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
-							<view class="line-word-r" v-else>￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
+							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text>{{order.massageMoney}}</text></view>
+							<view class="line-word-r" v-else>￥<text>{{order.oldMassageMoney}}</text></view>
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">出行费用：</view>
-							<view class="line-word-r" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view>
-							<view class="line-word-r" v-else>-</view>
+							<view class="line-word-r"  v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view>
+							<view class="line-word-r"  v-else>-</view>
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">优惠券：</view>
 							<view class="" style="color: #F93731;" v-if="order.couponMoney">
-								-￥<text style="font-size: 26rpx;font-weight: bold;">
+								-￥<text >
 									{{order.couponMoney}}
 								</text>
 							</view>
@@ -434,16 +429,16 @@
 						</view>
 						<view class="jusitify-line">
 							<view class="line-word">加钟费用：</view>
-							<view class="" style="color: #333;" >
-								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
+							<view class="line-word-r" >
+								<text v-if="order.addMoney">
 									￥{{order.addMoney}}
 								</text>
-								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+								<text class="line-word-r" v-else>-</text>
 							</view>
 						</view>
 						
 						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
-							<view style="color: #333;font-size: 26rpx;">合计：</view>
+							<view class="line-word">合计：</view>
 							<view class="line-word-r">￥
 								<text style="font-size: 35rpx;font-weight: bold;">
 									{{order.payMoneyTotal}}
@@ -513,12 +508,12 @@
 						<u-button :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="btns">
 							去投诉
 						</u-button>
 						<u-button :custom-style="customStyle2" shape="circle" :plain="true"
 							@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
-							class="dingshi">
+							class="btns">
 							去评价
 						</u-button>
 						<u-button shape="circle" :plain="true" @click="goChat"
@@ -2156,7 +2151,7 @@
 	}
 	.list-pay{
 		width: 100%;
-		padding: 0 29rpx 20rpx 29rpx ;
+		padding: 0 32rpx 20rpx 32rpx ;
 	}
 	.pay-ding-top{
 		width: 100%;
diff --git a/my/order/payModify.vue b/my/order/payModify.vue
index 933b848..53542e5 100644
--- a/my/order/payModify.vue
+++ b/my/order/payModify.vue
@@ -41,30 +41,29 @@
 				<view class="ske-padding margin-top-sm header-view">
 					<view v-if="!detailaddress">请选择地址</view>
 					<view class="margin-right-xs">
-						<view class="flex justify-between margin-top-lg">
-							<view class="header-view-text">联系人</view>
-							<view class="header-view-data">
+						<view class="jusitify-line">
+							<view class="line-word">联系人</view>
+							<view class="line-word-r" >
 								<text>{{name}}</text>
 								<text class="xuanzhe" @click="getAddressList()">修改</text>
 							</view>
 						</view>
-						<view class="flex justify-between margin-top-lg">
-							<view class="header-view-text">手机号码</view>
-							<view class="header-view-data">
+						<view class="jusitify-line">
+							<view class="line-word">手机号码</view>
+							<view class="line-word-r">
 								{{mobile}}
 							</view>
 						</view>
-						<view class="flex justify-between margin-top-lg">
-							<view class="header-view-text">详细地址</view>
-							<view class="flex adders-view">
+						<view class="jusitify-line">
+							<view class="line-word">详细地址</view>
+							<view class="line-word-r" style="width: 73%; text-align: right;">
 									<span>
 										{{province}}/{{city}}/{{district}}/{{detailaddress}}
 									</span>
-									<span class="view-more"></span>
 							</view>
 						</view>
-						<view class="flex justify-between margin-top-lg" v-if="order.remark">
-							<view style="width: 170rpx;">备注内容</view>
+						<view class="jusitify-line" v-if="order.remark">
+							<view class="line-word">备注内容</view>
 							<view class="flex">
 								<view class="">
 									{{order.remark}}
@@ -128,8 +127,10 @@
 			</view>
 
 
+			<view class="push-button">
+				<view class="pay_btn" @click="openpay()">去支付</view>
+			</view>
 			
-			<view class="pay_btn" @click="openpay()"><span class="pay-btns">去支付</span></view>
 		
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
@@ -1311,6 +1312,24 @@
 </script>
 
 <style lang="scss" scoped>
+	.jusitify-line{
+		height: 78rpx;
+		padding: 20rpx 0;
+		font-size: 30rpx;
+		display: flex;
+		justify-content: space-between;
+	}
+	.jusitify-line-end{
+		height:1px;
+		border-bottom: 1px #e5e5e5 solid;
+		margin: 30rpx 0;
+	}
+	.line-word{
+		color: #999;
+	}
+	.line-word-r{
+		color: #333;
+	}
 	.head-bottom{
 		width: 68%;
 		display: flex;
@@ -1553,14 +1572,14 @@
 	}
 	.xuanzhe{
 		background: linear-gradient(90deg, #029d88, #2fc094);
-		color: #ffffff;
-		margin-left: 5px;
-		border-radius: 30rpx;
-		height:50rpx;
-		line-height: 50rpx;
-		width: 100rpx;
-		text-align:center;
-		font-size: 26rpx;
+		 color: #ffffff;
+		    margin-left: 5px;
+		    border-radius: 15px;
+		    height: 25px;
+		    line-height: 25px;
+		    width: 50px;
+		    text-align: center;
+		    font-size: 13px;
 	}
 	.header-view-data{
 		display: flex;
@@ -1970,16 +1989,28 @@
 
 	}
 
-	.pay_btn {
-	    width: 100%;
-	    height: 50px;
-	    position: fixed;
-	    bottom: 0px;
-	    display: flex;
-	    flex-direction: column;
-	    align-items: center;
-	    z-index: 666;
-	}
+	.push-button{
+		width: 100%;
+		height: 48px;
+		position: fixed;
+		bottom: 0px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin: 0 auto;
+		}
+	.pay_btn{
+		display: inline-block;
+		width: 92%;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height: 40px;
+		border-radius: 28px;
+		color: #ffffff;
+		line-height: 40px;
+		margin-top: 4px;
+		font-size: 34rpx;
+		}
 	.pay-btns{
 		display: inline-block;
 	    width: 94%;
diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue
index ca57b06..4d6c730 100644
--- a/my/order/payModifyDd.vue
+++ b/my/order/payModifyDd.vue
@@ -49,29 +49,29 @@
 				<view class="padding margin-top-sm header-view">
 					<view v-if="!detailaddress">请选择地址</view>
 					<view class="margin-right-xs">
-						<view class="flex justify-between margin-top-lg">
-							<view class="header-view-text">联系人</view>
-							<view class="header-view-data">
+						<view class="jusitify-line">
+							<view class="line-word">联系人</view>
+							<view class="line-word-r">
 								<text>{{name}}</text>
 								<text class="xuanzhe" @click="getAddressList()">修改</text>
 							</view>
 						</view>
-						<view class="flex justify-between margin-top-lg">
-							<view class="header-view-text">手机号码</view>
-							<view class="header-view-data">
+						<view class="jusitify-line">
+							<view class="line-word">手机号码</view>
+							<view class="line-word-r">
 								{{mobile}}
 							</view>
 						</view>
-						<view class="flex justify-between margin-top-lg">
-							<view class="header-view-text">详细地址</view>
-							<view class="flex adders-view">
+						<view class="jusitify-line">
+							<view class="line-word">详细地址</view>
+							<view class="line-word-r" style="width: 73%; text-align: right;">
 									<span>
 										{{province}}/{{city}}/{{district}}/{{detailaddress}}
 									</span>
 									<span class="view-more"></span>
 							</view>
 						</view>
-						<!-- <view class="flex justify-between margin-top-lg" v-if="order.remark">
+						<!-- <view class="jusitify-line" v-if="order.remark">
 							<view style="width: 170rpx;">备注内容</view>
 							<view class="flex">
 								<view class="">
@@ -114,10 +114,10 @@
 						</view> -->
 						<view class="flex align-center justify-between"
 							style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
-							<view class="flex justify-between margin-tb-sm" @click="openData()">
+							<view class="flex justify-between margin-tb-sm" @click="openData()" style="align-items: center;">
 								<view v-if="startTime">{{startTime}}</view>
-								<view class="tetx-sm" style="color:#999999; font-size: 30rpx;" v-else>请选择预约时间</view>
-								<u-icon name="arrow-right" color="#999999"></u-icon>
+								<view class="tetx-sm" v-else>请选择预约时间</view>
+								<span class="view-more"></span>
 							</view>
 						</view>
 					</view>
@@ -154,8 +154,9 @@
 			</view>
 
 
-			
-			<view class="pay_btn" style="margin-top: 12px;" @click="openpay()">去支付</view>
+			<view class="push-button">
+				<view class="que-btn" @click="openpay()">去支付</view>
+			</view>
 		
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
@@ -1343,6 +1344,29 @@
 </script>
 
 <style lang="scss" scoped>
+	.jusitify-line{
+		height: 78rpx;
+		padding: 20rpx 0;
+		font-size: 30rpx;
+		display: flex;
+		justify-content: space-between;
+	}
+	.jusitify-line-end{
+		height:1px;
+		border-bottom: 1px #e5e5e5 solid;
+		margin: 30rpx 0;
+	}
+	.line-word{
+		color: #999;
+	}
+	.line-word-r{
+		color: #333;
+	}
+	.tetx-sm{
+		color: #888888;
+		font-size: 30rpx;
+		margin-top: 10rpx;
+	}
 	.head-bottom{
 		width: 68%;
 		display: flex;
@@ -1544,7 +1568,7 @@
 	}
 	.fuwu-time-view span:nth-child(1),.liliao-bottom span:nth-child(1){
 		font-weight: 400;
-		font-size: 29rpx;
+		font-size: 30rpx;
 		color: #888;
 	}
 	.fuwu-time-view,.liliao-top{
@@ -1555,7 +1579,7 @@
 	}
 	.fuwu-title,.liliao-top span:nth-child(1){
 		font-size: 29rpx;
-		color: #222222;
+		color: #999999;
 	}
 	.fuwu-time,.liliao{
 		width: 100%;
@@ -1602,8 +1626,8 @@
 		}
 	.header-view-text{
 		width: 170rpx;
-		font-size: 29rpx;
-		color: #222222;
+		font-size: 30rpx;
+		color: #999999;
 	}
 	.header-view{
 		background-color: #fff;
@@ -1998,17 +2022,27 @@
 
 	}
 
-	.pay_btn {
-	    width: 96%;
-	    margin-left: 2%;
-	    text-align: center;
-	    background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-	    height: 40px;
-	    border-radius: 40px;
-	    color: #ffffff;
-	    line-height: 40px;
-	    font-size: 16px;
-	    position: fixed;
+	.push-button{
+		    width: 100%;
+		    height: 48px;
+		    position: fixed;
+		    bottom: 0px;
+		    display: flex;
+		    flex-direction: column;
+		    align-items: center;
+			margin: 0 auto;
+	}
+	.que-btn{
+		display: inline-block;
+		width: 92%;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height: 40px;
+		border-radius: 40px;
+		color: #ffffff;
+		line-height: 39px;
+		margin-top: 4px;
+		font-size: 34rpx;
 	}
 
 	.serverAddress {
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index 56a6b42..250b82b 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -162,7 +162,7 @@
 						</view>
 						<view class="jusitify-line-end"></view>
 					
-						<view class="justify-title-nav jusitify-line">
+						<view class="justify-title-nav">
 							<view class="justify-title">出行费用</view>
 							<view class="justify-title-nav-bor"></view>
 						</view>
@@ -267,10 +267,19 @@
 						</view>
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word">订单费用：</view>
+<<<<<<< .mine
 							<view class="line-word-r" v-if="order.oldPriceMarkup==null">￥<text
 									style="font-size: 26rpx;font-weight: bold;">{{order.priceMarkup}}</text></view>
+=======
+							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text
+									style="font-weight: bold;">{{order.massageMoney}}</text></view>
+>>>>>>> .theirs
 							<view class="line-word-r" v-else>￥<text
+<<<<<<< .mine
 									style="font-size: 26rpx;font-weight: bold;">{{order.oldPriceMarkup}}</text></view>
+=======
+									style="font-weight: bold;">{{order.oldMassageMoney}}</text></view>
+>>>>>>> .theirs
 							
 						</view>
 						<view class="flex justify-between jusitify-line">
@@ -281,7 +290,7 @@
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word">优惠券：</view>
 							<view class="" style="color: #F93731;" v-if="order.couponMoney">
-								-￥<text style="font-size: 26rpx;font-weight: bold;">
+								-￥<text style="font-size: 30rpx;font-weight: bold;">
 									{{order.couponMoney}}
 								</text>
 							</view>
@@ -290,17 +299,17 @@
 						<view class="flex justify-between jusitify-line" v-if="order.addMoney">
 							<view class="line-word">加钟费用：</view>
 							<view class="" style="color: #333;" >
-								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
+								<text style="font-size: 30rpx;font-weight: bold;" v-if="order.addMoney">
 									￥{{order.addMoney}}
 								</text>
-								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+								<text style="font-size: 30rpx;font-weight: bold;" v-else>-</text>
 							</view>
 						</view>
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word">升级费用：</view>
 							<view class="" style="color: #333;">
-								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.payMoney">￥{{order.payMoney}}</text>
-								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+								<text style="font-size: 30rpx;font-weight: bold;" v-if="order.payMoney">￥{{order.payMoney}}</text>
+								<text style="font-size: 30rpx;font-weight: bold;" v-else>-</text>
 							</view>
 						</view>
 						<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
@@ -482,10 +491,8 @@
 						</view>
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word">订单费用：</view>
-							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
-							<view class="line-word-r" v-else>￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
+							<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text>{{order.massageMoney}}</text></view>
+							<view class="line-word-r" v-else>￥<text>{{order.oldMassageMoney}}</text></view>
 							
 						</view>
 						<view class="flex justify-between jusitify-line">
@@ -496,7 +503,7 @@
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word">优惠券：</view>
 							<view class="" style="color: #F93731;" v-if="order.couponMoney">
-								-￥<text style="font-size: 26rpx;font-weight: bold;">
+								-￥<text style="font-size: 30rpx;font-weight: bold;">
 									{{order.couponMoney}}
 								</text>
 							</view>
@@ -504,18 +511,18 @@
 						</view>
 						<view class="flex justify-between jusitify-line" v-if="order.addMoney">
 							<view class="line-word">加钟费用：</view>
-							<view class="" style="color: #333;" >
-								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
+							<view class="line-word-r"  >
+								<text  v-if="order.addMoney">
 									￥{{order.addMoney}}
 								</text>
-								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+								<text  v-else>-</text>
 							</view>
 						</view>
 						<view class="flex justify-between jusitify-line">
 							<view class="line-word">升级费用：</view>
-							<view class="" style="color: #333;">
-								<text style="font-size: 26rpx;font-weight: bold;" v-if="order.payMoney">￥{{order.payMoney}}</text>
-								<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
+							<view class="line-word-r" style="color: #333;">
+								<text v-if="order.payMoney">￥{{order.payMoney}}</text>
+								<text v-else>-</text>
 							</view>
 						</view>
 						<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
@@ -534,7 +541,7 @@
 				
 			</view>
 
-			<view style="position: relative;" class="flex tabber padding-top-sm padding-bottom-sm align-center">
+			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
 				<view class="showBtn-mian" v-if="order.status=='6'">
 					<view class="showBtn">
 						<view class="gengduo" @click.stop="gengBtn">更多</view>
@@ -2297,8 +2304,9 @@
 		flex-direction: column;
 	}
 	/deep/.btns{
-		background: #019C88 !important;
-		color: #fff !important;
+		border: 1rpx solid #e5e5e5 ;
+		color: #333333 !important;
+		margin-left: 10rpx !important;
 	}
 	/deep/.u-size-default{
 		margin: 5px 0px 0px 0px;
@@ -2335,7 +2343,9 @@
 	
 
 	.dingshi{
-		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border: 0.5px solid #e5e5e5;
+		color: #333333 !important;
+		margin-left: 5px !important;
 	}
 	.zhuangtai{
 		color: #029D88;
@@ -2421,6 +2431,7 @@
 	.list-pay{
 		width: 100%;
 		padding: 10rpx 29rpx;
+		margin-bottom: 40rpx;
 	}
 	.pay-ding-top{
 		width: 100%;
@@ -2633,6 +2644,7 @@
 		justify-content: center;
 		height: 127rpx;
 		padding: 0 30rpx;
+		border-top: 1px solid #f5f5f5;
 	}
 
 	.box {
diff --git a/pages/cooperate/hehuo.vue b/pages/cooperate/hehuo.vue
index 4f46ff0..30d9a68 100644
--- a/pages/cooperate/hehuo.vue
+++ b/pages/cooperate/hehuo.vue
@@ -49,7 +49,6 @@
 			</view>
 		</view>
 		<view class="adv_text_view">
-			
 			<view class="adv_lines">
 				<view >姓名</view>
 				<input type="text" v-model="userName" maxlength="11" placeholder="请输入真实姓名" />
@@ -66,7 +65,9 @@
 			</view>
 			<view class="adv-xian"></view>
 		</view>
-		<view class="usermain-btn" @tap="save">提交申请</view>
+		<view class="push-button">
+			<view class="que-btn" @tap="save">提交申请</view>
+		</view>
 	</view>
 </template>
 
@@ -249,28 +250,27 @@
 	/deep/uni-radio::before{
 		margin-right: -1px;
 	}
-	.save_btn {
-		width: 600upx;
-		height: 92rpx;
-		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-		border-radius: 46rpx;
-		line-height: 92upx;
-		margin: 0 auto;
-		color: #fff;
-		font-size: 28upx;
-		position: absolute;
-		bottom: 0px;
-		margin-bottom: 10px;
+	.push-button{
+		    width: 100%;
+		    height: 48px;
+		    position: fixed;
+		    bottom: 0px;
+		    display: flex;
+		    flex-direction: column;
+		    align-items: center;
+			margin: 0 auto;
+	}
+	.que-btn{
+		display: inline-block;
+		width: 90%;
 		text-align: center;
-		/* #ifdef MP-WEIXIN */
-		margin-top: 150rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		margin-top: 100rpx;
-		/* #endif */
-		/* #ifdef APP-PLUS */
-		margin-top: 180rpx;
-		/* #endif */
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height: 38px;
+		border-radius: 28px;
+		color: #ffffff;
+		line-height: 38px;
+		margin-top: 4px;
+		font-size: 34rpx;
 	}
 	.uni-textarea-compute{
 		
@@ -345,7 +345,6 @@
 		border-radius: 10px;
 		padding: 20px;
 		margin-top: 20rpx;
-		margin-bottom: 50px;
 	}
 	.send-msg{
 		padding: 0 30rpx;
diff --git a/pages/cooperate/index.vue b/pages/cooperate/index.vue
index 8ed7d26..fe29d30 100644
--- a/pages/cooperate/index.vue
+++ b/pages/cooperate/index.vue
@@ -59,7 +59,8 @@
 	}
 	.cooperate-img{
 		width: 100%;
-		height:240rpx;
+		height:222rpx;
+		object-fit: contain;
 	}
 	.shezhi-list-img-text{
 		font-weight: 400;
diff --git a/pages/my/cooperation.vue b/pages/my/cooperation.vue
index 1e79c1e..784e1fc 100644
--- a/pages/my/cooperation.vue
+++ b/pages/my/cooperation.vue
@@ -239,7 +239,7 @@
 		justify-content: center;
 		position: fixed;
 		bottom: 0px;
-		margin-bottom: 20px;
+		margin-bottom: 8px;
 		.sub-box {
 			width: 613rpx;
 			height: 100%;
diff --git a/pages/my/fuwuDateil.vue b/pages/my/fuwuDateil.vue
index 0625a97..4863beb 100644
--- a/pages/my/fuwuDateil.vue
+++ b/pages/my/fuwuDateil.vue
@@ -129,8 +129,10 @@
 			</view>
 			<view style="height: 100rpx;"></view>
 		</view>
-		<view class="detail-btn" v-if="getList.status=='1'" @click="goumai(getList)">
-			立即预约
+		<view class="push-button">
+			<view class="detail-btn" v-if="getList.status=='1'" @click="goumai(getList)">
+				立即预约
+			</view>
 		</view>
 	</view>
 </template>
@@ -282,19 +284,27 @@
 		color: #fff;
 		position: absolute;
 		}
+		.push-button{
+		width: 100%;
+		height: 48px;
+		position: fixed;
+		bottom: 0px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		margin: 0 auto;
+		}
 	.detail-btn{
-			width:95%;
-			height: 92rpx;
-			line-height: 92rpx;
-			background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-			border-radius: 46rpx;
-			margin: 0 auto;
-			text-align: center;
-			font-weight: 400;
-			font-size: 32rpx;
-			color: #FFFFFF;
-			position: fixed;
-			bottom: 0;
+		display: inline-block;
+		width: 92%;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height: 40px;
+		border-radius: 28px;
+		color: #ffffff;
+		line-height: 40px;
+		margin-top: 4px;
+		font-size: 34rpx;
 		}
 	.detail-foot-mian-txet span:nth-child(1){
 		color: #777777;
@@ -571,16 +581,19 @@
 		flex-direction: row;
 		align-items: flex-end;
 	}
-	.header-bottom-title-num span{
-		font-weight: bold;
-		font-size: 25rpx;
+	.header-bottom-title-num{
+		display: flex;
+		align-items: flex-end;
 	}
 	.header-bottom-title-num span:nth-child(1){
+		font-size: 30rpx;
 		color: #08A28A;
+		font-weight: bold;
 	}
 	.header-bottom-title-num span:nth-child(2){
 		color: #848485;
-		margin-left: 5px;
+		margin-left:2px;
+		font-size: 26rpx;
 	}
 	.header-bottom-title-text{
 		font-size: 35rpx;
diff --git a/pages/my/hehuo.vue b/pages/my/hehuo.vue
index 6061886..efbf3ea 100644
--- a/pages/my/hehuo.vue
+++ b/pages/my/hehuo.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="hehuo_view">
-		<view class="advantage-title">应聘技师</view>
-		<view class="advantage-bor"></view>
+		<view class="advantage-title">
+			<image style="width: 35rpx; height: 35rpx; margin-right:10rpx; margin-top: 5rpx;" src="../../static/technician.png"></image>应聘技师</view>
+		<view class="advantage-bor" style="margin-right: 10rpx;"></view>
 		<view class="text_view">
 			<view class="item_view">
 				<view class="item_title">服务城市 </view>
@@ -33,7 +34,7 @@
 								<image :src="headImg" style="width: 100%;height: 100%;"></image>
 								<view style="z-index: 9;position: absolute;margin-top: -1px;right: 0px;"
 									@click="headImgremove(index)">
-									<u-icon name="close-circle-fill" color="#2979ff" size="50rpx"></u-icon>
+									<u-icon name="close-circle-fill" color="#039d88" size="50rpx"></u-icon>
 								</view>
 							</view>
 						</view>
@@ -54,7 +55,10 @@
 			<!-- <view class="audit_message" v-if="auditContent != '' && bb == 3">拒绝原因：{{auditContent}}</view> -->
 			<!-- <view class="save_btn" v-if="status == 0">审核中</view> -->
 		</view>
-		<view class="save_btn" @tap="save" v-if="bb !=0">提交申请</view>
+		<view  class="push-button">
+			<view class="que-btn" @tap="save" v-if="bb !=0">提交申请</view>
+		</view>
+		
 	</view>
 </template>
 
@@ -229,29 +233,27 @@
 <style lang="less">
 	@import '../../static/less/index.less';
 	@import '../../static/css/index.css';
-	.save_btn {
-		width: 600upx;
-		height: 92rpx;
-		left:10%;
-		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-		border-radius: 46rpx;
-		line-height: 92upx;
-		margin: 0 auto;
-		color: #fff;
-		font-size: 30upx;
-		position: absolute;
-		bottom: 0px;
-		margin-bottom: 10px;
+	.push-button{
+		    width: 100%;
+		    height: 48px;
+		    position: fixed;
+		    bottom: 0px;
+		    display: flex;
+		    flex-direction: column;
+		    align-items: center;
+			margin: 0 auto;
+	}
+	.que-btn{
+		display: inline-block;
+		width: 90%;
 		text-align: center;
-		/* #ifdef MP-WEIXIN */
-		margin-top: 150rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		margin-top: 100rpx;
-		/* #endif */
-		/* #ifdef APP-PLUS */
-		margin-top: 180rpx;
-		/* #endif */
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height: 38px;
+		border-radius: 28px;
+		color: #ffffff;
+		line-height: 38px;
+		margin-top: 4px;
+		font-size: 34rpx;
 	}
 	
 	.margin-top-view{
@@ -266,7 +268,7 @@
 		margin-left: 35rpx;
 	}
 	.advantage-bor{
-		width: 64px;
+		width: 80px;
 		height: 6px;
 		border-radius: 3px;
 		bottom: 0;
diff --git a/uview-ui/components/u-button/u-button.vue b/uview-ui/components/u-button/u-button.vue
index 6a29e37..1d13cda 100644
--- a/uview-ui/components/u-button/u-button.vue
+++ b/uview-ui/components/u-button/u-button.vue
@@ -377,7 +377,6 @@ export default {
 	}
 	
 	&--primary {
-		color: #ffffff;
 		border-color: $u-type-primary;
 		background-color: $u-type-primary;
 	}