订单页面调整

This commit is contained in:
曹磊 2024-07-23 16:55:52 +08:00
parent 8e9061b9b3
commit 7746831e7c
8 changed files with 1209 additions and 920 deletions

View File

@ -3,98 +3,96 @@
<!-- <view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
<view style="color: red;font-size:26rpx">(订单已超时)</view>
</view> -->
<view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
style="padding: 0 29rpx;">
<view class="head-top">
<view class="pay-title">服务项目</view>
<view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;">
<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="head-title">
{{order.entryName}}
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">技师出发</view>
<view v-if="order.status ==8">技师到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
<view v-if="order.status ==10">待补单</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;">
<text class="title-font">服务时长</text><text class="value-font">{{order.duration}}分钟</text>
</view>
</view>
<view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
style="padding: 0 29rpx;">
<view class="head-top">
<view class="pay-title">服务项目</view>
<view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;">
<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="head-title">
{{order.entryName}}
</view>
<view class="zhuangtai">
<view v-if="order.status ==1">待支付</view>
<view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view>
<view v-if="order.status ==7">技师出发</view>
<view v-if="order.status ==8">技师到达</view>
<view v-if="order.status ==3">待评价</view>
<view v-if="order.status ==4">已取消</view>
<view v-if="order.status ==9">待确认</view>
<view v-if="order.status ==10">待补单</view>
</view>
</view>
<view class="flex align-center">
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm">
<view style="justify-content: space-between;">
<text class="title-font">服务时长</text><text class="value-font">{{order.duration}}分钟</text>
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<text class="title-font">项目价格</text>
<span></span>
<span>{{order.priceMarkup}} </span>
<!-- <view style="margin-left: 5px;font-size: 12px;color: #999;text-decoration: line-through;" v-if="order.ordersMassageList[0].userPackageDetail">{{order.price}}</view> -->
</view>
<view>
<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="add-content">
<view class="" v-if="order.artificer">
<view class="flex align-center justify-between jusitify-line">
<view class="line-word title-font">客户姓名</view>
<view class="line-word-r value-font">
{{order.userName}}
</view>
</view>
<view class="flex align-center justify-between jusitify-line">
<view class="line-word title-font">联系方式</view>
<view class="line-word-r value-font">
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</view>
</view>
<view class="serverAddress jusitify-line">
<view class="line-word title-font">服务地址</view>
<view class="line-word-r value-font" style="width: 75%; text-align: right;">{{order.address}}</view>
</view>
</view>
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<text class="title-font">项目价格</text>
<span></span>
<span>{{order.priceMarkup}} </span>
<!-- <view style="margin-left: 5px;font-size: 12px;color: #999;text-decoration: line-through;" v-if="order.ordersMassageList[0].userPackageDetail">{{order.price}}</view> -->
</view>
<view>
<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="add-content">
<view class="" v-if="order.artificer">
<view class="flex align-center justify-between jusitify-line">
<view class="line-word title-font">客户姓名</view>
<view class="line-word-r value-font">
{{order.userName}}
</view>
</view>
<view class="flex align-center justify-between jusitify-line">
<view class="line-word title-font">联系方式</view>
<view class="line-word-r value-font">
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</view>
</view>
<view class="serverAddress jusitify-line">
<view class="line-word title-font">服务地址</view>
<view class="line-word-r value-font" style="width: 75%; text-align: right;">{{order.address}}</view>
</view>
</view>
</view>
<view class="margin-top-xl pay-ding">
<view class="flex align-center pay-ding-top">
<image :src="order.artificer.artificerImg" class="d-touxiang"></image>
<view class="margin-left-sm" style="width: 90%;">
<view class="flex align-center" style="width: 100%;justify-content: space-between;">
<view class="d-title">
<span>{{order.artificer.artificerName}}</span>
</view>
<!-- <image
<view class="margin-top-xl pay-ding">
<view class="flex align-center pay-ding-top">
<image :src="order.artificer.artificerImg" class="d-touxiang"></image>
<view class="margin-left-sm" style="width: 90%;">
<view class="flex align-center" style="width: 100%;justify-content: space-between;">
<view class="d-title"><span>{{order.artificer.artificerName}}</span></view>
<!-- <image
v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;"
@click="bindphone(order.artificer.phone)"></image> -->
<!-- <image src="../../static/img/phone.png" class="phone-pay"
<!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> -->
<view class="level_button">{{order.technicianTypeName}}</view>
</view>
<view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="level_button">{{order.technicianTypeName}}</view>
</view>
<!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right">
<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
</image>
@ -102,246 +100,264 @@
style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}</text>
</view>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康技师</text>
</view>
</view>
</view>
<!-- 普通项目信息 -->
<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>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">订单编号</view>
<view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
<view class="">{{order.ordersNo}}
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
</view> -->
</view>
</view>
<!-- 普通项目信息 -->
<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>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">订单编号</view>
<view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
<view class="value-font">{{order.ordersNo}}
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
</view>
</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">预约时间</view>
<view class="line-word-r value-font">{{order.serveTime}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">下单时间</view>
<view class="line-word-r value-font">{{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 title-font">项目名称</view>
<view class="line-word-r value-font">{{order.entryName}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">服务时长</view>
<view class="line-word-r value-font">{{order.duration}}分钟</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目原价</view>
<view class="line-word-r value-font">{{order.massagePrice}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">{{order.technicianTypeName}}价格</view>
<view class="line-word-r value-font" style="color: #019c88;">{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">会员减免</view>
<view class="line-word-r value-font" style="color: #FF6000;">-{{order.vipReductionMoney}}</view>
</view>
<view class="flex align-center jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计</view>
<view class="value-font" style="font-weight: bold;">
<text>{{order.massageMoney}}</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 jusitify-line" v-if="order.tripWay">
<view class="line-word title-font">出行方式</view>
<view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
<view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.km">
<view class="line-word title-font">全程距离</view>
<view class="line-word-r value-font">{{order.km}}km</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">{{order.usualTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">{{order.nightTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计</view>
<view class="line-word-r value-font" style="font-weight: bold;"><text>{{order.taxiMoney}}</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 jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-{{order.couponMoney}}</view>
<view class="value-font value-font" 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 title-font">订单费用</view>
<view class="line-word-r value-font"><text
style="font-weight: bold;">{{order.massageMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text
style="font-weight: bold;">{{order.taxiMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-<text style="font-weight: bold;">{{order.couponMoney}}</text></view>
<view class="value-font" v-else>-</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view class="line-word title-font">合计</view>
<view class="value-font">
<text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
{{order.payMoneyTotal}}
</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 jusitify-line">
<view class="line-word title-font">订单编号</view>
<view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
<view class="">{{order.ordersNo}}
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
</view>
</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">预约时间</view>
<view class="line-word-r value-font">{{order.serveTime}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">下单时间</view>
<view class="line-word-r value-font">{{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 title-font">
{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称
</view>
<view class="line-word-r value-font">
{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目名称</view>
<view class="line-word-r value-font">{{order.entryName}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">服务时长</view>
<view class="line-word-r value-font">{{order.duration}}分钟</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目价格</view>
<view class="line-word-r value-font" style="color: #019c88;">{{order.massagePrice}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">应付金额</view>
<view class="line-word-r value-font">{{order.massagePrice}}</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">实付金额</view>
<view class="line-word-r value-font" style="font-weight: bold;">
<text>0</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 jusitify-line" v-if="order.tripWay">
<view class="line-word title-font">出行方式</view>
<view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
<view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.km">
<view class="line-word title-font">全程距离</view>
<view class="line-word-r value-font">{{order.km}}km</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">{{order.usualTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">{{order.nightTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计</view>
<view class="line-word-r value-font" style="font-weight: bold;"><text>{{order.taxiMoney}}</text></view>
</view>
<!-- <view class="jusitify-line-end jusitify-line"></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 title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-{{order.couponMoney}}</view>
<view class="value-font" 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 title-font">订单费用</view>
<view class="add-con-cont value-font"><text style="font-weight: bold;">0</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text
style="font-weight: bold;">{{order.taxiMoney}}</text></view>
</view>
<!-- <view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-<text style="font-weight: bold;">{{order.couponMoney}}</text></view>
<view class="value-font" v-else>-</view>
</view> -->
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view class="line-word title-font">合计</view>
<view class="value-font">
<text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
{{order.taxiMoney}}
</text>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">预约时间</view>
<view class="line-word-r value-font" >{{order.serveTime}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">下单时间</view>
<view class="line-word-r value-font">{{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 title-font">项目名称</view>
<view class="line-word-r value-font">{{order.entryName}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">服务时长</view>
<view class="line-word-r value-font">{{order.duration}}分钟</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目原价</view>
<view class="line-word-r value-font">{{order.massagePrice}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">{{order.technicianTypeName}}价格</view>
<view class="line-word-r value-font" style="color: #019c88;">{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">会员减免</view>
<view class="line-word-r value-font" style="color: #FF6000;">-{{order.vipReductionMoney}}</view>
</view>
<view class="flex align-center jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计</view>
<view class="value-font" style="font-weight: bold;">
<text>
{{order.massageMoney}}
</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 jusitify-line" v-if="order.tripWay" >
<view class="line-word title-font">出行方式</view>
<view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
<view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.km">
<view class="line-word title-font">全程距离</view>
<view class="line-word-r value-font">{{order.km}}km</view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">{{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 title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="value-font" 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 title-font">订单费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">{{order.massageMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-<text style="font-weight: bold;">{{order.couponMoney}}</text></view>
<view class="value-font" v-else>-</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view class="line-word title-font">合计</view>
<view class="value-font">
<text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
{{order.payMoneyTotal}}
</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 jusitify-line">
<view class="line-word title-font">订单编号</view>
<view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
<view class="">{{order.ordersNo}}
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
</view>
</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">预约时间</view>
<view class="line-word-r value-font" >{{order.serveTime}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">下单时间</view>
<view class="line-word-r value-font">{{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 title-font">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
<view class="line-word-r value-font">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="line-word title-font">项目名称</view>
<view class="line-word-r value-font">{{order.entryName}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">服务时长</view>
<view class="line-word-r value-font">{{order.duration}}分钟</view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="line-word title-font">项目价格</view>
<view class="line-word-r value-font">{{order.massagePrice}}</view>
</view>
<view class="flex align-center jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计</view>
<view class="value-font" style="font-weight: bold;">
<text>
{{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 jusitify-line" v-if="order.tripWay" >
<view class="line-word title-font">出行方式</view>
<view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
<view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.km">
<view class="line-word title-font">全程距离</view>
<view class="line-word-r value-font">{{order.km}}km</view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">{{order.taxiMoney}}</view>
</view>
<view class="jusitify-line-end jusitify-line"></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 title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="value-font" 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 title-font">订单费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">{{order.massageMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-<text style="font-weight: bold;">{{order.couponMoney}}</text></view>
<view class="value-font" v-else>-</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view class="line-word title-font">合计</view>
<view class="value-font">
<text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
{{order.payMoneyTotal}}
</text>
</view>
</view>
</view>
</view>
<view style="height: 100rpx;"></view>
</view>
<view class="showBtn tabber" v-if="order.status ==1">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
取消订单
</u-button>
<!-- <u-button
<view style="height: 100rpx;"></view>
</view>
<view class="showBtn tabber" v-if="order.status ==1">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true" class="btns">
取消订单
</u-button>
<!-- <u-button
v-if="order.btnShow == 'true'"
:custom-style="customStyle2"
shape="circle" :plain="true"
@ -349,104 +365,104 @@
class="dingshi">
修改订单
</u-button> -->
<u-button @click="zhifu(order)" :custom-style="customStyle2" shape="circle" :plain="true"
class="btns">立即支付
</u-button>
<u-button @click="goChat" :custom-style="customStyle2" shape="circle" :plain="true"
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==2">
<u-button @click="cancelOrder(order)" :custom-style="customStyle" shape="circle" :hair-line="false">
取消订单
</u-button>
<u-button
v-if="order.btnShow == 'true'"
:custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
class="btns">
修改订单
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==3">
<u-button :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
class="btns">
去评价
</u-button>
<u-button :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="btns">
去投诉
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==4">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==5">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status==6" :style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}">
<view class="gengduo" @click.stop="gengBtn">更多</view>
<view style="display: flex;flex-direction: row;align-items: center;justify-content: flex-end">
<u-button
shape="circle" :plain="true"
@click="toggle('center',order)"
class="btns">
提前结束
</u-button>
<u-button v-if="order.isSupplement!=2"
shape="circle" :plain="true"
@tap="saveJZS(order.artificerId)"
class="btns">
服务升级
</u-button>
<u-button
v-if="order.addNum ==null&&order.ordersMassageList[0].massageType"
shape="circle" :plain="true"
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
class="btns">
加钟
</u-button>
<u-button
v-if="order.addNum ==null&&order.ordersMassageList[0].userPackageDetail"
shape="circle" :plain="true"
@tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
class="btns">
加钟
</u-button>
</view>
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<view :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="eject-btns">联系客服</view>
<view :custom-style="customStyle2" @click="cancelOrder(order)" shape="circle" class="eject-btns" :hair-line="false">
取消订单
</view>
<view
shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId,)"
class="eject-btns">
充值
</view>
<view :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="eject-btns">
去投诉
</view>
</view>
</view>
<u-button @click="zhifu(order)" :custom-style="customStyle2" shape="circle" :plain="true"
class="btns">立即支付
</u-button>
<u-button @click="goChat" :custom-style="customStyle2" shape="circle" :plain="true"
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==2">
<u-button @click="cancelOrder(order)" :custom-style="customStyle" shape="circle" :hair-line="true" class="btns">
取消订单
</u-button>
<u-button v-if="order.btnShow == 'true'" :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')" class="btns">
修改订单
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==3">
<u-button :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
class="btns">
去评价
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="btns">
去投诉
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==4">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==5">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status==6"
:style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}">
<view v-if="order.earlyFinishReason==null" class="gengduo" @click.stop="gengBtn">更多</view>
<view v-else class="gengduo"></view>
<view v-if="order.earlyFinishReason==null">
<view style="display: flex;flex-direction: row;align-items: center;justify-content: flex-end">
<u-button shape="circle" :plain="true" @click="toggle('center',order)" class="btns">
提前结束
</u-button>
<u-button v-if="order.isSupplement!=2" shape="circle" :plain="true"
@tap="saveJZS(order.artificerId)" class="btns">
服务升级
</u-button>
<u-button v-if="order.addNum ==null&&order.ordersMassageList[0].massageType" shape="circle"
:plain="true" @tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)" class="btns">
加钟
</u-button>
<u-button v-if="order.addNum ==null&&order.ordersMassageList[0].userPackageDetail" shape="circle"
:plain="true" @tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
class="btns">
加钟
</u-button>
</view>
<view class="showBtn-view" v-if="gengBtnShow==true"
:style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<view :custom-style="customStyle2" @click="cancelOrder(order)" shape="circle" class="eject-btns"
:hair-line="true">
取消订单
</view>
<view shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId,)"
class="eject-btns">
充值
</view>
<view :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="eject-btns">
去投诉
</view>
<view :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" class="eject-btns">
联系客服</view>
</view>
</view>
<view v-else>
<view class="showBtn tabber">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId,)" class="btns">
充值
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)" class="btns">
去投诉
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" class="btns">
联系客服
</u-button>
</view>
</view>
</view>
<view class="showBtn tabber" v-if="order.status ==7">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true" class="btns">
取消订单
</u-button>
<u-button
@ -461,7 +477,7 @@
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==8">
<u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
<u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true">
取消订单
</u-button>
<u-button
@ -476,7 +492,7 @@
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==9">
<u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
<u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true">
取消订单
</u-button>
<u-button v-if="order.refusalContent" :custom-style="customStyle2"
@ -489,7 +505,7 @@
class="btns">联系客服</u-button>
</view>
<view class="showBtn tabber" v-if="order.status ==10">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"S>
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true" class="btns">
取消订单
</u-button>
<u-button :custom-style="customStyle2"

View File

@ -183,11 +183,18 @@
<view class="line-word title-font">全程距离</view>
<view class="line-word-r value-font" >{{order.km}}km</view>
</view>
<view class="jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">{{order.taxiMoney}}</view>
</view>
<view class="jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">{{order.usualTravelMoney}}</view>
</view>
<view class="jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">{{order.nightTravelMoney}}</view>
</view>
<view class="jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计</view>
<view class="line-word-r value-font" style="font-weight: bold;"><text>{{order.taxiMoney}}</text></view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">优惠券信息</view>
@ -346,10 +353,18 @@
<view class="line-word title-font">全程距离</view>
<view class="line-word-r value-font" >{{order.km}}km</view>
</view>
<view class="jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">{{order.taxiMoney}}</view>
</view>
<view class="jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">{{order.usualTravelMoney}}</view>
</view>
<view class="jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">{{order.nightTravelMoney}}</view>
</view>
<view class="jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计</view>
<view class="line-word-r value-font" style="font-weight: bold;"><text>{{order.taxiMoney}}</text></view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">优惠券信息</view>

View File

@ -119,7 +119,7 @@
<span >项目价格</span>
</view>
<view >
<span class="line-word-r value-font">{{orderXm.price}}</span>
<span class="line-word-r value-font">{{orderXm.priceMarkup}}</span>
</view>
</view>
</view>

File diff suppressed because it is too large Load Diff

View File

@ -172,7 +172,6 @@
</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>
@ -189,7 +188,15 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">{{order.taxiMoney}}</view>
<view class="line-word-r value-font">{{order.usualTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">{{order.nightTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计</view>
<view class="line-word-r value-font" style="font-weight: bold;"><text>{{order.taxiMoney}}</text></view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
@ -378,7 +385,7 @@
</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav jusitify-line">
<view class="justify-title-nav">
<view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></view>
</view>
@ -394,9 +401,17 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">{{order.taxiMoney}}</view>
<view class="line-word-r value-font">{{order.usualTravelMoney}}</view>
</view>
<view class="jusitify-line-end"></view>
<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">{{order.nightTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计</view>
<view class="line-word-r value-font" style="font-weight: bold;"><text>{{order.taxiMoney}}</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>
@ -405,7 +420,7 @@
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="line-word-r value-font" v-else>-</view>
</view>
</view> -->
<view class="jusitify-line-end"></view>
<view>
<view class="justify-title-nav">
@ -486,13 +501,13 @@
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<!-- <view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="value-font" style="color: #FF6000;" v-if="order.couponMoney">
-<text style="font-weight: bold;">{{order.couponMoney}}</text>
</view>
<view class="value-font" v-else>-</view>
</view>
</view> -->
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">升级费用</view>
<view class="value-font">
@ -548,33 +563,38 @@
</view>
</view>
<view class="showBtn-view" v-show="btnShow==true">
<view style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
class="eject-btns">联系客服</view>
<view :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="eject-btns">
去投诉
</view>
<view style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
class="eject-btns">联系客服</view>
</view>
</view>
<view class="showBtn-mian" v-else>
<view class="showBtn" style="justify-content: center;">
<u-button style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
<u-button :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 :custom-style="customStyle2"
v-if="order.status=='1'"
shape="circle" :plain="true"
@click="quzhifu(order)"
class="dingshi">
class="btns">
去支付
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
class="btns">
去评价
</u-button>
<u-button :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="btns">
去投诉
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
</view>

View File

@ -67,23 +67,23 @@
</view>
</view>
</view>
<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
<view class="add-content">
<view class="" v-if="order.artificer">
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">客户姓名</view>
<view class="add-con-cont value-font">
<view class="flex align-center justify-between jusitify-line">
<view class="line-word title-font">客户姓名</view>
<view class="line-word-r value-font">
{{order.userName}}
</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">联系方式</view>
<view class="add-con-cont value-font">
<view class="flex align-center justify-between jusitify-line">
<view class="line-word title-font">联系方式</view>
<view class="line-word-r value-font">
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</view>
</view>
<view class="serverAddress">
<view class="add-con-title title-font">服务地址</view>
<view class="value-font" style="width: 73%; text-align: right;">{{order.address}}</view>
<view class="serverAddress jusitify-line">
<view class="line-word title-font">服务地址</view>
<view class="value-font" style="width: 75%; text-align: right;">{{order.address}}</view>
</view>
</view>
</view>
@ -91,8 +91,8 @@
<view class="margin-top-xl pay-ding">
<view class="flex align-center pay-ding-top">
<image :src="order.artificer.artificerImg" class="d-touxiang"></image>
<view class="margin-left-sm flex" style="width: 90%;justify-content: space-between;flex-direction: row;align-items: center;">
<view class="flex align-center" style="width: 80%;justify-content: space-between;">
<view class="margin-left-sm flex" style="width: 90%;">
<view class="flex align-center" style="width: 100%;justify-content: space-between;">
<view class="d-title">{{order.artificer.artificerName}}</view>
<!-- <image
v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
@ -100,9 +100,10 @@
@click="bindphone(order.artificer.phone)"></image> -->
<!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> -->
<view class="level_button">{{order.technicianTypeName}}</view>
</view>
<!-- <view class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view> -->
<view class="level_button">{{order.technicianTypeName}}</view>
<!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right">
<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
@ -119,51 +120,50 @@
<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 title-font">订单编号</view>
<view class="flex align-center" @tap="copy(order.ordersNo)">
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">订单编号</view>
<view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
<view class="value-font">{{order.ordersNo}}
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
</view>
</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">预约时间</view>
<view class="add-con-cont value-font">{{order.serveTime}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">预约时间</view>
<view class="line-word-r value-font">{{order.serveTime}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">下单时间</view>
<view class="add-con-cont value-font">{{order.createTime}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">下单时间</view>
<view class="line-word-r value-font">{{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 title-font">项目名称</view>
<view class="add-con-cont value-font">{{order.entryName}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目名称</view>
<view class="line-word-r value-font">{{order.entryName}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">服务时长</view>
<view class="add-con-cont value-font">{{order.duration}}分钟</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">服务时长</view>
<view class="line-word-r value-font">{{order.duration}}分钟</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">项目原价</view>
<view class="add-con-cont value-font">{{order.massagePrice}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目原价</view>
<view class="line-word-r value-font">{{order.massagePrice}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">{{order.technicianTypeName}}价格</view>
<view class="add-con-cont value-font" style="color: #019c88;">{{order.priceMarkup}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">{{order.technicianTypeName}}价格</view>
<view class="line-word-r value-font" style="color: #019c88;">{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.userPackageDetailId==null">
<view class="add-con-title title-font">会员减免</view>
<view class="add-con-cont value-font" style="color: #FF6000;">-{{order.vipReductionMoney}}</view>
<view class="flex justify-between jusitify-line" v-if="order.userPackageDetailId==null">
<view class="line-word title-font">会员减免</view>
<view class="line-word-r value-font" style="color: #FF6000;">-{{order.vipReductionMoney}}</view>
</view>
<view class="flex justify-between add-lin" style="justify-content: flex-end;">
<view class="add-con-title title-font">小计</view>
<view class="add-con-cont value-font" style="font-weight: bold;"><text>{{order.massageMoney}}</text></view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计</view>
<view class="line-word-r value-font" style="font-weight: bold;"><text>{{order.massageMoney}}</text></view>
</view>
<view class="jusitify-line-end"></view>
@ -172,29 +172,37 @@
<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 title-font">出行方式</view>
<view class="add-con-cont value-font" v-if="order.tripWay == 1">公交</view>
<view class="add-con-cont value-font" v-if="order.tripWay == 2">出租</view>
<view class="add-con-cont value-font" v-if="order.tripWay == 3">免费</view>
<view class="flex justify-between jusitify-line" v-if="order.tripWay">
<view class="line-word title-font">出行方式</view>
<view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
<view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
</view>
<view class="flex justify-between add-lin" v-if="order.km">
<view class="add-con-title title-font">全程距离</view>
<view class="add-con-cont value-font">{{order.km}}km</view>
<view class="flex justify-between jusitify-line" v-if="order.km">
<view class="line-word title-font">全程距离</view>
<view class="line-word-r value-font">{{order.km}}km</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">出行费用</view>
<view class="add-con-cont value-font">{{order.taxiMoney}}</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">{{order.usualTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.nightTravelMoney">
<view class="line-word title-font">夜间出行</view>
<view class="line-word-r value-font">{{order.nightTravelMoney}}</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计</view>
<view class="line-word-r value-font" style="font-weight: bold;"><text>{{order.taxiMoney}}</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">
<view class="add-con-title title-font">优惠券</view>
<view class="add-con-cont value-font" style="color: #FF6000;" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="add-con-cont value-font" v-else>-</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="line-word-r value-font" v-else>-</view>
</view>
<view class="textarea-pay-list" v-if="order.remark">
<view class="jusitify-line-end"></view>
@ -209,19 +217,19 @@
<view class="justify-title-nav-bor"></view>
</view>
<view class="fei-view">
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">订单费用</view>
<view class="add-con-cont value-font">
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">订单费用</view>
<view class="line-word-r value-font">
<text style="font-weight: bold;">{{order.massageMoney}}</text>
</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">出行费用</view>
<view class="add-con-cont value-font"><text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">优惠券</view>
<view class="add-con-cont value-font" style="color: #FF6000;" v-if="order.couponMoney">
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-<text style="font-weight: bold;">{{order.couponMoney}}</text></view>
<view class="value-font" v-else>-</view>
</view>
@ -1584,7 +1592,7 @@
color: #019C88 !important;
margin-left: 10rpx !important;
height:64rpx;
font-size: 28rpx;
font-size: 30rpx;
}
/deep/.u-size-default{
margin: 5px 0px 0px 0px;
@ -1697,15 +1705,16 @@
}
.list-pay{
width: 100%;
padding: 10px 29rpx;
padding: 10rpx 29rpx;
margin-bottom: 40rpx;
}
.pay-ding-top{
width: 100%;
height: 50px;
height: 100rpx;
background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
border-top-left-radius: 12px;
border-top-right-radius: 12px;
padding: 0px 14px;
border-top-left-radius: 24rpx;
border-top-right-radius: 24rpx;
padding: 0px 29rpx;
}
.pay-ding,.feiuong{
background-color: #ffffff;
@ -1723,9 +1732,10 @@
color: #333333;
}
.d-touxiang{
width: 60rpx;
height: 60rpx;
width: 55rpx;
height: 55rpx;
border-radius: 50%;
border: 1px solid #f2fffd;
}
.money-pay-jia{
font-weight: 400;
@ -1946,37 +1956,29 @@
justify-content: space-between;
align-items: center;
}
.add-content {
background: #fff;
padding: 30rpx;
border-radius: 24rpx;
margin-top: 24rpx;
}
.head-text{
font-size:30rpx;
}
.level_button{
padding: 3rpx 13rpx;
background: linear-gradient(to right, #fe9131, #ff9869);
border-radius: 16rpx 16rpx 16rpx 1rpx ;
color: #fff;
padding: 4rpx 20rpx;
background: linear-gradient(to right, #ffc1a9, #fedec9, #fdbb9f);
border-radius: 16rpx 16rpx 16rpx 1rpx;
color: #e95c3b;
font-size: 12px;
border: 1px solid #fd967c;
}
.add-lin{
height: 74rpx;
line-height: 74rpx;
}
.add-con-title{
color: #666;
font-size: 30rpx;
}
.add-con-cont{
color: #333;
font-size: 30rpx;
line-height: 80rpx;
text-align:right;
}
.level_button{
padding: 3rpx 13rpx;
background: linear-gradient(to right, #fe9131, #ff9869);
border-radius: 16rpx 16rpx 16rpx 1rpx ;
color: #fff;
font-size: 12px;
}
.justify-title-nav{
width: 90%;
display: flex;
@ -1997,6 +1999,13 @@
font-size: 32rpx;
color: #333;
}
.jusitify-line {
height: 78rpx;
padding: 20rpx 0;
font-size: 30rpx;
}
.jusitify-line-end{
height:1px;
border-bottom: 1px #e5e5e5 solid;

View File

@ -174,7 +174,15 @@
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">出行费用</view>
<view class="add-con-cont value-font">{{order.taxiMoney}}</view>
<view class="add-con-cont value-font">{{order.usualTravelMoney}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.nightTravelMoney">
<view class="add-con-title title-font">夜间出行</view>
<view class="add-con-cont value-font">{{order.nightTravelMoney}}</view>
</view>
<view class="flex justify-between add-lin" style="justify-content: flex-end;">
<view class="add-con-title title-font">小计</view>
<view class="add-con-cont value-font" style="font-weight: bold;"><text>{{order.taxiMoney}}</text></view>
</view>
<view class="textarea-pay-list" v-if="order.remark">
<view class="jusitify-line-end"></view>
@ -206,20 +214,20 @@
</view>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="true"
v-if="order.status != 3 &&
order.status != 4 &&
order.status != 5
"
>取消订单
class="btns">取消订单
</u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="true"
v-if="order.status == 1||order.status == 10"
class="dingshi">立即支付
class="btns">立即支付
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button>
class="btns">联系客服</u-button>
</view>
</view>
@ -1694,8 +1702,10 @@
flex-direction: column;
}
/deep/.btns{
background: #019C88 !important;
color: #fff !important;
color: #019C88 !important;
margin-left: 10rpx !important;
height:70rpx;
font-size: 30rpx;
}
/deep/.u-size-default{
margin: 5px 0px 0px 0px;
@ -1713,21 +1723,51 @@
font-size: 25rpx;
color: #7D7D7D;
}
.showBtn-view{
.showBtn-view {
display: flex;
flex-direction: column;
align-items: center;
position: absolute;
background-color: #ffffff;
padding: 10px;
bottom: 90rpx;
left: 50rpx;
box-shadow: 0px 0px 3px 0px #b5b5b5;
border-radius: 10rpx;
}
.showBtn-view:before {
position: absolute;
left: 20rpx;
bottom: -12rpx;
width: 20rpx;
height: 20rpx;
background: #ffffff;
margin-top: -2px;
border-right: 1px solid #e5e5e5;
border-bottom: 1px solid #e5e5e5;
transform: rotate(45deg);
-webkit-transform: rotate(45deg);
content: '';
}
.showBtn {
width: 100%;
justify-content: flex-end;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
margin-top: 20rpx;
}
.showBtn,.hideBtn{
.hideBtn {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
}
.dingshi{

View File

@ -41,7 +41,7 @@
</u-avatar>
</view>
<view class="u-flex-1" style="margin-left: 20rpx;">
<view class="text-bold u-line-1" style="width: 560rpx;">
<view class="text-bold u-line-1">
<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].massageType?item.ordersMassageList[0].massageType.title:item.ordersMassageList[0].userPackageDetail.title}}
@ -95,7 +95,7 @@
修改订单
</u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
@ -109,19 +109,19 @@
去投诉
</u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
<view class="showBtn" v-if="item.status ==4">
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
<view class="showBtn" v-if="item.status ==5">
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
@ -147,10 +147,8 @@
加钟
</u-button>
</view>
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
<view @click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="gengduoBtn">
联系客服
</view>
<view v-if="item.addNum==null&&item.oldOrdersId==null"
@ -193,7 +191,7 @@
修改订单
</u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
@ -210,7 +208,7 @@
修改订单
</u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
@ -226,7 +224,7 @@
拒单详情
</u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
@ -246,7 +244,7 @@
立即预约
</u-button>
<u-button :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="btnsH xianshi">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btnsH xianshi">
联系客服
</u-button>
</view>
@ -823,13 +821,13 @@
onReachBottom: function() {
this.page = this.page + 1;
this.getOrderList();
console.log("asd",this.totalCount)
if (this.totalCount==undefined&&this.orderList!='') {
uni.showToast({
title: '已经到底了~',
icon: 'none'
})
}
// console.log("asd",this.totalCount)
// if (this.totalCount==undefined&&this.orderList!='') {
// uni.showToast({
// title: '~',
// icon: 'none'
// })
// }
},
onPullDownRefresh: function() {
this.page = 1;
@ -1001,7 +999,7 @@
width: 164rpx !important;
border-radius: 23rpx !important;
font-size: 30rpx!important;
}
}
.text-green span:nth-child(1){
font-weight: 400;
font-size: 25rpx;