yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单

This commit is contained in:
Mr.jiang 2024-07-17 16:25:34 +08:00
parent 32a6160cb2
commit dd2206bc17
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
my/order/pay.vue
View File

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

10
my/order/payShengji.vue
View File

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