From 8f6b41e7775a7e920a5da4b1d28b5f0a575585a4 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Wed, 3 Jul 2024 16:10:27 +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/pay.vue | 84 +++++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/my/order/pay.vue b/my/order/pay.vue
index d61089a..d141c99 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -102,7 +102,7 @@
 						</view>
 					</view>
 					<view class="list-pay">
-						<view class="justify-title-nav">
+						<view class="justify-title-nav ">
 							<view class="justify-title">订单信息</view>
 							<view class="justify-title-nav-bor"></view>
 						</view>
@@ -140,19 +140,19 @@
 							<view class="justify-title">订单费用</view>
 							<view class="justify-title-nav-bor"></view>
 						</view>
-						<view class="flex justify-between" style="margin-top: 19rpx;">
+						<view class="flex justify-between add-lin" >
 							<view class="add-con-title">项目名称</view>
 							<view class="add-con-cont" >{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}</view>
 						</view>
-						<view class="flex justify-between" style="margin-top: 19rpx;">
+						<view class="flex justify-between add-lin">
 							<view class="add-con-title">服务时长</view>
 							<view class="add-con-cont" >{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟</view>
 						</view>
-						<view class="flex justify-between" style="margin-top: 19rpx;">
+						<view class="flex justify-between add-lin" >
 							<view class="add-con-title">项目价格</view>
 							<view class="add-con-cont" >￥{{order.price}}</view>
 						</view>
-						<view class="flex justify-between" style="margin-top: 19rpx;">
+						<view class="flex justify-between add-lin">
 							<view class="add-con-title">会员折扣</view>
 							<view class="add-con-cont" >{{order.vipRate}}%</view>
 						</view>
@@ -169,31 +169,31 @@
 						<view class="jusitify-line-end"></view>
 						
 						<view class="justify-title-nav">
-							<view class="justify-title">出行费用</view>
+							<view class="add-con-title">出行费用</view>
 							<view class="justify-title-nav-bor"></view>
 						</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 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" 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 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" style="margin-top: 19rpx;padding-bottom:5px ;margin-bottom: 5px;">
-							<view style="color: #999;font-size: 26rpx;">出行费用</view>
-							<view class="" style="color: #333;font-size: 26rpx;">￥{{order.taxiMoney}}</view>
+						<view class="flex justify-between add-lin" >
+							<view class="add-con-title">出行费用</view>
+							<view class="add-con-cont">￥{{order.taxiMoney}}</view>
 						</view>
-						<view class="jusitify-line-end"></view>
+						<view class="jusitify-line-end add-lin"></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;padding-bottom:5px ;margin: 5px 0px;">
-							<view style="color: #999;font-size: 26rpx;">优惠券</view>
-							<view class="" style="color: #F93731;font-size: 26rpx;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title">优惠券</view>
+							<view class="add-con-cont" style="color: #F93731;font-size: 26rpx;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
 							<view class="" v-else>-</view>
 						</view>
 						<view class="jusitify-line-end"></view>
@@ -201,25 +201,25 @@
 							<view class="justify-title">费用明细</view>
 							<view class="justify-title-nav-bor"></view>
 						</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
-									style="font-size: 26rpx;font-weight: bold;">{{order.price}}</text></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.price}}</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: #333;">￥<text
-									style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
+						<view class="flex justify-between add-lin">
+							<view class="add-con-title"">出行费用：</view>
+							<view class="add-con-cont">￥<text
+									style="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">
-								-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view>
+						<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-weight: bold;">{{order.couponMoney}}</text></view>
 							<view class="" v-else>-</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="" style="color: #333;">￥
+						<view class="flex justify-between add-lin" >
+							<view class="add-con-title">合计：</view>
+							<view class="add-con-cont" style="color: #333;">￥
 								<text style="font-size: 35rpx;font-weight: bold;">
 									{{order.payMoney}}
 								</text>
@@ -2189,17 +2189,21 @@
 	}
 	.add-con-title{
 		color: #999;
-		font-size: 28rpx;
+		font-size: 30rpx;
 	}
 	.add-con-cont{
 		color: #666;
-		font-size: 28rpx;
+		font-size: 30rpx;
+		line-height: 80rpx;
+		text-align:right;
 	}
 	.level_button{
-		padding: 5rpx 20rpx;
+		padding: 2rpx 13rpx;
 		background: linear-gradient(to right, #fe9130, #ff9869);
-		border-radius: 8rpx 20rpx 8rpx 20rpx;
+		border-radius: 5rpx 16rpx 5rpx 16rpx;
 		color: #fff;
+		font-size: 12px;
+	
 	}
 	.justify-title-nav{
 		width: 90%;