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 @@
 						</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>
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 @@
 						</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">