From dd2206bc1715708fc7093ed4bc405c8b71d68ab2 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Wed, 17 Jul 2024 16:25:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/order/pay.vue | 5 +----
my/order/payShengji.vue | 10 +---------
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/my/order/pay.vue b/my/order/pay.vue
index 0b2bf8a..6b22b7e 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -197,11 +197,8 @@
订单费用：
-<<<<<<< .mine
￥{{order.priceMarkup}}
-=======
- ￥{{order.massageMoney}}
->>>>>>> .theirs
+
出行费用：
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index 250b82b..93e9a0c 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -267,19 +267,11 @@
订单费用：
-<<<<<<< .mine
￥{{order.priceMarkup}}
-=======
- ￥{{order.massageMoney}}
->>>>>>> .theirs
￥{{order.oldPriceMarkup}}
-=======
- style="font-weight: bold;">{{order.oldMassageMoney}}
->>>>>>> .theirs
+