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-04 11:25:55 +08:00
parent bc451987c6
commit 7fa65b3e86
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/my/historyMy.vue
View File

@ -39,11 +39,7 @@
<view class="item-view-bottom-qian"> <view class="item-view-bottom-qian">
<span>￥</span> <span>￥</span>
<span>{{item.price}}</span> <span>{{item.price}}</span>
<<<<<<< .mine
<span>/套</span> <span>/套</span>
=======
>>>>>>> .theirs
<span>￥</span> <span>￥</span>
<span>{{item.oldPrice}}</span> <span>{{item.oldPrice}}</span>
</view> </view>