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-03 18:07:10 +08:00
parent 89b00753dd
commit 3c9750f84e
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
my/order/pay.vue
View File

@ -202,23 +202,11 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<<<<<<< .mine
<view class="add-con-title">订单费用：</view> <view class="add-con-title">订单费用：</view>
<view class="add-con-cont">￥<text <view class="add-con-cont">￥<text style="font-size: 26rpx; font-weight: bold;">{{order.price}}</text></view>
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> </view>
<<<<<<< .mine
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="add-con-title">出行费用：</view> <view class="add-con-title">出行费用：</view>
=======
<view>
<view class="add-con-title">出行费用：</view>
>>>>>>> .theirs
<view class="add-con-cont">￥<text <view class="add-con-cont">￥<text
>{{order.taxiMoney}}</text></view> >{{order.taxiMoney}}</text></view>
</view> </view>