订单页面调整

This commit is contained in:
曹磊 2024-07-20 09:55:13 +08:00
parent 4d6b66f676
commit 478003cfc1
7 changed files with 5553 additions and 5504 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -84,6 +84,23 @@
<span class="view-more"></span>
</view>
</view>
<view class="jusitify-line" v-if="jishiName">
<view class="line-word" >
<span >项目原价</span>
</view>
<view >
<span class="line-word-r">{{orderXm.price}}</span>
</view>
</view>
<view class="jusitify-line" v-if="jishiName">
<view class="line-word" >
<span>{{jishiName.technicianTypeName}}</span>
<span >价格</span>
</view>
<view >
<span class="line-word-r" style="color: #FF6000">{{technicianRate}}</span>
</view>
</view>
<view class="jusitify-line" @click="youhuijuan">
<view class="line-word">平台优惠劵</view>
<view class="header-bottom-money-zhen">

View File

@ -93,6 +93,23 @@
<span class="view-more"></span>
</view>
</view>
<view class="jusitify-line" v-if="jishiName">
<view class="line-word" >
<span >项目原价</span>
</view>
<view >
<span class="line-word-r">{{orderXm.price}}</span>
</view>
</view>
<view class="jusitify-line" v-if="jishiName">
<view class="line-word" >
<span>{{jishiName.technicianTypeName}}</span>
<span >价格</span>
</view>
<view >
<span class="line-word-r" style="color: #FF6000">{{technicianRate}}</span>
</view>
</view>
<!-- <view class="liliao">
<view class="liliao-top" style="width: 30%;">
<span>平台优惠劵</span>

View File

@ -96,7 +96,7 @@
<!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> -->
</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;">
@ -143,8 +143,12 @@
<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.priceMarkup}}</view>
<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">{{order.technicianTypeName}}价格</view>
<view class="add-con-cont" style="color: #F93731;">{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">会员减免</view>
@ -200,7 +204,7 @@
<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.priceMarkup}}</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>
@ -462,6 +466,15 @@
this.loading = false
uni.hideLoading()
this.order = res.data;
if(res.data["technicianType"] == 3){
this.order["technicianTypeName"] = "新手"
}
if(res.data["technicianType"] == 4){
this.order["technicianTypeName"] = "专家"
}
if(res.data["technicianType"] == 5){
this.order["technicianTypeName"] = "资深"
}
var date = new Date(); //
var timestamp = this.getTimeStampWithoutSeconds(date); //
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; //

View File

