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 15:17:22 +08:00
parent dc94600414 036ba91a52
commit c8544716f5
5 changed files with 54 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
my/order/pay.vue
View File

@ -69,7 +69,7 @@
</view> </view>
<view class="serverAddress add-lin"> <view class="serverAddress add-lin">
<view class="add-con-title">服务地址</view> <view class="add-con-title">服务地址</view>
<view class="add-con-cont" style="width: 73%;">{{order.address}}</view> <view class="add-con-cont" style="width: 73%; line-height: 34rpx;">{{order.address}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -1638,7 +1638,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/.padding-bottom{ /deep/.padding-bottom{
padding-bottom: 50px; padding-bottom: 20rpx;
} }
/deep/.u-drawer{ /deep/.u-drawer{
@ -1854,6 +1854,7 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-top: 20rpx;
} }
.hideBtn{ .hideBtn{
width: 100%; width: 100%;
@ -2017,6 +2018,11 @@
padding: 29rpx; padding: 29rpx;
} }
.content{ .content{
<<<<<<< .mine
=======
// padding-bottom: 140rpx;
>>>>>>> .theirs
padding-top: 20px; padding-top: 20px;
width: 100%; width: 100%;
background-color: #f7f7f7; background-color: #f7f7f7;

56
my/order/paydingTCX.vue
View File

@ -15,7 +15,7 @@
</view> </view>
<view class="u-flex-1 margin-left-sm"> <view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right"> <view class="flex head-title-right">
<view class="margin-right-xs text-df u-skeleton-fillet head-title"> <view class="head-text">
{{order.entryName}} {{order.entryName}}
</view> </view>
<view class="zhuangtai"> <view class="zhuangtai">
@ -62,21 +62,21 @@
</view> </view>
<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;"> <view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
<view class="" v-if="order.artificer"> <view class="" v-if="order.artificer">
<view class="flex align-center justify-between"> <view class="flex align-center justify-between add-lin">
<view class="" style="color: #999;font-size: 26rpx;">下单人</view> <view class="add-con-title">下单人</view>
<view style="color: #333;font-size: 26rpx;"> <view class="add-con-cont">
{{order.userName}} {{order.userName}}
</view> </view>
</view> </view>
<view class="flex align-center justify-between" style="margin-top: 19rpx;"> <view class="flex align-center justify-between add-lin">
<view class="" style="color: #999;font-size: 26rpx;">联系方式</view> <view class="add-con-title">联系方式</view>
<view style="color: #333;font-size: 26rpx;"> <view class="add-con-cont">
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}} {{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</view> </view>
</view> </view>
<view class="serverAddress"> <view class="serverAddress add-lin">
<view style="color: #999;font-size: 26rpx;margin-top: 19rpx;">服务地址</view> <view class="add-con-title">服务地址</view>
<view style="text-align: right;color: #333333;margin-top: 8rpx;font-size: 26rpx;width: 73%;">{{order.address}}</view> <view class="add-con-cont" style="width: 73%; line-height: 34rpx;">{{order.address}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -1666,13 +1666,13 @@
} }
.zhuangtai{ .zhuangtai{
color: #029D88; color: #029D88;
font-weight: bold;
} }
.head-title-right{ .head-title-right{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
font-weight: bold;
} }
.head-title{ .head-title{
margin-top: -2px;display: inline-block; margin-top: -2px;display: inline-block;
@ -1751,11 +1751,11 @@
} }
.pay-ding-top{ .pay-ding-top{
width: 100%; width: 100%;
height: 80rpx; height: 50px;
background-image: linear-gradient(to bottom, rgba(8, 162, 138, 0.5), #fff); background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
border-top-left-radius: 24rpx; border-top-left-radius: 12px;
border-top-right-radius: 24rpx; border-top-right-radius: 12px;
padding: 0px 29rpx; padding: 0px 14px;
} }
.pay-ding,.feiuong{ .pay-ding,.feiuong{
background-color: #ffffff; background-color: #ffffff;
@ -1769,8 +1769,9 @@
} }
.d-title{ .d-title{
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 32rpx;
color: #333333; color: #333333;
font-weight: bold;
} }
.d-touxiang{ .d-touxiang{
width: 46rpx; width: 46rpx;
@ -1818,9 +1819,9 @@
} }
.pay-title{ .pay-title{
font-weight: bold; font-weight: bold;
font-size: 28rpx; font-size: 32rpx;
color: #333333; color: #333333;
margin-bottom: 5px; margin-bottom: 8px;
} }
page { page {
background: #f7f7f7; background: #f7f7f7;
@ -1999,4 +2000,21 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.head-text{
font-size:30rpx;
}
.add-lin{
height: 80rpx;
line-height: 80rpx;
}
.add-con-title{
color: #999;
font-size: 30rpx;
}
.add-con-cont{
color: #666;
font-size: 30rpx;
line-height: 80rpx;
text-align:right;
}
</style> </style>

15
pages/my/cureOderDrtail.vue
View File

@ -116,7 +116,7 @@
</view> </view>
</view> </view>
<view class="detail-btn" v-if="dataList.name=='my'" @click="goumai(getList)"> <view class="detail-btn" v-if="dataList.name=='my'" @click="goumai(getList)">
立即购买 立即预约
</view> </view>
</view> </view>
</template> </template>
@ -235,28 +235,28 @@
} }
.header-bottom-title-liao{ .header-bottom-title-liao{
display: inline-block; display: inline-block;
padding: 3px 7px; padding: 2px 7px;
height: 16px; height: 16px;
line-height: 16px; line-height: 16px;
text-align: center; text-align: center;
background: linear-gradient(-90deg, #FF6F48, #FF9E69); background: linear-gradient(-90deg, #FF6F48, #FF9E69);
border-radius: 7px; border-radius: 7px;
margin-left: 5px; margin-left: 5px;
font-size: 11px; font-size: 10px;
border-top-left-radius: 20px; border-top-left-radius: 20px;
border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
color: #fff; color: #fff;
} }
.detail-btn{ .detail-btn{
width:95%; width:95%;
height: 92rpx; height: 80rpx;
line-height: 92rpx; line-height: 80rpx;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495); background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 46rpx; border-radius: 46rpx;
margin: 0 auto; margin: 0 auto;
text-align: center; text-align: center;
font-weight: 400; font-weight: 400;
font-size: 38rpx; font-size: 36rpx;
color: #FFFFFF; color: #FFFFFF;
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
@ -412,7 +412,7 @@
background-color: #fff; background-color: #fff;
border-radius: 21rpx; border-radius: 21rpx;
padding: 15px; padding: 15px;
margin-bottom: 50px; margin-bottom: 20rpx;
} }
.jianjie{ .jianjie{
font-weight: 400; font-weight: 400;
@ -572,7 +572,6 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between;
margin-top: 15rpx; margin-top: 15rpx;
} }
.header-bottom-title-num span{ .header-bottom-title-num span{

1
pages/therapist/therapist.vue
View File

@ -1383,6 +1383,7 @@ import permision from "@/components/permission.js";
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between;
} }
.list-right-top{ .list-right-top{
width: 100%; width: 100%;

1
pages/therapist/therapistDingdan.vue
View File

@ -49,6 +49,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="flex align-center" v-if="item.tripWay != 3" > <view class="flex align-center" v-if="item.tripWay != 3" >
<image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image> <image class="therapist-bottom-dingwei" src="../../static/dituzhaoren6.png"></image>
<view class="therapist-bottom-dingwei-text"> <view class="therapist-bottom-dingwei-text">