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

解决冲突

This commit is contained in:
Mr.jiang 2024-06-27 20:15:10 +08:00
parent 73572c083a
commit 174fe5ba0b
1 changed files with 0 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
my/order/payModify.vue
View File

@ -2,7 +2,6 @@
<view class="content"> <view class="content">
<view class="padding-bottom u-skeleton"> <view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;"> <view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
<<<<<<< .mine
<view class="head-top"> <view class="head-top">
<view class="pay-title" style="">服务项目</view> <view class="pay-title" style="">服务项目</view>
<view class="flex"> <view class="flex">
@ -33,40 +32,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="padding margin-top-sm header-view">
=======
<view class="ske-padding margin-top-sm header-view"> <view class="ske-padding margin-top-sm header-view">
>>>>>>> .theirs
<view v-if="!detailaddress">请选择地址</view> <view v-if="!detailaddress">请选择地址</view>
<view class="margin-right-xs"> <view class="margin-right-xs">
<view class="flex justify-between margin-top-lg"> <view class="flex justify-between margin-top-lg">
@ -1358,7 +1324,6 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
<<<<<<< .mine
.head-bottom{ .head-bottom{
width: 68%; width: 68%;
display: flex; display: flex;
@ -1406,7 +1371,6 @@
color: #333333; color: #333333;
margin-bottom: 5px; margin-bottom: 5px;
} }
=======
.view-more{ .view-more{
display:inline-block; display:inline-block;
border-top:1px solid; border-top:1px solid;
@ -1426,35 +1390,6 @@
} }
>>>>>>> .theirs
.header-bottom-money-zhen span{ .header-bottom-money-zhen span{
color: #F95900 !important; color: #F95900 !important;
font-weight: bold !important; font-weight: bold !important;