@ -1,8 +1,8 @@
<template>
<view class="content">
<view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
<!-- <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> -->
<view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet"
style="padding: 0 29rpx;">
@ -129,11 +129,11 @@
<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">服务时长</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 class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">项目价格</view>
<view class="line-word-r" v-if="order.oldPriceMarkup==null">{{order.priceMarkup}}</view>
<view class="line-word-r" v-else>{{order.oldPriceMarkup}}</view>
@ -141,10 +141,21 @@
<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> -->
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">会员减免</view>
<view class="line-word-r" >-{{order.vipReductionMoney}}</view>
<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="flex justify-between jusitify-line">
<view class="line-word">{{order.technicianTypeName}}价格</view>
<view class="line-word-r" v-if="order.oldPriceMarkup==null">{{order.priceMarkup}}</view>
<view class="line-word-r" v-else>{{order.oldPriceMarkup}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="line-word">会员减免</view>
<view class="line-word-r" v-if="order.oldVipReductionMoney==null">-{{order.vipReductionMoney}}</view>
<view class="line-word-r" v-else>-{{order.oldVipReductionMoney}}</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
@ -178,8 +189,7 @@
</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 class="line-word-r">{{order.taxiMoney}}</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
@ -191,38 +201,6 @@
<view class="line-word-r" style="color: #F93731;" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="line-word-r" v-else>-</view>
</view>
<view 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.addPriceMarkup}}</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 style="color: #999;font-size: 26rpx;">会员减免</view>
<view class="line-word-r" >-{{order.addVipReductionMoney}}</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">
@ -244,13 +222,12 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">升级差额</view>
<view class="line-word-r">{{(order.priceMarkup - order.oldPriceMarkup).toFixed(2)}}</view>
<view class="line-word-r">{{(order.priceMarkup - order.oldPriceMarkup).toFixed(0)}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">会员减免</view>
<view style="line-word">会员减免</view>
<view class="line-word-r" >-{{order.vipReductionMoney}}</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;">
@ -261,6 +238,38 @@
</view>
</view>
<view class="jusitify-line-end"></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.addPriceMarkup}}</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.addVipReductionMoney}}</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="justify-title-nav">
<view class="justify-title">费用明细</view>
<view class="justify-title-nav-bor"></view>
@ -271,13 +280,10 @@
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 class="line-word-r"><text>{{order.taxiMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">优惠券</view>
@ -288,6 +294,13 @@
</view>
<view class="" v-else>-</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">升级费用</view>
<view class="" style="color: #333;">
<text style="font-size: 30rpx;font-weight: bold;" v-if="order.payMoney">{{order.payMoney}}</text>
<text style="font-size: 30rpx;font-weight: bold;" v-else>-</text>
</view>
</view>
<view class="flex justify-between jusitify-line" v-if="order.addMoney">
<view class="line-word">加钟费用</view>
<view class="" style="color: #333;" >
@ -297,13 +310,6 @@
<text style="font-size: 30rpx;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: 30rpx;font-weight: bold;" v-if="order.payMoney">{{order.payMoney}}</text>
<text style="font-size: 30rpx;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;">
@ -362,10 +368,10 @@
<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 class="flex justify-between jusitify-line" >
<view style="color: #999;font-size: 26rpx;">下单数量</view>
<view class="line-word-r">{{order.massageNum}}</view>
</view>
</view> -->
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">
小计
@ -379,8 +385,7 @@
</text>
</view>
</view>
<view class="jusitify-line-end"></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>
@ -410,38 +415,6 @@
<view class="line-word-r" style="color: #F93731;" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="line-word-r" v-else>-</view>
</view>
<view 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.addPriceMarkup}}</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 style="color: #999;font-size: 26rpx;">会员减免</view>
<view class="line-word-r" >-{{order.addVipReductionMoney}}</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">
@ -463,7 +436,7 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">升级差额</view>
<view class="line-word-r">{{(order.priceMarkup-order.oldPriceMarkup).toFixed(2)}}</view>
<view class="line-word-r">{{(order.priceMarkup-order.oldPriceMarkup).toFixed(0)}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">会员减免</view>
@ -477,6 +450,37 @@
</view>
</view>
<view class="jusitify-line-end"></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.addPriceMarkup}}</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 style="line-word">会员减免</view>
<view class="line-word-r" >-{{order.addVipReductionMoney}}</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="justify-title-nav">
<view class="justify-title">费用明细</view>
<view class="justify-title-nav-bor"></view>
@ -1432,6 +1436,15 @@
this.loading = false
uni.hideLoading()
this.order = res.data;
if(res.data["technicianType"] == 3){
this.order["technicianTypeName"] = "新手"
}
if(res.data["technicianType"] == 4){
this.order["technicianTypeName"] = "专家"
}
if(res.data["technicianType"] == 5){
this.order["technicianTypeName"] = "资深"
}
var date = new Date(); //
var timestamp = this.getTimeStampWithoutSeconds(date); //
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; //

View File

@ -100,7 +100,8 @@
<!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> -->
</view>
<view class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</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;">
@ -147,9 +148,12 @@
<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" v-if="order.userPackageDetailId==null">{{order.priceMarkup}}</view>
<view class="add-con-cont" v-else>{{order.massagePrice}}</view>
<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">{{order.technicianTypeName}}价格</view>
<view class="add-con-cont" style="color: #F93731;">{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.userPackageDetailId==null">
<view class="add-con-title">会员减免</view>
@ -469,6 +473,15 @@
this.loading = false
uni.hideLoading()
this.order = res.data;
if(res.data["technicianType"] == 3){
this.order["technicianTypeName"] = "新手"
}
if(res.data["technicianType"] == 4){
this.order["technicianTypeName"] = "专家"
}
if(res.data["technicianType"] == 5){
this.order["technicianTypeName"] = "资深"
}
var date = new Date(); //
var timestamp = this.getTimeStampWithoutSeconds(date); //
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; //