This commit is contained in:
parent
06c256cb55
commit
2641553045
|
|
@ -105,58 +105,64 @@
|
|||
</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="flex align-center" @tap="copy(order.ordersNo)"
|
||||
style="color: #333;font-size: 26rpx;">
|
||||
<view class="justify-title-nav">
|
||||
<view class="justify-title">订单信息</view>
|
||||
<view class="justify-title-nav-bor"></view>
|
||||
</view>
|
||||
<view class="flex justify-between jusitify-line">
|
||||
<view class="line-word">订单编号</view>
|
||||
<view class="flex line-word-r" @tap="copy(order.ordersNo)">
|
||||
<view class="">{{order.ordersNo}}</view>
|
||||
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
|
||||
</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="flex justify-between 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="flex justify-between jusitify-line" >
|
||||
<view class="line-word">下单时间</view>
|
||||
<view class="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="flex justify-between jusitify-line" v-if="order.startTime">
|
||||
<view class="line-word">开始服务时间</view>
|
||||
<view class="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="flex justify-between 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="flex justify-between 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.oldEntryName}}</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 class="flex justify-between jusitify-line">
|
||||
<view class="line-word">项目名称</view>
|
||||
<view class="line-word-r">{{order.oldEntryName}}</view>
|
||||
</view>
|
||||
<view class="flex justify-between jusitify-line">
|
||||
<view style="color: #999;font-size: 26rpx;">服务时长</view>
|
||||
<view class="" style="color: #333;font-size: 26rpx;">{{order.oldMassageDuration}}分钟</view>
|
||||
<view class="line-word-r">{{order.oldMassageDuration}}分钟</view>
|
||||
</view>
|
||||
<view class="flex justify-between" style="margin-top: 19rpx;">
|
||||
<view class="flex justify-between jusitify-line">
|
||||
<view style="color: #999;font-size: 26rpx;">项目价格</view>
|
||||
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.oldMassagePrice}}</view>
|
||||
<view class="line-word-r">￥{{order.oldMassagePrice}}</view>
|
||||
</view>
|
||||
<view class="flex justify-between" style="margin-top: 19rpx;">
|
||||
<view class="flex justify-between jusitify-line" >
|
||||
<view style="color: #999;font-size: 26rpx;">下单数量</view>
|
||||
<view class="" style="color: #333;font-size: 26rpx;">{{order.oldMassageNum}}</view>
|
||||
<view class="line-word-r">{{order.oldMassageNum}}</view>
|
||||
</view>
|
||||
<view class="flex justify-between" style="margin-top: 19rpx;">
|
||||
<view class="flex justify-between jusitify-line">
|
||||
<view style="color: #999;font-size: 26rpx;">会员折扣</view>
|
||||
<view class="" style="color: #333;font-size: 26rpx;">{{order.vipRate}}%</view>
|
||||
<view class="line-word-r">{{order.vipRate}}%</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;">
|
||||
<view style="color: #333;font-size: 26rpx;">
|
||||
小计：
|
||||
</view>
|
||||
|
|
@ -166,116 +172,132 @@
|
|||
</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="jusitify-line-end"></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="justify-title-nav jusitify-line">
|
||||
<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="flex justify-between 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="flex justify-between 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="" v-else>-</view>
|
||||
<view class="flex justify-between jusitify-line" v-if="order.taxiMoney" >
|
||||
<view class="line-word">出行费用</view>
|
||||
<view class="line-word-r">￥{{order.taxiMoney}}</view>
|
||||
</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 jusitify-line">
|
||||
<view class="line-word">优惠券</view>
|
||||
<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 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="flex justify-between 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="flex justify-between 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="flex justify-between 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="flex justify-between 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="flex justify-between jusitify-line">
|
||||
<view class="line-word">会员折扣</view>
|
||||
<view class="line-word-r">{{order.vipRate}}%</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
|
||||
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.massagePrice}}</view>
|
||||
<view class="flex justify-between 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.duration}}分钟</view>
|
||||
<view class="flex justify-between jusitify-line">
|
||||
<view class="line-word">项目价格</view>
|
||||
<view class="line-word-r">￥{{order.massagePrice}}</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="flex justify-between jusitify-line" >
|
||||
<view class="line-word">服务时长</view>
|
||||
<view class="line-word-r">{{order.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="flex justify-between 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="flex justify-between jusitify-line">
|
||||
<view class="line-word">会员折扣</view>
|
||||
<view class="line-word-r">{{order.vipRate}}%</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
|
||||
style="font-size: 35rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
|
||||
</view>
|
||||
</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="" style="color: #333;">￥<text
|
||||
<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 jusitify-line">
|
||||
<view class="line-word">订单费用：</view>
|
||||
<view class="line-word-r">￥<text
|
||||
style="font-size: 26rpx;font-weight: bold;">{{((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100)).toFixed(2)}}</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
|
||||
style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
|
||||
<view class="flex justify-between jusitify-line">
|
||||
<view class="line-word"">出行费用：</view>
|
||||
<view class="line-word-r">￥<text
|
||||
>{{order.taxiMoney}}</text></view>
|
||||
</view>
|
||||
<view class="flex align-center margin-top-lg justify-between" v-if="order.couponMoney">
|
||||
<view style="color: #333;font-size: 26rpx;">优惠券：</view>
|
||||
<view class="flex justify-between jusitify-line" v-if="order.couponMoney">
|
||||
<view class="line-word"">优惠券：</view>
|
||||
<view class="" style="color: #F93731;">
|
||||
-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney?order.couponMoney:0}}</text></view>
|
||||
</view>
|
||||
<view class="flex align-center margin-top-lg justify-between" v-if="order.addMoney">
|
||||
<view style="color: #333;font-size: 26rpx;">加钟费用：</view>
|
||||
<view class="flex justify-between jusitify-line" v-if="order.addMoney">
|
||||
<view class="line-word">加钟费用：</view>
|
||||
<view class="" style="color: #333;" >￥
|
||||
<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="flex justify-between jusitify-line" v-if="order.oldOrdersId!=null">
|
||||
<view class="line-word">升级费用：</view>
|
||||
<view class="" style="color: #333;">￥
|
||||
<text style="font-size: 26rpx;font-weight: bold;">{{order.sumMoney}}</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="flex justify-between jusitify-line" style="justify-content: flex-end;">
|
||||
<view class="line-word">合计：</view>
|
||||
<view class="" style="color: #333;">
|
||||
￥<text style="font-size: 35rpx;font-weight: bold;">
|
||||
{{
|
||||
|
|
@ -288,9 +310,7 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<view class="flex justify-between" style="margin-top: 19rpx;">
|
||||
<view style="color: #999;font-size: 12px;">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
|
||||
</view>
|
||||
<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="pay-ding feiuong">
|
||||
|
|
@ -1919,7 +1939,7 @@
|
|||
}
|
||||
.list-pay{
|
||||
width: 100%;
|
||||
padding: 0px 29rpx;
|
||||
padding: 10rpx 29rpx;
|
||||
}
|
||||
.pay-ding-top{
|
||||
width: 100%;
|
||||
|
|
@ -2176,12 +2196,54 @@
|
|||
font-size: 30rpx;
|
||||
}
|
||||
.jusitify-line{
|
||||
height: 80rpx;
|
||||
height: 60rpx;
|
||||
padding: 20rpx 0;
|
||||
}
|
||||
.jusitify-line-end{
|
||||
height:1px;
|
||||
border-bottom: 1px #e5e5e5 solid;
|
||||
margin: 30rpx 0;
|
||||
}
|
||||
.line-word{
|
||||
color: #999;
|
||||
}
|
||||
.line-word-r{
|
||||
color: #888;
|
||||
color: #333;
|
||||
}
|
||||
.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));
|
||||
}
|
||||
.prompt-text{
|
||||
width: 100%;
|
||||
padding: 8rpx 15rpx;
|
||||
border: #FE912E 1px dashed;
|
||||
color: #fe912E;
|
||||
border-radius: 10rpx;
|
||||
font-size: 12px;
|
||||
margin-top: 30rpx;
|
||||
}
|
||||
.level_button{
|
||||
background: #019C88;
|
||||
border-radius: 30rpx;
|
||||
padding: 8rpx 20rpx;
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -120,7 +120,8 @@
|
|||
<view class="fujin-view" v-for="(item,index) in nearbyTechnician" :key="index" @click="goOrder(item)">
|
||||
<view class="index-fujin-view">
|
||||
<image class="index-fujin-view-img" :src="item.artificerImg" mode=""></image>
|
||||
<view class="index-fujin-view-text">
|
||||
<view class="index-fujin-view-text
|
||||
">
|
||||
<image src="../../static/orderDetail/dingwei.png" mode="w"></image>
|
||||
<span>{{item.dingwei}}km</span>
|
||||
</view>
|
||||
|
|
@ -1675,4 +1676,5 @@
|
|||
height: 100vh;
|
||||
overflow: auto;
|
||||
}
|
||||
.jusitify-line-end{}
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Reference in New Issue