From 3c9750f84ea366159660432e3fb7517aacb1aba7 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Wed, 3 Jul 2024 18:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/order/pay.vue | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/my/order/pay.vue b/my/order/pay.vue
index 8b32c64..bdc802c 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -202,23 +202,11 @@
-<<<<<<< .mine
订单费用：
- ￥{{order.price}}
-=======
- 订单费用：
- ￥{{order.price}}
-
->>>>>>> .theirs
+ ￥{{order.price}}
-<<<<<<< .mine
出行费用：
-=======
-
- 出行费用：
->>>>>>> .theirs
￥{{order.taxiMoney}}