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

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

This commit is contained in:
Mr.jiang 2024-07-04 16:25:30 +08:00
parent 7fac5f7b7c 90d182aae7
commit 6a51eb9a55
3 changed files with 97 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
my/order/pay.vue
View File

@ -1925,7 +1925,7 @@
width: 100%; width: 100%;
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
font-size: 29rpx; font-size: 32rpx;
color: #333333; color: #333333;
padding-bottom: 10px; padding-bottom: 10px;
margin-bottom: 10px; margin-bottom: 10px;
@ -2237,7 +2237,6 @@
border-radius: 16rpx 16rpx 16rpx 1rpx ; border-radius: 16rpx 16rpx 16rpx 1rpx ;
color: #fff; color: #fff;
font-size: 12px; font-size: 12px;
} }
.justify-title-nav{ .justify-title-nav{
width: 90%; width: 90%;

147
my/order/paydingTCX.vue
View File

@ -94,54 +94,60 @@
<!-- <image src="../../static/img/phone.png" class="phone-pay" <!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> --> @click="bindphone(order.artificer.phone)"></image> -->
</view> </view>
<view>{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':order.technicianType=='5'?'资深':''}}</view> <view class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':order.technicianType=='5'?'资深':''}}</view>
</view> </view>
</view> </view>
<view class="list-pay"> <view class="list-pay">
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">订单信息</view> <view class="justify-title-nav ">
<view class="flex justify-between" style="margin-top: 19rpx;"> <view class="justify-title">订单信息</view>
<view style="color: #999;font-size: 26rpx;">订单编号</view> <view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">订单编号</view>
<view class="flex align-center" @tap="copy(order.ordersNo)" <view class="flex align-center" @tap="copy(order.ordersNo)"
style="color: #333;font-size: 26rpx;"> style="color: #333;font-size: 26rpx;">
<view class="">{{order.ordersNo}}</view> <view class="add-con-cont">{{order.ordersNo}}</view>
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon> <u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
</view> </view>
</view> </view>
<view class="flex justify-between" style="margin-top: 19rpx;"> <view class="flex justify-between add-lin">
<view style="color: #999;font-size: 26rpx;">预约时间</view> <view class="add-con-title">预约时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.serveTime}}</view> <view class="add-con-cont">{{order.serveTime}}</view>
</view> </view>
<view class="flex justify-between bottom-view"> <view class="flex justify-between add-lin">
<view style="color: #999;font-size: 26rpx;">下单时间</view> <view class="add-con-title">下单时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.createTime}}</view> <view class="add-con-cont">{{order.createTime}}</view>
</view> </view>
<view class="jusitify-line-end"></view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">订单费用</view> <view class="justify-title-nav ">
<view class="flex justify-between" style="margin-top: 19rpx;"> <view class="justify-title">订单费用</view>
<view style="color: #999;font-size: 26rpx;"> {{order.packageType=='105'?'项目次卡':order.packageType=='106'?'服务疗程':'套餐名称'}}</view> <view class="justify-title-nav-bor"></view>
<view class="" style="color: #333;font-size: 26rpx;"> </view>
<view class="flex justify-between add-lin">
<view class="add-con-title"> {{order.packageType=='105'?'项目次卡':order.packageType=='106'?'服务疗程':'套餐名称'}}</view>
<view class="add-con-cont">
{{order.ordersMassageList[0].userPackageDetail?order.ordersMassageList[0].userPackageDetail.mainTitle:order.ordersMassageList[0].massageType.mainTitle}} {{order.ordersMassageList[0].userPackageDetail?order.ordersMassageList[0].userPackageDetail.mainTitle:order.ordersMassageList[0].massageType.mainTitle}}
</view> </view>
</view> </view>
<view class="flex justify-between" style="margin-top: 19rpx;"> <view class="flex justify-between add-lin">
<view style="color: #999;font-size: 26rpx;">项目名称</view> <view class="add-con-title">项目名称</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.entryName}}</view> <view class="add-con-cont">{{order.entryName}}</view>
</view> </view>
<view class="flex justify-between" style="margin-top: 19rpx;"> <view class="flex justify-between add-lin">
<view style="color: #999;font-size: 26rpx;">服务时长</view> <view class="add-con-title">服务时长</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.duration}}分钟</view> <view class="add-con-cont">{{order.duration}}分钟</view>
</view> </view>
<view class="flex justify-between"> <view class="flex justify-between add-lin">
<view style="color: #999;font-size: 26rpx;">项目价格</view> <view class="add-con-title">项目价格</view>
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.massagePrice}}</view> <view class="add-con-cont">￥{{order.massagePrice}}</view>
</view> </view>
<view class="flex justify-between" style="margin-top: 19rpx;"> <view class="flex justify-between add-lin">
<view style="color: #999;font-size: 26rpx;">会员折扣</view> <view class="add-con-title">会员折扣</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.vipRate}}%</view> <view class="add-con-cont">{{order.vipRate}}%</view>
</view> </view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;border-bottom:1px solid #ccc;padding-bottom:5px ;margin: 5px 0px;"> <view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
<view style="color: #333;font-size: 26rpx;">实付金额：</view> <view style="color: #333;font-size: 26rpx;">实付金额：</view>
<view class="" style="color: #333;"> <view class="" style="color: #333;">
<text style="font-size: 35rpx;font-weight: bold;"> <text style="font-size: 35rpx;font-weight: bold;">
@ -149,21 +155,24 @@
</text> </text>
</view> </view>
</view> </view>
<view class="jusitify-line-end"></view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">出行费用</view> <view class="justify-title-nav ">
<view class="flex justify-between" v-if="order.tripWay" style="margin-top: 19rpx;"> <view class="justify-title">出行费用</view>
<view style="color: #999;font-size: 26rpx;">出行方式</view> <view class="justify-title-nav-bor"></view>
<view v-if="order.tripWay == 1">公交</view>
<view v-if="order.tripWay == 2">出租</view>
<view v-if="order.tripWay == 3">免费</view>
</view> </view>
<view class="flex justify-between" v-if="order.km" style="margin-top: 19rpx;"> <view class="flex justify-between add-lin" v-if="order.tripWay" >
<view style="color: #999;font-size: 26rpx;">全程距离</view> <view class="add-con-title">出行方式</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.km}}km</view> <view class="add-con-cont" v-if="order.tripWay == 1">公交</view>
<view class="add-con-cont" v-if="order.tripWay == 2">出租</view>
<view class="add-con-cont" v-if="order.tripWay == 3">免费</view>
</view> </view>
<view class="flex justify-between bottom-view" v-if="order.taxiMoney"> <view class="flex justify-between add-lin" v-if="order.km" >
<view style="color: #999;font-size: 26rpx;">出行交通费用</view> <view class="add-con-title">全程距离</view>
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.taxiMoney}}</view> <view class="add-con-cont">{{order.km}}km</view>
</view>
<view class="flex justify-between add-lin" v-if="order.taxiMoney">
<view class="add-con-title">出行交通费用</view>
<view class="add-con-cont">￥{{order.taxiMoney}}</view>
</view> </view>
<view class="textarea-pay-list" v-if="order.remark"> <view class="textarea-pay-list" v-if="order.remark">
<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view> <view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
@ -173,21 +182,19 @@
</view> </view>
</view> </view>
<view class="pay-ding feiuong"> <view class="pay-ding feiuong">
<view class="fei-title">费用明细</view> <view class="fei-title ">费用明细</view>
<view class="fei-view"> <view class="fei-view">
<view class="flex align-center margin-top-lg justify-between"> <view class="flex justify-between add-lin">
<view style="color: #333;font-size: 26rpx;">订单费用：</view> <view class="add-con-title">订单费用：</view>
<view class="" style="color: #333;">￥<text <view class="add-con-cont">￥<text style="font-weight: bold;">0</text></view>
style="font-size: 26rpx;font-weight: bold;">0</text></view>
</view> </view>
<view class="flex align-center margin-top-lg justify-between" v-if="order.taxiMoney"> <view class="flex justify-between add-lin" v-if="order.taxiMoney">
<view style="color: #333;font-size: 26rpx;">出行费用：</view> <view class="add-con-title">出行费用：</view>
<view class="" style="color: #333;">￥<text <view class="add-con-cont">￥<text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
</view> </view>
<view class="fei-view-list-z"> <view class="fei-view-list-z">
<span>总金额</span> <span>总金额</span>
<span style="color: #FF3939;font-size: 29rpx;">￥{{order.taxiMoney}}</span> <span style="color: #FF3939;font-size: 34rpx;">￥{{order.taxiMoney}}</span>
</view> </view>
</view> </view>
</view> </view>
@ -1689,7 +1696,7 @@
height: 65rpx; height: 65rpx;
background-color: rgba(247, 247, 247, 0.8); background-color: rgba(247, 247, 247, 0.8);
border-radius: 33rpx; border-radius: 33rpx;
padding: 0px 5px; padding: 0px 10px;
} }
.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){ .fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
color: #666666; color: #666666;
@ -1714,7 +1721,7 @@
width: 100%; width: 100%;
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
font-size: 29rpx; font-size: 32rpx;
color: #333333; color: #333333;
padding-bottom: 10px; padding-bottom: 10px;
margin-bottom: 10px; margin-bottom: 10px;
@ -2017,4 +2024,36 @@
line-height: 80rpx; line-height: 80rpx;
text-align:right; text-align:right;
} }
.level_button{
padding: 3rpx 13rpx;
background: linear-gradient(to right, #fe9131, #ff9869);
border-radius: 16rpx 16rpx 16rpx 1rpx ;
color: #fff;
font-size: 12px;
}
.justify-title-nav{
width: 90%;
display: flex;
flex-direction: column;
position: relative;
margin: 10px 0;
}
.justify-title-nav-bor{
width: 64px;
height: 5px;
border-radius: 3px;
position: absolute;
bottom: 0;
background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7));
}
.justify-title{
font-weight: bold;
font-size: 32rpx;
color: #333;
}
.jusitify-line-end{
height: 1px;
border-bottom: 1px #f4f4f4 solid;
margin: 15px 0;
}
</style> </style>

3
pages/therapist/therapist.vue
View File

@ -55,6 +55,9 @@
{{ item.distance }} {{ item.distance }}
</view> </view>
</view> </view>
<view class="jieshao">
{{item.content}}
</view>
<view class="therapist-mian-top"> <view class="therapist-mian-top">
<view class="therapist-mian-view"> <view class="therapist-mian-view">
<image src="../../static/dituzhaoren3.png" mode=""> <image src="../../static/dituzhaoren3.png" mode="">