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 @@
 							<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 class="add-con-cont">￥<text style="font-size: 26rpx; font-weight: bold;">{{order.price}}</text></view>
 						</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
 									>{{order.taxiMoney}}</text></view>
 						</view>