This commit is contained in:
Mr.jiang 2024-07-05 23:39:28 +08:00
parent cae3d6bc75
commit 2cf6f91820
12 changed files with 5446 additions and 558 deletions

View File

@ -10,13 +10,15 @@
<view class="pay-title">服务项目</view>
<view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;">
<image :src="order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.massageImg:order.ordersMassageList[0].userPackageDetail.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
<image :src="order.ordersMassageList[0].massageType.massageImg"
v-if="order.userPackageDetailId==null" style="width: 100%;height: 100%;border-radius: 19upx;"></image>
<image :src="order.ordersMassageList[0].userPackageDetail.massageImg"
v-else style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view>
<view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right">
<view class="margin-right-xs u-skeleton-fillet head-title" style="font-size: 30rpx;">
{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}
{{order.entryName}}
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
@ -35,17 +37,17 @@
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
<view style="justify-content: space-between;">
{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟
{{order.duration}}分钟
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span></span>
<span>{{order.price}}</span>
<span>{{order.massagePrice}}</span>
</view>
<view>
<uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" />
<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
</view>
</view>
</view>
@ -101,7 +103,8 @@
</view>
</view>
</view>
<view class="list-pay">
<!-- 普通项目信息 -->
<view class="list-pay" v-if="order.userPackageDetailId==null">
<view class="justify-title-nav ">
<view class="justify-title">订单信息</view>
<view class="justify-title-nav-bor"></view>
@ -122,18 +125,6 @@
<view class="add-con-title">下单时间</view>
<view class="add-con-cont">{{order.createTime}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.startTime">
<view class="add-con-title">开始服务时间</view>
<view class="add-con-cont">{{order.startTime}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.endTimes" >
<view class="add-con-title">结束服务时间</view>
<view class="add-con-cont">{{order.endTimes}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.endTime">
<view class="add-con-title">预估结束时间</view>
<view class="add-con-cont" >{{order.endTime}}</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
@ -142,27 +133,31 @@
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">项目名称</view>
<view class="add-con-cont" >{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}</view>
<view class="add-con-cont">{{order.entryName}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">服务时长</view>
<view class="add-con-cont" >{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟</view>
<view class="add-con-cont">{{order.duration}}分钟</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">项目价格</view>
<view class="add-con-cont" >{{order.price}}</view>
<view class="add-con-cont">{{order.massagePrice}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont" >{{order.vipRate}}%</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">技师加成</view>
<view class="add-con-cont" >{{order.technicianRate}}%</view>
</view>
<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 class="" style="color: #333;">
<text style="font-size: 35rpx;font-weight: bold;">
{{order.massageCouponMoney}}
{{order.massageMoney}}
</text>
</view>
</view>
@ -184,7 +179,8 @@
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">出行费用</view>
<view class="add-con-cont">{{order.taxiMoney}}</view>
<view class="add-con-cont" v-if="order.taxiMoney">{{order.taxiMoney}}</view>
<view class="add-con-cont" v-else>-</view>
</view>
<view class="jusitify-line-end add-lin"></view>
<view class="justify-title-nav">
@ -203,12 +199,12 @@
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">订单费用</view>
<view class="add-con-cont"><text style="font-size: 26rpx; font-weight: bold;">{{order.massageCouponMoney}}</text></view>
<view class="add-con-cont"><text style="font-size: 26rpx; font-weight: bold;">{{order.massageMoney}}</text></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">出行费用</view>
<view class="add-con-cont"><text
>{{order.taxiMoney}}</text></view>
<view class="add-con-cont" v-if="order.taxiMoney"><text>{{order.taxiMoney}}</text></view>
<view class="add-con-cont" v-else>-</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">优惠券</view>
@ -221,7 +217,7 @@
<view class="add-con-title">合计</view>
<view class="add-con-cont" style="color: #FF3939;font-size: 32rpx;">
<text style="font-size: 35rpx;font-weight: bold;">
{{order.payMoney}}
{{order.payMoneyTotal}}
</text>
</view>
</view>
@ -230,6 +226,135 @@
<view class="prompt-text">温馨提示费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view>
<!-- 套餐 次卡 疗程 信息 -->
<view class="list-pay" v-else>
<view class="justify-title-nav ">
<view class="justify-title">订单信息</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 add-con-cont" @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 add-lin">
<view class="add-con-title">预约时间</view>
<view class="add-con-cont" >{{order.serveTime}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">下单时间</view>
<view class="add-con-cont">{{order.createTime}}</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 add-lin" >
<view class="add-con-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
<view class="add-con-cont">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">项目名称</view>
<view class="add-con-cont">{{order.entryName}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">服务时长</view>
<view class="add-con-cont">{{order.duration}}分钟</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">项目价格</view>
<view class="add-con-cont">{{order.massagePrice}}</view>
</view>
<!-- <view class="flex justify-between add-lin">
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont" >{{order.vipRate}}%</view>
</view> -->
<!-- <view class="flex justify-between add-lin">
<view class="add-con-title">技师加成</view>
<view class="add-con-cont" >{{order.technicianRate}}%</view>
</view> -->
<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 class="" style="color: #333;">
<text style="font-size: 35rpx;font-weight: bold;">
{{order.massagePrice}}
</text>
</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 add-lin" v-if="order.tripWay" >
<view class="add-con-title">出行方式</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 class="flex justify-between add-lin" v-if="order.km">
<view class="add-con-title">全程距离</view>
<view class="add-con-cont">{{order.km}}km</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">出行费用</view>
<view class="add-con-cont" v-if="order.taxiMoney">{{order.taxiMoney}}</view>
<view class="add-con-cont" v-else>-</view>
</view>
<view class="jusitify-line-end add-lin"></view>
<view class="justify-title-nav">
<view class="justify-title">优惠券信息</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">优惠券</view>
<view class="add-con-cont" style="color: #F93731;font-size: 30rpx;font-weight: bold;" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="" v-else>-</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 add-lin">
<view class="add-con-title">订单费用</view>
<view class="add-con-cont"><text style="font-size: 26rpx; font-weight: bold;">{{order.massageMoney}}</text></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">出行费用</view>
<view class="add-con-cont" v-if="order.taxiMoney"><text>{{order.taxiMoney}}</text></view>
<view class="add-con-cont" v-else>-</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">优惠券</view>
<view class="add-con-cont" style="color: #F93731;" v-if="order.couponMoney">
-<text style="font-weight: bold;">{{order.couponMoney}}</text></view>
<view class="" v-else>-</view>
</view>
<view class="jusitify-line-end"></view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">合计</view>
<view class="add-con-cont" style="color: #FF3939;font-size: 32rpx;">
<text style="font-size: 35rpx;font-weight: bold;">
{{order.payMoneyTotal}}
</text>
</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="prompt-text">温馨提示费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view>
</view>
</view>
<view class="showBtn" v-if="order.status ==1">
@ -1665,6 +1790,7 @@
</script>
<style lang="scss" scoped>
/deep/.u-size-default{
width: 80px !important;
}

View File

@ -7,15 +7,17 @@
<view class="pay-title" style="">服务项目</view>
<view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;">
<image :src="order.ordersMassageList[0].userPackageDetail.massageImg"
<image v-if="order.ordersMassageList[0].massageType" :src="order.ordersMassageList[0].massageType.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
<image v-else :src="order.ordersMassageList[0].userPackageDetail.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view>
<view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right">
<view class="margin-right-xs u-skeleton-fillet head-title" style="font-size: 30rpx;">
{{order.ordersMassageList[0].userPackageDetail.title}}
{{order.entryName}}
</view>
<view class="zhuangtai">
<!-- <view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==5">已完成</view>
@ -26,20 +28,20 @@
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
<view v-if="order.status ==10">待补单</view>
</view>
</view> -->
</view>
<view class="flex align-center">
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
<view style="justify-content: space-between;">
{{order.ordersMassageList[0].userPackageDetail.duration}}分钟
{{order.duration}}分钟
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span></span>
<span>{{order.ordersMassageList[0].userPackageDetail.packagePrice}}</span>
<span>{{order.massagePrice}}</span>
</view>
<view>
<!-- <uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" /> -->
@ -64,7 +66,7 @@
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</view>
</view>
<view class="serverAddress add-lin">
<view class="serverAddress add-lin" style="line-height: 15px;">
<view class="add-con-title">服务地址</view>
<view class="add-con-cont" style="width: 73%;">{{order.address}}</view>
</view>
@ -98,7 +100,142 @@
</view>
</view>
</view>
<view class="list-pay">
<!-- 次卡 疗程 升级项目 -->
<view class="list-pay" v-if="order.ordersMassageList[0].userPackageDetail==null">
<view class="justify-title-nav">
<view class="justify-title">订单信息</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 add-con-cont" @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 add-lin">
<view class="add-con-title">预约时间</view>
<view class="add-con-cont" >{{order.serveTime}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">下单时间</view>
<view class="add-con-cont">{{order.createTime}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.startTime">
<view class="add-con-title">开始服务时间</view>
<view class="add-con-cont">{{order.startTime}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.endTimes" >
<view class="add-con-title">结束服务时间</view>
<view class="add-con-cont">{{order.endTimes}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.endTime">
<view class="add-con-title">预估结束时间</view>
<view class="add-con-cont" >{{order.endTime}}</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" style="margin-top: 19rpx;">
<view class="add-con-title">{{order.packageType=='105'?'次卡':'疗程'}}名称</view>
<view class="add-con-cont" >{{order.oldOrdersMassageList[0].userPackageDetail.mainTitle}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="add-con-title">项目名称</view>
<view class="add-con-cont" >{{order.ordersMassageList[0].massageType.title}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="add-con-title">服务时长</view>
<view class="add-con-cont" >{{order.ordersMassageList[0].massageType.duration}}分钟</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="add-con-title">项目价格</view>
<view class="add-con-cont" >{{order.oldMassagePrice}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont" >{{order.vipRate}}%</view>
</view>
<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 class="" style="color: #333;">
<text style="font-size: 35rpx;font-weight: bold;">
{{order.oldMassageMoney}}
</text>
</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" 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>
<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>
<view class="flex justify-between" style="margin-top: 19rpx;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>
<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;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>
<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 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.ordersMassageList[0].massageType.packagePrice}}</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>
<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">
-<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" 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.payMoney}}
</text>
</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="prompt-text">温馨提示费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view>
<!-- 次卡 疗程 项目 -->
<view class="list-pay" v-else>
<view class="justify-title-nav">
<view class="justify-title">订单信息</view>
<view class="justify-title-nav-bor"></view>
@ -231,165 +368,17 @@
<view class="prompt-text">温馨提示费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view>
</view>
<!-- <view class="pay-ding feiuong">
<view class="fei-title">费用明细</view>
<view class="fei-view">
<view class="fei-view-list">
<span>服务费用</span>
<span>268</span>
</view>
<view class="fei-view-list">
<span>出行费用</span>
<span>{{order.taxiMoney}}</span>
</view>
<view class="fei-view-list">
<span>优惠券</span>
<span style="color: #FF3939;">-2</span>
</view>
<view class="fei-view-list-z">
<span>总金额</span>
<span style="color: #FF3939;font-size: 29rpx;">286</span>
</view>
</view>
</view> -->
</view>
<!-- <view class="bg padding radius margin-top-sm">
<view class="text-lg text-bold">
服务信息
</view>
<view class="margin-right-xs">
<view class="flex justify-between margin-top-lg">
<view style="width: 170rpx;">服务时间</view>
<view class="">
<text>{{order.serveTime}}</text>
</view>
</view>
<view class="flex justify-between margin-top-lg">
<view style="width: 170rpx;">服务地点</view>
<view class="flex" @tap="bindGps(order.latitude,order.longitude,order.address)">
<view class="">
{{order.address}}
<image src="../../static/images/address.png" style="width: 13px;height: 15px;"></image>
</view>
</view>
</view>
<view class="flex justify-between margin-top-lg">
<view style="width: 170rpx;">联系方式</view>
<view class="" @click="bindphone(order.phone)">
{{order.phone}}
<image src="../../static/images/phone.png" style="width: 15px;height: 15px;"></image>
</view>
</view>
<view class="flex justify-between margin-top-lg" v-if="order.remark">
<view style="width: 170rpx;">备注内容</view>
<view class="flex">
<view class="">
{{order.remark}}
</view>
</view>
</view>
</view>
</view> -->
<view v-if="order.status !=6" class="flex tabber padding-top-sm padding-bottom-sm align-center">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
v-if="order.status != 3 &&
order.status != 4 &&
order.status != 5&&
order.status != 10"
>
取消订单
</u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
v-if="order.status == 1"
class="dingshi">立即支付
</u-button>
<u-button v-if="order.status == 6|| order.status == 3" :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="dingshi">
去投诉
</u-button>
<u-button v-if="order.status == 9&&order.refusalContent" :custom-style="customStyle2"
shape="circle" :plain="true"
@click="toggleQ('center',order)"
class="dingshi">
拒单详情
</u-button>
<u-button v-if="order.status == 10" :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
class="dingshi">
立即预约
</u-button>
<u-button
v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==1||order.status==2||order.status==7||order.status==8)&&!order.refusalContent"
:custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
class="dingshi">
修改订单
</u-button>
<u-button v-if="order.status == 3" :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
class="dingshi">
去评价
</u-button>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
</view>
<view v-else class="flex tabber padding-top-sm padding-bottom-sm align-center">
<view class="showBtn-mian">
<view class="showBtn">
<view class="gengduo" @click.stop="gengBtn">更多</view>
<view class="show-btn-lin">
<u-button shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
<u-button
v-if="order.status == 6"
shape="circle" :plain="true"
@click="toggle('center',order)"
class="btns">
提前结束
</u-button>
<u-button
v-if="order.status == 6"
shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
class="btns">
充值
</u-button>
<u-button
v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==1||order.status==2||order.status==7||order.status==8)&&!order.refusalContent" :custom-style="customStyle1"
shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)"
class="btns">
修改订单
</u-button>
</view>
</view>
<view class="showBtn-view" v-show="btnShow">
<u-button
v-if="order.addNum ==null && order.status == 6"
shape="circle" :plain="true"
@tap="saveJZ(order.ordersMassageList[0].userPackageDetail.userPackageDetailId)"
class="btns">
加钟
</u-button>
<u-button v-if="order.oldOrdersId==null && order.status == 6&&order.addNum==null"
shape="circle" :plain="true"
@tap="saveJZS(order.artificerId)"
class="btns">
服务升级
</u-button>
</view>
</view>
</view>
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 加钟-->

2372
my/order/payJaZ - 副本.vue Normal file

File diff suppressed because it is too large Load Diff

View File

@ -10,13 +10,15 @@
<view class="pay-title" style="">服务项目</view>
<view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;">
<image :src="order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.massageImg:order.ordersMassageList[0].userPackageDetail.massageImg"
<image v-if="order.userPackageDetailId==null" :src="order.ordersMassageList[0].massageType.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
<image v-else :src="order.ordersMassageList[0].userPackageDetail.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view>
<view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right">
<view class="margin-right-xs text-df u-skeleton-fillet head-title">
{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}
{{order.entryName}}
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
@ -35,18 +37,16 @@
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
<view style="justify-content: space-between;">
{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟
{{order.duration}}分钟
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span></span>
<span>{{order.massagePrice}}</span>
</view>
<view>
<uni-number-box :disabled="true" :value="order.oldOrdersId==null?order.ordersMassageList[0].num:order.oldMassageNum" :width='27' :min="1" @change="changeValue" />
<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
</view>
</view>
</view>
@ -102,7 +102,8 @@
</view>
</view>
</view>
<view class="list-pay">
<!-- 普通项目 加钟信息 -->
<view class="list-pay" v-if="order.userPackageDetailId==null">
<view class="justify-title-nav">
<view class="justify-title">订单信息</view>
<view class="justify-title-nav-bor"></view>
@ -124,49 +125,45 @@
<view class="line-word">下单时间</view>
<view class="flex line-word-r">{{order.createTime}}</view>
</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="jusitify-line" v-if="order.endTimes" >
<view class="line-word">结束服务时间</view>
<view class="line-word-r">{{order.endTimes}}</view>
</view>
<view class="jusitify-line" v-if="order.endTime">
<view class="line-word">预估结束时间</view>
<view class="line-word-r">{{order.endTime}}</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="jusitify-line">
<view class="line-word">项目名称</view>
<view class="line-word-r">{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.title:order.ordersMassageList[0].userPackageDetail.title}}</view>
<view class="line-word-r" v-if="order.oldEntryName==null">{{order.entryName}}</view>
<view class="line-word-r" v-else>{{order.oldEntryName}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">服务时长</view>
<view class="line-word-r">{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟</view>
<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view>
</view>
<view class="jusitify-line">
<view class="line-word">项目价格</view>
<view class="line-word-r">{{order.massagePrice}}</view>
<view class="line-word-r" v-if="order.oldMassagePrice==null">{{order.massagePrice}}</view>
<view class="line-word-r" v-else>{{order.oldMassagePrice}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</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.massageCouponMoney}}
</text>
<text v-if="order.oldMassageMoney==null" style="font-size: 35rpx;font-weight: bold;">
{{order.massageMoney}}
</text>
<text v-else style="font-size: 35rpx;font-weight: bold;">
{{order.oldMassageMoney}}
</text>
</view>
</view>
@ -187,9 +184,10 @@
<view class="line-word-r" >{{order.km}}km</view>
</view>
<view class="jusitify-line" v-if="order.taxiMoney">
<view class="jusitify-line">
<view class="line-word">出行费用</view>
<view class="line-word-r">{{order.taxiMoney}}</view>
<view class="line-word-r" v-if="order.taxiMoney">{{order.taxiMoney}}</view>
<view class="line-word-r" v-else>-</view>
</view>
<view class="justify-title-nav">
<view class="justify-title">优惠券信息</view>
@ -226,6 +224,10 @@
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</view>
</view>
<view class="jusitify-line">
<view style="color: #333;font-size: 26rpx;">小计</view>
<view class="" style="color: #333;"><text
@ -241,38 +243,232 @@
</view>
<view class="jusitify-line">
<view class="line-word">订单费用</view>
<view class="" style="color: #333;"><text
style="font-size: 26rpx;font-weight: bold;">{{order.massageCouponMoney}}</text></view>
<view class="line-word-r" v-if="order.oldMassageMoney==null"><text
style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
<view class="line-word-r" v-else><text
style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
</view>
<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 class="line-word-r" v-if="order.taxiMoney"><text>{{order.taxiMoney}}</text></view>
<view class="line-word-r" v-else>-</view>
</view>
<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="" 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="jusitify-line">
<view class="line-word">加钟费用</view>
<view class="line-word-r">
<text style="font-size: 26rpx;font-weight: bold;">{{order.addMoney}}</text></view>
<view class="" style="color: #333;" >
<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
{{order.addMoney}}
</text>
<text style="font-size: 26rpx;font-weight: bold;" v-else>-</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="line-word-r"><text
style="font-size: 35rpx;font-weight: bold;">
<view class="line-word-r">
<text style="font-size: 35rpx;font-weight: bold;">
{{order.payMoneyTotal}}
</text></view>
</text>
</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="prompt-text">温馨提示费用随会员等级及技师等级不同而上下浮动</view>
</view>
<view class="be-remarks">温馨提示费用随会员等级及技师等级不同而上下浮动</view>
</view>
<!-- 套餐 次卡 疗程 加钟信息 -->
<view class="list-pay" v-else>
<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>
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
</view>
</view>
<view class="jusitify-line">
<view class="line-word">预约时间</view>
<view class="line-word-r">{{order.serveTime}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">下单时间</view>
<view class="flex line-word-r">{{order.createTime}}</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">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
<view class="line-word-r">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">项目名称</view>
<view class="line-word-r" v-if="order.oldEntryName==null">{{order.entryName}}</view>
<view class="line-word-r" v-else>{{order.oldEntryName}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">服务时长</view>
<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view>
</view>
<view class="jusitify-line">
<view class="line-word">项目价格</view>
<view class="line-word-r" v-if="order.oldMassagePrice==null">{{order.massagePrice}}</view>
<view class="line-word-r" v-else>{{order.oldMassagePrice}}</view>
</view>
<!-- <view class="jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</view>
</view> -->
<view class="jusitify-line">
<view style="color: #333;font-size: 26rpx;">
小计
</view>
<view class="" style="color: #333;">
<text v-if="order.oldMassageMoney==null" style="font-size: 35rpx;font-weight: bold;">
{{order.massageMoney}}
</text>
<text v-else style="font-size: 35rpx;font-weight: bold;">
{{order.oldMassageMoney}}
</text>
</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="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="jusitify-line" v-if="order.km">
<view class="line-word">全程距离</view>
<view class="line-word-r" >{{order.km}}km</view>
</view>
<view class="jusitify-line">
<view class="line-word">出行费用</view>
<view class="line-word-r" v-if="order.taxiMoney">{{order.taxiMoney}}</view>
<view class="line-word-r" v-else>-</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>
<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-r">{{order.addEntryName}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">加钟价格</view>
<view class="line-word-r">{{order.addPrice}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">加钟时长</view>
<view class="line-word-r">{{order.addTime}}分钟</view>
</view>
<view class="jusitify-line">
<view class="line-word">加钟次数</view>
<view class="line-word-r">{{order.addNum}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</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 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-r" v-if="order.oldMassageMoney==null"><text
style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
<view class="line-word-r" v-else><text
style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
</view>
<view class="jusitify-line">
<view class="line-word">出行费用</view>
<view class="line-word-r" v-if="order.taxiMoney"><text>{{order.taxiMoney}}</text></view>
<view class="line-word-r" v-else>-</view>
</view>
<view class="jusitify-line">
<view class="line-word">优惠券</view>
<view class="" 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="jusitify-line">
<view class="line-word">加钟费用</view>
<view class="" style="color: #333;" >
<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
{{order.addMoney}}
</text>
<text style="font-size: 26rpx;font-weight: bold;" v-else>-</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="line-word-r">
<text style="font-size: 35rpx;font-weight: bold;">
{{order.payMoneyTotal}}
</text>
</view>
</view>
<view class="be-remarks">温馨提示费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view>
</view>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
@ -1548,6 +1744,14 @@
</script>
<style lang="scss" scoped>
.be-remarks{
border: 1px dashed #FE912E;
padding: 10rpx 20rpx;
border-radius: 8rpx;
color: #fe912E;
font-size: 24rpx;
margin: 10px 0px;
}
.showBtnClass{
position: absolute;
background: #f7f7f7;

View File

@ -10,13 +10,15 @@
<view class="pay-title" style="">服务项目</view>
<view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;">
<image :src="order.oldOrdersMassageList[0].massageType?order.oldOrdersMassageList[0].massageType.massageImg:order.oldOrdersMassageList[0].userPackageDetail.massageImg"
<image v-if="order.userPackageDetailId==null" :src="order.ordersMassageList[0].massageType.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
<image v-else :src="order.ordersMassageList[0].userPackageDetail.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view>
<view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right">
<view class="margin-right-xs pay-word u-skeleton-fillet head-title">
{{order.oldEntryName}}
{{order.entryName}}
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
@ -35,20 +37,17 @@
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
<view style="justify-content: space-between;">
{{order.oldMassageDuration}}分钟
</view>
<!-- <view style="justify-content: space-between;" v-else>
{{order.duration}}分钟
</view> -->
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span></span>
<span>{{order.oldMassagePrice}}</span>
<span>{{order.massagePrice}}</span>
</view>
<view>
<uni-number-box :disabled="true" :value="order.oldOrdersId==null?order.ordersMassageList[0].num:order.oldMassageNum" :width='27' :min="1" @change="changeValue" />
<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
</view>
</view>
</view>
@ -104,7 +103,8 @@
</view>
</view>
</view>
<view class="list-pay">
<!-- 普通项目 升级 加钟 -->
<view class="list-pay" v-if="order.oldOrdersMassageList[0].userPackageDetail==null">
<view class="justify-title-nav">
<view class="justify-title">订单信息</view>
<view class="justify-title-nav-bor"></view>
@ -125,18 +125,6 @@
<view class="line-word">下单时间</view>
<view class="line-word-r">{{order.createTime}}</view>
</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 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 jusitify-line" v-if="order.endTime" >
<view class="line-word">预估结束时间</view>
<view class="line-word-r">{{order.endTime}}</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">订单费用</view>
@ -144,31 +132,41 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">项目名称</view>
<view class="line-word-r">{{order.oldEntryName}}</view>
<view class="line-word-r" v-if="order.oldEntryName==null">{{order.entryName}}</view>
<view class="line-word-r" v-else>{{order.oldEntryName}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">服务时长</view>
<view class="line-word-r">{{order.oldMassageDuration}}分钟</view>
<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">项目价格</view>
<view class="line-word-r">{{order.oldMassagePrice}}</view>
<view class="line-word-r" v-if="order.oldMassagePrice==null">{{order.massagePrice}}</view>
<view class="line-word-r" v-else>{{order.oldMassagePrice}}</view>
</view>
<view class="flex justify-between jusitify-line" >
<view style="color: #999;font-size: 26rpx;">下单数量</view>
<view class="line-word-r">{{order.oldMassageNum}}</view>
<view class="line-word-r">{{order.massageNum}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</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.massageCouponMoney}}
<text v-if="order.oldMassageMoney==null" style="font-size: 35rpx;font-weight: bold;">
{{order.massageMoney}}
</text>
<text v-else style="font-size: 35rpx;font-weight: bold;">
{{order.oldMassageMoney}}
</text>
</view>
</view>
@ -188,9 +186,10 @@
<view class="line-word">全程距离</view>
<view class="line-word-r">{{order.km}}km</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.taxiMoney" >
<view class="flex justify-between jusitify-line">
<view class="line-word">出行费用</view>
<view class="line-word-r">{{order.taxiMoney}}</view>
<view class="line-word-r" v-if="order.taxiMoney">{{order.taxiMoney}}</view>
<view class="line-word-r" v-else>-</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
@ -227,6 +226,10 @@
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</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
@ -234,31 +237,265 @@
</view>
</view>
<view class="jusitify-line-end"></view>
<view v-if="order.oldOrdersId!=null">
<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">{{order.ordersMassageList[0].massageType.title}}</view>
<view class="line-word-r">{{order.entryName}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">项目价格</view>
<view class="line-word-r">{{order.massagePrice}}</view>
<view class="line-word-r">{{order.oldMassagePrice}}</view>
</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 jusitify-line">
<view class="line-word">升级价格</view>
<view class="line-word-r">{{order.payMoney}}</view>
<view class="line-word">升级差额</view>
<view class="line-word-r">{{(order.massagePrice-order.oldMassagePrice).toFixed(2)}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</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.payMoney}}
</text>
</view>
</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" v-if="order.oldMassageMoney==null"><text
style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
<view class="line-word-r" v-else><text
style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">出行费用</view>
<view class="line-word-r" v-if="order.taxiMoney"><text>{{order.taxiMoney}}</text></view>
<view class="line-word-r" v-else>-</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">优惠券</view>
<view class="" 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 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;" v-if="order.addMoney">
{{order.addMoney}}
</text>
<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">升级费用</view>
<view class="" style="color: #333;">
<text style="font-size: 26rpx;font-weight: bold;" v-if="order.payMoney">{{order.payMoney}}</text>
<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
</view>
</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;">
{{order.payMoneyTotal}}
</text>
</view>
</view>
<view class="be-remarks">温馨提示费用随会员等级及技师等级不同而上下浮动</view>
</view>
<!-- 套餐 次卡 疗程 升级 加钟 -->
<view class="list-pay" v-else>
<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 jusitify-line">
<view class="line-word">预约时间</view>
<view class="line-word-r">{{order.serveTime}}</view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="line-word">下单时间</view>
<view class="line-word-r">{{order.createTime}}</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">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
<view class="line-word-r">{{order.oldOrdersMassageList[0].userPackageDetail.mainTitle}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">项目名称</view>
<view class="line-word-r" v-if="order.oldEntryName==null">{{order.entryName}}</view>
<view class="line-word-r" v-else>{{order.oldEntryName}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">服务时长</view>
<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">项目价格</view>
<view class="line-word-r" v-if="order.oldMassagePrice==null">{{order.massagePrice}}</view>
<view class="line-word-r" v-else>{{order.oldMassagePrice}}</view>
</view>
<view class="flex justify-between jusitify-line" >
<view style="color: #999;font-size: 26rpx;">下单数量</view>
<view class="line-word-r">{{order.massageNum}}</view>
</view>
<!-- <view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">会员折扣</view>
<view class="line-word-r">100%</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 v-if="order.oldMassageMoney==null" style="font-size: 35rpx;font-weight: bold;">
{{order.massageMoney}}
</text>
<text v-else style="font-size: 35rpx;font-weight: bold;">
{{order.oldMassageMoney}}
</text>
</view>
</view>
<view class="jusitify-line-end"></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 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 jusitify-line" v-if="order.km" >
<view class="line-word">全程距离</view>
<view class="line-word-r">{{order.km}}km</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">出行费用</view>
<view class="line-word-r" v-if="order.taxiMoney">{{order.taxiMoney}}</view>
<view class="line-word-r" v-else>-</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 v-if="order.addNum!=null">
<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">{{order.addEntryName}}</view>
</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 jusitify-line" >
<view class="line-word">加钟时长</view>
<view class="line-word-r">{{order.addTime}}分钟</view>
</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 justify-between jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</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>
<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">{{order.entryName}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">项目价格</view>
<view class="line-word-r">{{order.oldMassagePrice}}</view>
</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 jusitify-line">
<view class="line-word">升级差额</view>
<view class="line-word-r">{{(order.massagePrice-order.oldMassagePrice).toFixed(2)}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</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
@ -272,28 +509,41 @@
</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.massageCouponMoney}}</text></view>
<view class="line-word-r" v-if="order.oldMassageMoney==null"><text
style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
<view class="line-word-r" v-else><text
style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">出行费用</view>
<view class="line-word-r"><text
>{{order.taxiMoney}}</text></view>
<view class="line-word-r" v-if="order.taxiMoney"><text>{{order.taxiMoney}}</text></view>
<view class="line-word-r" v-else>-</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.couponMoney">
<view class="flex justify-between jusitify-line">
<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 class="" 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 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 class="" style="color: #333;" >
<text style="font-size: 26rpx;font-weight: bold;" v-if="order.addMoney">
{{order.addMoney}}
</text>
<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.oldOrdersId!=null">
<view class="flex justify-between jusitify-line">
<view class="line-word">升级费用</view>
<view class="" style="color: #333;">
<text style="font-size: 26rpx;font-weight: bold;">{{order.payMoney}}</text></view>
<view class="" style="color: #333;">
<text style="font-size: 26rpx;font-weight: bold;" v-if="order.payMoney">{{order.payMoney}}</text>
<text style="font-size: 26rpx;font-weight: bold;" v-else>-</text>
</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word">合计</view>
@ -306,69 +556,11 @@
<view class="be-remarks">温馨提示费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view>
<!-- <view class="pay-ding feiuong">
<view class="fei-title">费用明细</view>
<view class="fei-view">
<view class="fei-view-list">
<span>服务费用</span>
<span>268</span>
</view>
<view class="fei-view-list">
<span>出行费用</span>
<span>{{order.taxiMoney}}</span>
</view>
<view class="fei-view-list">
<span>优惠券</span>
<span style="color: #FF3939;">-2</span>
</view>
<view class="fei-view-list-z">
<span>总金额</span>
<span style="color: #FF3939;font-size: 29rpx;">286</span>
</view>
</view>
</view> -->
</view>
<!-- <view class="bg padding radius margin-top-sm">
<view class="text-lg text-bold">
服务信息
</view>
<view class="margin-right-xs">
<view class="flex justify-between margin-top-lg">
<view style="width: 170rpx;">服务时间</view>
<view class="">
<text>{{order.serveTime}}</text>
</view>
</view>
<view class="flex justify-between margin-top-lg">
<view style="width: 170rpx;">服务地点</view>
<view class="flex" @tap="bindGps(order.latitude,order.longitude,order.address)">
<view class="">
{{order.address}}
<image src="../../static/images/address.png" style="width: 13px;height: 15px;"></image>
</view>
</view>
</view>
<view class="flex justify-between margin-top-lg">
<view style="width: 170rpx;">联系方式</view>
<view class="" @click="bindphone(order.phone)">
{{order.phone}}
<image src="../../static/images/phone.png" style="width: 15px;height: 15px;"></image>
</view>
</view>
<view class="flex justify-between margin-top-lg" v-if="order.remark">
<view style="width: 170rpx;">备注内容</view>
<view class="flex">
<view class="">
{{order.remark}}
</view>
</view>
</view>
</view>
</view> -->
<view style="position: relative;" class="flex tabber padding-top-sm padding-bottom-sm align-center">
<view class="showBtn-mian">
<view class="showBtn">

File diff suppressed because it is too large Load Diff

View File

@ -16,7 +16,7 @@
<view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right">
<view class="head-text">
{{order.ordersMassageList[0].massageType.title}}
{{order.entryName}}
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待付款...</view>
@ -35,7 +35,7 @@
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
<view style="justify-content: space-between;">
{{order.ordersMassageList[0].massageType.duration}}分钟
{{order.duration}}分钟
</view>
</view>
@ -123,23 +123,6 @@
<view class="add-con-title">预约时间</view>
<view class="add-con-cont">{{order.serveTime}}</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> -->
<!-- <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> -->
<!-- <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.startTime}}</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.endTime}}</view>
</view> -->
<view class="flex justify-between add-lin">
<view class="add-con-title">下单时间</view>
<view class="add-con-cont">{{order.createTime}}</view>
@ -151,11 +134,11 @@
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">项目名称</view>
<view class="add-con-cont">{{order.ordersMassageList[0].massageType.title}}</view>
<view class="add-con-cont">{{order.entryName}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">服务时长</view>
<view class="add-con-cont">{{order.ordersMassageList[0].massageType.duration}}分钟</view>
<view class="add-con-cont">{{order.duration}}分钟</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">项目价格</view>
@ -164,11 +147,15 @@
<view class="flex justify-between add-lin" >
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont">{{order.vipRate}}%</view>
</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">技师加成</view>
<view class="add-con-cont">{{order.technicianRate}}%</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.massagePrice}}</text></view>
style="font-size: 35rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
</view>
<view class="jusitify-line-end"></view>
@ -196,49 +183,16 @@
<view class="justify-title">优惠券信息</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between add-lin" v-if="order.couponMoney">
<view class="flex justify-between add-lin">
<view class="add-con-title">优惠券</view>
<view class="add-con-cont" style="color: rgb(249, 55, 49); font-weight: bold;">-{{order.couponMoney}}</view>
<view class="add-con-cont" style="color: rgb(249, 55, 49); font-weight: bold;" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="add-con-cont" v-else>-</view>
</view>
<view class="flex justify-between add-lin" v-if="order.addNum" style="margin-top: 19rpx;">
<view class="add-con-title">加钟次数</view>
<view class="add-con-cont">{{order.addNum}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.addTime" style="margin-top: 19rpx;">
<view class="add-con-title">加钟时长</view>
<view class="add-con-cont">{{order.addTime}}分钟</view>
</view>
<view class="flex justify-between add-lin" v-if="order.addMoney" style="margin-top: 19rpx;">
<view class="add-con-title">加钟费用</view>
<view class="add-con-cont">{{order.addMoney}}</view>
</view>
<!-- <view class="textarea-pay-list">
<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
<textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea>
</view> -->
<view class="textarea-pay-list" v-if="order.remark">
<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
<view class="beizhu">{{order.remark}}</view>
<!-- <textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea> -->
</view>
<!-- <view class="flex justify-between textarea-pay-list" v-if="order.remark" style="margin-top: 19rpx;background-color: #f3f3f3;padding: 7px;border-radius: 6px;">
<view style="color: #999;font-size: 26rpx;">备注内容</view>
<view class="flex">
<view class="">
{{order.remark}}
</view>
</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: #F93731;"><text
style="font-size: 35rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;margin-bottom: 10px;">
<view style="color: rgb(249, 55, 49);font-size: 26rpx;">会员折扣{{order.vipRate}}%技师浮动比例{{order.techniciaRate}}%</view>
</view> -->
</view>
</view>
<view class="pay-ding feiuong">
@ -247,12 +201,12 @@
<view class="flex justify-between add-lin">
<view class="add-con-title">订单费用</view>
<view class="add-con-cont"><text
style="font-size: 26rpx;font-weight: bold;">{{order.massagePrice}}</text></view>
style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
</view>
<view class="flex justify-between add-lin" v-if="order.taxiMoney">
<view class="add-con-title">出行费用</view>
<view class="add-con-cont"><text
style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
<view class="add-con-cont" v-if="order.taxiMoney"><text style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view>
<view class="add-con-cont" v-else>-</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">优惠券</view>
@ -260,32 +214,9 @@
-<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view>
<view class="" v-else>-</view>
</view>
<!-- <view class="fei-view-list">
<span>服务价格</span>
<span>{{order.price}}</span>
</view>
<view class="fei-view-list">
<span>优惠券</span>
<span>-{{order.couponMoney}}</span>
</view>
<view class="fei-view-list">
<span>会员折扣</span>
<span>{{order.vipRate}}%</span>
</view>
<view class="fei-view-list">
<span>服务费用</span>
<span>{{order.massageMoney}}</span>
</view>
<view class="fei-view-list">
<span>出行费用</span>
<span>{{order.taxiMoney}}</span>
</view> -->
<view class="fei-view-list-z">
<span>总金额</span>
<span style="color: #FF3939;font-size: 32rpx;">{{order.sumMoney}}</span>
<span style="color: #FF3939;font-size: 32rpx;">{{order.payMoneyTotal}}</span>
</view>
</view>
</view>
@ -305,65 +236,6 @@
</view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 加钟-->
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
<view class="list_item" v-for="(item,index) in orderList" :key="index">
<image :src="item.massageImg"></image>
<view class="listitem_rightview">
<view class="titleview">
<view class="item_title">{{item.title}}</view>
<view class="item_yishou">已售{{item.sales}}</view>
</view>
<view class="flex flex-wrap" style="margin-top: 10rpx;" v-if="item.labels.length>0">
<text class="margin-bottom-xs box" v-for="(items,index) in item.labels"
:key="index">{{items}}</text>
</view>
<view class="btnview">
<view class="item_money"> <text style="font-size: 24upx;"></text> <text
v-if="isVip">{{item.memberPrice}}</text><text v-if="!isVip">{{item.price}}</text>
/<text style="font-weight: 500;font-size: 24upx; ">{{item.duration}}</text></view>
<view class="item_btn" @click="goOrder(item)">确认加钟</view>
</view>
</view>
</view>
</scroll-view>
</u-popup>
<!-- 升级 -->
<u-popup v-model="showorderS" mode="bottom" :closeable="closeable">
<scroll-view scroll-y="true" style="width: 750rpx;height: 600rpx;">
<view class="xiangmu" v-for="(item,index) in artificerlist" :key="index">
<image class="xiangmu-img" :src="item.massageImg" mode=""></image>
<view class="xiangmu-cont">
<view class="xiangmu-cont-top">
<view class="xiangmu-cont-top-title">
{{item.title}}
</view>
<view class="xiangmu-cont-top-time">
<view class="xiangmu-cont-top-left">服务时长{{item.duration}}分钟</view>
<view class="xiangmu-cont-top-left">已售{{item.sales}}</view>
</view>
</view>
<view class="xiangmu-about">
{{item.jianjie}}
</view>
<view class="xiangmu-foot">
<view class="xiangmu-foot-left">
<view class="xiangmu-foot-left-shiji">
<span></span>
<span>{{item.price}}</span>
<span>/元套</span>
</view>
<view class="xiangmu-foot-left-dazhe">{{item.oldPrice}}</view>
</view>
<view class="xiadan" @click="goOrder(item)">
确认升级
</view>
</view>
</view>
</view>
</scroll-view>
</u-popup>
<!-- 支付方式 -->
<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
<view class="popup_pay">
@ -388,54 +260,6 @@
<view class="pay_btn" @click="pay()">确认支付</view>
</view>
</u-popup>
<!-- 提前结束 -->
<view>
<!-- 提前结束 -->
<uni-popup ref="popup" background-color="#fff">
<view class="popup-content">
<view class="popup-head">
<span>请输入提前结束的原因</span>
<span @click="closePopup(type)">x</span>
</view>
<view class="popup-mian">
<textarea placeholder="请输入提前结束服务原因" @input="textareaInp" class="popup-mian-textarea" name="" id="" cols="30" rows="10"></textarea>
<view class="popup-mian-btn">
<span @click="closePopup(type)">
取消
</span>
<span @click="tiqian('center')">
确定
</span>
</view>
</view>
</view>
</uni-popup>
</view>
<!-- 确认拒绝 -->
<view>
<!-- 确认拒绝 -->
<uni-popup ref="popupQ" background-color="#fff">
<view class="popup-content">
<view class="popup-head">
<span>确认拒单</span>
<span @click="closePopupQ(type)">x</span>
</view>
<view class="popup-mian">
<view class="popup-mian-textarea">
{{qurenJd.refusalContent}}
</view>
<view class="popup-mian-btn">
<span @click="TuiPopup(type,'1')">
同意
</span>
<span @click="TuiPopup(type,'3')">
全额退款
</span>
</view>
</view>
</view>
</uni-popup>
</view>
</view>
</template>

View File

@ -10,7 +10,7 @@
<view class="pay-title" style="">服务项目</view>
<view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;">
<image :src="order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.massageImg:order.ordersMassageList[0].userPackageDetail.massageImg"
<image :src="order.ordersMassageList[0].userPackageDetail.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view>
<view class="u-flex-1 margin-left-sm">
@ -35,14 +35,14 @@
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
<view style="justify-content: space-between;">
{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.duration:order.ordersMassageList[0].userPackageDetail.duration}}分钟
{{order.duration}}分钟
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span></span>
<span>{{order.ordersMassageList[0].massageType?order.ordersMassageList[0].massageType.packagePrice:order.ordersMassageList[0].userPackageDetail.packagePrice}} </span>
<span>{{order.massagePrice}} </span>
<!-- <span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span> -->
</view>
<view>
@ -128,7 +128,7 @@
<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.mainTitle}}
</view>
</view>
<view class="flex justify-between add-lin">
@ -147,6 +147,14 @@
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">技师加成</view>
<view class="add-con-cont">{{order.technicianRate}}%</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">应付金额</view>
<view class="add-con-cont">{{order.massagePrice}}</view>
</view>
<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 class="" style="color: #333;">
@ -170,14 +178,14 @@
<view class="add-con-title">全程距离</view>
<view class="add-con-cont">{{order.km}}km</view>
</view>
<view class="flex justify-between add-lin" v-if="order.taxiMoney">
<view class="flex justify-between add-lin">
<view class="add-con-title">出行交通费用</view>
<view class="add-con-cont">{{order.taxiMoney}}</view>
<view class="add-con-cont" v-if="order.taxiMoney">{{order.taxiMoney}}</view>
<view class="add-con-cont" v-else>-</view>
</view>
<view class="textarea-pay-list" v-if="order.remark">
<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view>
<view class="beizhu">{{order.remark}}</view>
<!-- <textarea class="textarea-pay" v-model="order.remark" disabled="disabled" placeholder="请输入备注" name="" maxlength="100"></textarea> -->
</view>
</view>
</view>
@ -188,9 +196,10 @@
<view class="add-con-title">订单费用</view>
<view class="add-con-cont"><text style="font-weight: bold;">0</text></view>
</view>
<view class="flex justify-between add-lin" v-if="order.taxiMoney">
<view class="flex justify-between add-lin">
<view class="add-con-title">出行费用</view>
<view class="add-con-cont"><text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
<view class="add-con-cont" v-if="order.taxiMoney"><text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
<view class="add-con-cont" v-else>-</view>
</view>
<view class="fei-view-list-z">
<span>总金额</span>

View File

@ -224,7 +224,7 @@
},
methods:{
detail(item){//
console.log("item=====>",item)
console.log("item=====>",item)
if(item.usedQuantity){
item.id=this.mainData.id
uni.navigateTo({

View File

@ -115,7 +115,7 @@
</view> -->
</view>
</view>
<view class="detail-btn" v-if="dataList.name=='my'" @click="goumai(getList)">
<view class="detail-btn" v-if="dataList.name=='my'&&dataList.status=='0'" @click="goumai(getList)">
立即预约
</view>
</view>

View File

@ -17,15 +17,17 @@
</view>
<t-refresh ref="refresh" v-if="dataList.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0">
<template slot="content">
<!-- 升级订单 -->
<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
<view class="flex justify-between">
<view class="flex align-center profile-img">
<image src="../../static/logo.png" style="width: 55rpx;height: 55rpx;border: 1px solid#d7f2ee;border-radius: 50%;">
</image>
<view class="margin-left-xs ">{{item.artificerName}}</view>
</view>
<view class="text-green" v-if="item.status ==1"><span>{{item.ordersNo}}</span><span>待支付</span></view>
<view class="text-green" v-if="item.status ==2"><span>{{item.ordersNo}}</span><span>待服务</span></view>
<view class="text-green"><span>{{item.ordersNo}}</span></view>
<!-- <view class="text-green" v-if="item.status ==2"><span>{{item.ordersNo}}</span><span>待服务</span></view>
<view class="text-green" v-if="item.status ==3"><span>{{item.ordersNo}}</span><span>待评价</span></view>
<view class="text-green" v-if="item.status ==4"><span>{{item.ordersNo}}</span><span>已取消</span></view>
<view class="text-green" v-if="item.status ==5"><span>{{item.ordersNo}}</span><span>已完成</span></view>
@ -33,35 +35,53 @@
<view class="text-green" v-if="item.status ==7"><span>{{item.ordersNo}}</span><span>技师出发</span></view>
<view class="text-green" v-if="item.status ==8"><span>{{item.ordersNo}}</span><span>技师到达</span></view>
<view class="text-green" v-if="item.status ==9"><span>{{item.ordersNo}}</span><span>待确认</span></view>
<view class="text-green" v-if="item.status ==10"><span>{{item.ordersNo}}</span><span>待补单</span></view>
<view class="text-green" v-if="item.status ==10"><span>{{item.ordersNo}}</span><span>待补单</span></view> -->
<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
</view>
<view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view>
<view class=" u-flex u-p-t-30">
<view class=" u-flex u-p-t-30" v-if="item.ordersMassageList[0].userPackageDetail==null">
<view class="u-m-r-10">
<u-avatar
:src="(item.ordersMassageList && item.ordersMassageList.length > 0 && item.ordersMassageList[0].massageType && item.ordersMassageList[0].massageType.massageImg)?item.ordersMassageList[0].massageType.massageImg: '../../static/logo.png'"
mode="square" size="100" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;">
</u-avatar>
<image :src="item.ordersMassageList[0].massageType.massageImg" mode="" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
</view>
<view class="u-flex-1" style="margin-left: 20rpx;">
<view class="text-bold u-line-1" style="width: 560rpx;">
<view class=" text-lg "
style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
{{item.ordersMassageList[0].userPackageDetail.title}}
{{item.entryName}}
</view>
</view>
<view class="u-font-12 u-tips-color flex justify-between" style="margin-top: 6rpx;">
预约时间{{item.serveTime}}
</view>
<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;">
实付<text class="text-df" style="color: #FF1200;"></text><text class="text-xl text-bold" style="color: #FF1200;">{{item.ordersMassageList[0].userPackageDetail.packagePrice}}</text>
实付<text class="text-df" style="color: #FF1200;"></text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text>
</view>
</view>
</view>
<view class=" u-flex u-p-t-30" v-else>
<view class="u-m-r-10">
<image :src="item.ordersMassageList[0].userPackageDetail.massageImg" mode="" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
</view>
<view class="u-flex-1" style="margin-left: 20rpx;">
<view class="text-bold u-line-1" style="width: 560rpx;">
<view class=" text-lg "
style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
{{item.entryName}}
</view>
</view>
<view class="u-font-12 u-tips-color flex justify-between" style="margin-top: 6rpx;">
预约时间{{item.serveTime}}
</view>
<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;">
实付<text class="text-df" style="color: #FF1200;"></text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text>
</view>
</view>
</view>
</view>
</template>
</t-refresh>
<empty v-if="dataList.length==0"></empty>
@ -142,7 +162,7 @@
});
},
backImg(){//
if(this.previousPage=='次卡'){
if(this.previousPage.name=='次卡'){
uni.reLaunch({
url:'/pages/my/cikarDrtail?id='+this.previousPage.id+'&limit='+10+'&page='+1+'&name='+'my'
})
@ -157,9 +177,9 @@
this.getData()
},
itemClick(item) {
uni.navigateTo({
url:'/my/order/payCLDetail?ordersId='+item.ordersId
})
// uni.navigateTo({
// url:'/my/order/payCLDetail?ordersId='+item.ordersId
// })
}
}
@ -167,6 +187,12 @@
</script>
<style scoped>
.dingdan-cont{
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
}
/deep/.justify-between{
align-items: center;
}

View File

@ -79,7 +79,7 @@
{{item.oldPrice}}
</view>
</view>
<view class="service-more">详情</view>
<view class="service-more" @click.stop="xiangqing(item)">详情</view>
</view>
<view style="color: #019c88;">服务时长:{{item.duration}}分钟</view>
<view class="tese">
@ -602,7 +602,14 @@
// #endif
}
},
xiangqing(item){
uni.navigateTo({
url:'/pages/my/cureOderDrtail?mainId='+item.mainId+'&id='+item.id+
'&massageTypeId='+item.massageTypeId+
'&status='+item.status+
'&name='+this.nameText
})
},
detail(item){
if(item.status=='1'&&this.serviData.name!='index'){
uni.showToast({