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

修改

This commit is contained in:
kbing1981 2024-07-01 23:12:45 +08:00
parent e2b6df7640
commit 37da7cc08f
2 changed files with 201 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

305
my/order/payJaZ.vue
View File

@ -58,21 +58,21 @@
</view>
<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
<view class="" v-if="order.artificer">
<view class="flex align-center justify-between">
<view class="" style="color: #999;font-size: 26rpx;">下单人</view>
<view style="color: #333;font-size: 26rpx;">
<view class="flex align-center jusitify-line">
<view class="line-word">客户姓名</view>
<view class="line-word-r">
{{order.userName}}
</view>
</view>
<view class="flex align-center justify-between" style="margin-top: 19rpx;">
<view class="" style="color: #999;font-size: 26rpx;">联系方式</view>
<view style="color: #333;font-size: 26rpx;">
<view class="flex align-center jusitify-line">
<view class="line-word">联系方式</view>
<view class="line-word-r">
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</view>
</view>
<view class="serverAddress">
<view style="color: #999;font-size: 26rpx;margin-top: 19rpx;">服务地址</view>
<view style="color: #333333;margin-top: 8rpx;font-size: 26rpx;width: 73%;">{{order.address}}</view>
<view class="serverAddress jusitify-line">
<view class="line-word">服务地址</view>
<view class="line-word-r" style="width: 73%; text-align: right;">{{order.address}}</view>
</view>
</view>
</view>
@ -91,7 +91,7 @@
@click="bindphone(order.artificer.phone)"></image> -->
<!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> -->
<view>{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view>
<view class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view>
</view>
<view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right">
@ -105,9 +105,12 @@
</view>
</view>
<view class="list-pay">
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">订单信息</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">订单编号</view>
<view class="justify-title-nav">
<view class="justify-title">订单信息</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="jusitify-line">
<view class="line-word">订单编号</view>
<view class="flex align-center" @tap="copy(order.ordersNo)"
style="color: #333;font-size: 26rpx;">
<view class="">{{order.ordersNo}}</view>
@ -115,44 +118,50 @@
</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">预约时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.serveTime}}</view>
<view class="jusitify-line">
<view class="line-word">预约时间</view>
<view class="line-word-r">{{order.serveTime}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">下单时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.createTime}}</view>
<view class="jusitify-line">
<view class="line-word">下单时间</view>
<view class="flex line-word-r">{{order.createTime}}</view>
</view>
<view class="flex justify-between" v-if="order.startTime" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">开始服务时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.startTime}}</view>
<view class="jusitify-line" v-if="order.startTime">
<view class="line-word">开始服务时间</view>
<view class="flex line-word-r">{{order.startTime}}</view>
</view>
<view class="flex justify-between" v-if="order.endTimes" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">结束服务时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.endTimes}}</view>
<view class="jusitify-line" v-if="order.endTimes" >
<view class="line-word">结束服务时间</view>
<view class="line-word-r">{{order.endTimes}}</view>
</view>
<view class="flex justify-between" v-if="order.endTime" style="margin-top: 19rpx;border-bottom:1px solid #ccc;padding-bottom:5px ;margin: 5px 0px;">
<view style="color: #999;font-size: 26rpx;">预估结束时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.endTime}}</view>
<view class="jusitify-line" v-if="order.endTime">
<view class="line-word">预估结束时间</view>
<view class="line-word-r">{{order.endTime}}</view>
</view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">订单费用</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">项目名称</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.ordersMassageList[0].massageType.title}}</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">订单费用</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">服务时长</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.ordersMassageList[0].massageType.duration}}分钟</view>
<view class="jusitify-line">
<view class="line-word">项目名称</view>
<view class="line-word-r">{{order.ordersMassageList[0].massageType.title}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">项目价格</view>
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.massagePrice}}</view>
<view class="jusitify-line">
<view class="line-word">服务时长</view>
<view class="line-word-r">{{order.ordersMassageList[0].massageType.duration}}分钟</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">会员折扣</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.vipRate}}%</view>
<view class="jusitify-line">
<view class="line-word">项目价格</view>
<view class="line-word-r">￥{{order.massagePrice}}</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="jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="jusitify-line">
<view style="color: #333;font-size: 26rpx;">
小计：
</view>
@ -162,110 +171,129 @@
</text>
</view>
</view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">出行费用</view>
<view class="flex justify-between" v-if="order.tripWay" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">出行方式</view>
<view v-if="order.tripWay == 1">公交</view>
<view v-if="order.tripWay == 2">出租</view>
<view v-if="order.tripWay == 3">免费</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between" v-if="order.km" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">全程距离</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.km}}km</view>
<view class="jusitify-line" v-if="order.tripWay" >
<view class="line-word">出行方式</view>
<view class="line-word-r" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r" v-if="order.tripWay == 2">出租</view>
<view class="line-word-r" v-if="order.tripWay == 3">免费</view>
</view>
<view class="flex justify-between" v-if="order.taxiMoney" style="margin-top: 19rpx;border-bottom:1px solid #ccc;padding-bottom:5px ;margin-bottom: 5px;">
<view style="color: #999;font-size: 26rpx;">出行费用</view>
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.taxiMoney}}</view>
<view class="jusitify-line" v-if="order.km">
<view class="line-word">全程距离</view>
<view class="line-word-r" >{{order.km}}km</view>
</view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">优惠券信息</view>
<view class="flex justify-between" style="margin-top: 19rpx;border-bottom:1px solid #ccc;padding-bottom:5px ;margin: 5px 0px;">
<view style="color: #999;font-size: 26rpx;">优惠券</view>
<view class="" style="color: #F93731;font-size: 26rpx;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="jusitify-line" v-if="order.taxiMoney">
<view class="line-word">出行费用</view>
<view class="line-word-r">￥{{order.taxiMoney}}</view>
</view>
<view class="justify-title-nav">
<view class="justify-title">优惠券信息</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="jusitify-line" >
<view class="line-word">优惠券</view>
<view class="line-word" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="" v-else>-</view>
</view>
<view class="jusitify-line-end"></view>
<view v-if="order.addNum!=null">
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">加钟信息</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">加钟项目</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.addEntryName}}</view>
<view class="justify-title-nav">
<view class="justify-title">加钟信息</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">加钟价格</view>
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.addPrice}}</view>
<view class="jusitify-line" >
<view class="line-word">加钟项目</view>
<view class="line-word-r">{{order.addEntryName}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">加钟时长</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.addTime}}分钟</view>
<view class="jusitify-line">
<view class="line-word">加钟价格</view>
<view class="line-word-r">￥{{order.addPrice}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">加钟次数</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.addNum}}</view>
<view class="jusitify-line">
<view class="line-word">加钟时长</view>
<view class="line-word-r">{{order.addTime}}分钟</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">会员折扣</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.vipRate}}%</view>
<view class="jusitify-line">
<view class="line-word">加钟次数</view>
<view class="line-word-r">{{order.addNum}}</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="jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="jusitify-line">
<view style="color: #333;font-size: 26rpx;">小计：</view>
<view class="" style="color: #333;">￥<text
style="font-size: 35rpx;font-weight: bold;">{{order.addMoney}}</text></view>
</view>
</view>
<view class="jusitify-line-end"></view>
<view v-if="order.oldOrdersId!=null">
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">升级服务</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">升级项目</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.ordersMassageList[0].massageType.title}}</view>
<view class="justify-title-nav">
<view class="justify-title">升级服务</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">升级价格</view>
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.sumMoney}}</view>
<view class="jusitify-line">
<view class="line-word">升级项目</view>
<view class="line-word-r">{{order.ordersMassageList[0].massageType.title}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">会员折扣</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.vipRate}}%</view>
<view class="jusitify-line">
<view class="line-word">升级价格</view>
<view class="line-word-r">￥{{order.sumMoney}}</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="jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="jusitify-line">
<view style="color: #333;font-size: 26rpx;">小计：</view>
<view class="" style="color: #333;">￥<text
style="font-size: 35rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
</view>
</view>
<view class="jusitify-line-end"></view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">费用明细</view>
<view class="flex align-center margin-top-lg justify-between">
<view style="color: #333;font-size: 26rpx;">订单费用：</view>
<view class="justify-title-nav">
<view class="justify-title">费用明细</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="jusitify-line">
<view class="line-word">订单费用：</view>
<view class="" style="color: #333;">￥<text
style="font-size: 26rpx;font-weight: bold;">{{(order.massagePrice*order.ordersMassageList[0].num)*(order.vipRate/100)*(1+order.technicianRate/100)}}</text></view>
</view>
<view class="flex align-center margin-top-lg justify-between">
<view style="color: #333;font-size: 26rpx;">出行费用：</view>
<view class="" style="color: #333;">￥<text
<view class="jusitify-line">
<view class="line-word">出行费用：</view>
<view class="line-word-r">￥<text
style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
</view>
<view class="flex align-center margin-top-lg justify-between">
<view style="color: #333;font-size: 26rpx;">优惠券：</view>
<view class="" style="color: #F93731;" v-if="order.couponMoney">
<view class="jusitify-line">
<view class="line-word">优惠券：</view>
<view class="line-word-r" style="color: #F93731;" v-if="order.couponMoney">
-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view>
<view class="" v-else>-</view>
</view>
<view class="flex align-center margin-top-lg justify-between" v-if="order.addMoney!=null">
<view style="color: #333;font-size: 26rpx;">加钟费用：</view>
<view class="" style="color: #333;">￥
<view class="jusitify-line"" v-if="order.addMoney!=null">
<view class="line-word">加钟费用：</view>
<view class="line-word-r"">￥
<text style="font-size: 26rpx;font-weight: bold;">{{order.addMoney?order.addMoney:0}}</text></view>
</view>
<view class="flex align-center margin-top-lg justify-between" v-if="order.oldOrdersId!=null">
<view style="color: #333;font-size: 26rpx;">升级费用：</view>
<view class="" style="color: #333;">￥
<view class="jusitify-line" v-if="order.oldOrdersId!=null">
<view class="line-word">升级费用：</view>
<view class="line-word-r"">￥
<text style="font-size: 26rpx;font-weight: bold;">{{order.sumMoney?order.sumMoney:0}}</text></view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">合计：</view>
<view class="" style="color: #333;">￥<text
<view class="line-word-r">￥<text
style="font-size: 35rpx;font-weight: bold;">
{{
((order.massagePrice*order.ordersMassageList[0].num)*(order.vipRate/100)*(1+order.technicianRate/100))
@ -276,7 +304,7 @@
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 12px;">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view>
</view>
@ -1945,8 +1973,8 @@
}
.pay-ding-top{
width: 100%;
height: 80rpx;
background-image: linear-gradient(to bottom, rgba(8, 162, 138, 0.5), #fff);
height: 100rpx;
background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
border-top-left-radius: 24rpx;
border-top-right-radius: 24rpx;
padding: 0px 29rpx;
@ -1962,14 +1990,15 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: 550;
font-size: 30rpx;
color: #333333;
}
.d-touxiang{
width: 46rpx;
height: 46rpx;
width: 55rpx;
height: 55rpx;
border-radius: 50%;
border: 1px solid #f2fffd;
}
.money-pay-jia{
font-weight: 400;
@ -2012,14 +2041,31 @@
}
.pay-title{
font-weight: bold;
font-size: 28rpx;
font-size: 32rpx;
color: #333333;
margin-bottom: 5px;
margin-bottom: 12px;
}
page {
.page {
background: #f7f7f7;
}
.jusitify-line{
height: 78rpx;
padding: 20rpx 0;
font-size: 30rpx;
display: flex;
justify-content: space-between;
}
.jusitify-line-end{
height:1px;
border-bottom: 1px #e5e5e5 solid;
margin: 30rpx 0;
}
.line-word{
color: #999;
}
.line-word-r{
color: #333;
}
.bgImg {
background-image: url('https://admin.sjajk.com/file/uploadPath/2023/01/03/02952e7260e553d0f3bb26a1cd154921.png');
background-size: 100% 1161rpx;
@ -2193,4 +2239,31 @@
justify-content: space-between;
align-items: center;
}
.level_button{
background: #019C88;
border-radius: 20rpx 8rpx 20rpx 8rpx;
padding: 10rpx 20rpx;
color: #fff;
font-size: 12px;
}
.justify-title-nav{
width: 90%;
display: flex;
flex-direction: column;
position: relative;
margin: 10px 0;
}
.justify-title{
font-weight: bold;
font-size: 16px;
color: #333;
}
.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));
}
</style>

20
my/order/payShengji.vue
View File

@ -59,7 +59,7 @@
<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
<view class="" v-if="order.artificer">
<view class="flex align-center justify-between jusitify-line">
<view class="line-word">下单人</view>
<view class="line-word">客户姓名</view>
<view class="line-word-r">
{{order.userName}}
</view>
@ -202,7 +202,6 @@
<view class="line-word-r" style="color: #F93731;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="line-word-r" v-else>-</view>
</view>
<view class="jusitify-line-end"></view>
<view v-if="order.addNum!=null">
<view class="justify-title-nav">
<view class="justify-title">加钟信息</view>
@ -310,7 +309,7 @@
</view>
</view>
<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
<view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view>
<!-- <view class="pay-ding feiuong">
@ -1849,10 +1848,7 @@
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
}
.zhuangtai{
padding: 5rpx 23rpx;
border: 1px solid #029D88;
color: #029D88;
border-radius: 30rpx;
}
.head-title-right{
display: flex;
@ -2191,8 +2187,9 @@
font-size: 30rpx;
}
.jusitify-line{
height: 60rpx;
height: 78rpx;
padding: 20rpx 0;
font-size: 30rpx;
}
.jusitify-line-end{
height:1px;
@ -2236,9 +2233,16 @@
}
.level_button{
background: #019C88;
border-radius: 30rpx;
border-radius: 20rpx 8rpx 20rpx 8rpx;
padding: 10rpx 20rpx;
color: #fff;
font-size: 12px;
}
.be-remarks{
border: 1px dashed #FE912E;
padding: 10rpx 20rpx;
border-radius: 8rpx;
color: #fe912E;
font-size: 24rpx;
}
</style>