订单页面调整

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

View File

@ -191,7 +191,7 @@
</view>
<view class="jusitify-line" >
<view class="line-word">优惠券</view>
<view class="line-word" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="line-word" style="color: #F93731;" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="" v-else>-</view>
</view>
<view class="jusitify-line-end"></view>
@ -212,10 +212,10 @@
<view class="line-word">加钟时长</view>
<view class="line-word-r">{{order.addTime}}分钟</view>
</view>
<view class="jusitify-line">
<!-- <view class="jusitify-line">
<view class="line-word">加钟次数</view>
<view class="line-word-r">{{order.addNum}}</view>
</view>
</view> -->
<view class="jusitify-line">
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-{{order.addVipReductionMoney}}</view>
@ -386,10 +386,10 @@
<view class="line-word">加钟时长</view>
<view class="line-word-r">{{order.addTime}}分钟</view>
</view>
<view class="jusitify-line">
<!-- <view class="jusitify-line">
<view class="line-word">加钟次数</view>
<view class="line-word-r">{{order.addNum}}</view>
</view>
</view> -->
<view class="jusitify-line">
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-{{order.addVipReductionMoney}}</view>
@ -448,6 +448,7 @@
<view class="be-remarks">温馨提示费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view>
</view>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
@ -464,14 +465,14 @@
提前结束
</u-button>
<u-button
v-if="order.ordersMassageList[0].massageType"
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.ordersMassageList[0].userPackageDetail"
v-if="order.addNum ==null && order.ordersMassageList[0].userPackageDetail"
shape="circle" :plain="true"
@tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
class="btns">
@ -502,20 +503,20 @@
</view>
</view>
<view class="showBtn-mian" v-else>
<view class="flex">
<u-button :custom-style="customStyle2"
<view class="showBtn" style="justify-content: center;">
<view :custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="btns">
class="eject-btns">
去投诉
</u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true"
</view>
<view :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
class="btns">
class="eject-btns">
去评价
</u-button>
<u-button shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
</view>
<view shape="circle" :plain="true" @click="goChat"
class="eject-btns">联系客服</view>
</view>
</view>
@ -669,11 +670,11 @@
</template>
<script>
//
// #ifdef APP-PLUS
import permision from "@/components/permission.js";
// #endif
export default {
//
// #ifdef APP-PLUS
import permision from "@/components/permission.js";
// #endif
export default {
data() {
return {
ordersId: '',
@ -698,7 +699,7 @@
},
customStyle2: {
backgroundColor: '',
color: '#019C88',
color: '#FFFFFF',
// #ifdef MP-WEIXIN
width: "310upx",
// #endif
@ -1804,26 +1805,26 @@
})
},
}
}
}
</script>
<style lang="scss" scoped>
.eject-btns{
.eject-btns{
height:60rpx;
line-height: 60rpx;
border-bottom: 1px solid #f7f7f7;
padding: 0 20rpx;
color: #666666;
}
.be-remarks{
}
.be-remarks{
border: 1px dashed #FE912E;
padding: 10rpx 20rpx;
border-radius: 8rpx;
color: #fe912E;
font-size: 24rpx;
margin: 10px 0px;
}
.showBtnClass{
}
.showBtnClass{
position: absolute;
background: #fff;
display: flex;
@ -1835,32 +1836,32 @@
border-radius: 20rpx 20rpx 20rpx 0;
box-shadow: 0px 0px 3px 0px #b5b5b5;
padding: 15rpx 5rpx;
}
.dingshi,.btns{
}
.dingshi,.btns{
width: 0px !important;
padding: 0px 42px !important;
}
/deep/.padding-bottom{
}
/deep/.padding-bottom{
padding-bottom: 50px;
}
}
/deep/.u-drawer{
/deep/.u-drawer{
z-index:11 !important;
}
.xiangmu-cont-top-left{
}
.xiangmu-cont-top-left{
font-weight: normal;
font-size: 21rpx;
color: #049E89;
margin-top: 1px;
}
.xiangmu-cont-top-time{
}
.xiangmu-cont-top-time{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.xiadan{
}
.xiadan{
width: 122rpx;
height: 48rpx;
line-height: 48rpx;
@ -1870,40 +1871,40 @@
font-weight: bold;
font-size: 24rpx;
color: #FFFFFF;
}
.xiangmu-foot-left{
}
.xiangmu-foot-left{
display: flex;
flex-direction: row;
align-items: flex-end;
}
.xiangmu-foot-left-shiji span{
}
.xiangmu-foot-left-shiji span{
color: #F95900;
}
.xiangmu-foot-left-shiji span:nth-child(1){
}
.xiangmu-foot-left-shiji span:nth-child(1){
font-size: 25rpx;
}
.xiangmu-foot-left-shiji span:nth-child(2){
}
.xiangmu-foot-left-shiji span:nth-child(2){
font-weight: bold;
font-size:36.81rpx;
}
.xiangmu-foot-left-shiji span:nth-child(3){
}
.xiangmu-foot-left-shiji span:nth-child(3){
font-size: 25rpx;
}
.xiangmu-foot-left-dazhe{
}
.xiangmu-foot-left-dazhe{
font-weight: bold;
font-size: 31rpx;
color: #848484;
text-decoration-line: line-through;
margin-left:5px;
}
.xiangmu-foot{
}
.xiangmu-foot{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.xiangmu-about{
}
.xiangmu-about{
width: 100%;
text-align: left;
font-weight: 400;
@ -1915,31 +1916,31 @@
overflow: hidden;
text-overflow: ellipsis;
margin: 5px 0px;
}
.xiangmu-cont-top-title{
}
.xiangmu-cont-top-title{
font-weight: bold;
font-size: 33rpx;
color: #333333;
}
}
.xiangmu-cont-top{
.xiangmu-cont-top{
width: 100%;
display: flex;
flex-direction: column;
}
.xiangmu-cont{
}
.xiangmu-cont{
width: 55%;
display: flex;
flex-direction: column;
align-items: center;
}
.xiangmu-img{
}
.xiangmu-img{
width: 285rpx;
height: 218rpx;
background: #9F9F9F;
border-radius: 14rpx;
}
.xiangmu{
}
.xiangmu{
width: 94%;
height: 263rpx;
background: #FFFFFF;
@ -1950,15 +1951,15 @@
justify-content: space-between;
align-items: center;
padding: 10px;
}
}
.popup-mian-btn span:nth-child(1){
.popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970);
}
.popup-mian-btn span:nth-child(2){
}
.popup-mian-btn span:nth-child(2){
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
}
.popup-mian-btn span{
}
.popup-mian-btn span{
width: 247rpx;
height: 77rpx;
line-height: 77rpx;
@ -1967,35 +1968,35 @@
font-size: 32rpx;
color: #FFFEFE;
border-radius: 39rpx;
}
.popup-mian-btn{
}
.popup-mian-btn{
width: 100%;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-top: 20px;
}
.popup-mian-textarea{
}
.popup-mian-textarea{
width: 525.69rpx;
height: 211.81rpx;
}
.popup-mian{
}
.popup-mian{
width: 88%;
display: flex;
flex-direction: column;
margin: 5px auto 0px auto;
}
.popup-head span:nth-child(2){
}
.popup-head span:nth-child(2){
width: 50rpx;
height: 50rpx;
}
.popup-head span:nth-child(1){
}
.popup-head span:nth-child(1){
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.popup-head{
}
.popup-head{
width: 100%;
height: 99.38rpx;
background-color: rgba(21, 171, 141, 0.09);
@ -2004,42 +2005,42 @@
align-items: center;
justify-content: space-between;
padding: 0 15px;
}
.popup-content{
}
.popup-content{
width: 613rpx;
height: 479rpx;
background: #FFFFFF;
border-radius: 40rpx;
display: flex;
flex-direction: column;
}
/deep/.btns{
}
/deep/.btns{
color: #019C88 !important;
margin-left: 10rpx !important;
height:64rpx;
font-size: 28rpx;
}
.showbtn-line{
}
.showbtn-line{
display: flex;
flex-direction: row;
align-items: center;
}
.showBtn-mian{
}
.showBtn-mian{
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
flex-wrap: wrap;
justify-content: flex-end;
}
.gengduo{
}
.gengduo{
font-weight: 400;
font-size: 28rpx;
color: #7D7D7D;
margin-left: 26rpx;
}
.showBtnClass{
}
.showBtnClass{
display: flex;
flex-direction: column;
align-items: center;
@ -2050,8 +2051,8 @@
left:30rpx;
box-shadow: 0px 0px 3px 0px #b5b5b5;
border-radius: 10rpx;
}
.showBtnClass:before {
}
.showBtnClass:before {
position: absolute;
left: 20rpx;
bottom:-12rpx;
@ -2064,15 +2065,15 @@
transform: rotate(45deg);
-webkit-transform: rotate(45deg);
content: '';
}
.showBtn{
}
.showBtn{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.hideBtn{
}
.hideBtn{
width: 100%;
display: flex;
flex-direction: row;
@ -2080,61 +2081,61 @@
flex-wrap: wrap;
justify-content: space-between;
}
}
.dingshi{
.dingshi{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
}
.zhuangtai{
}
.zhuangtai{
color: #029D88;
font-size: 30rpx;
}
.head-title-right{
}
.head-title-right{
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
font-weight: bold;
}
.head-title{
}
.head-title{
margin-top: -2px;display: inline-block;
width: 300rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-size: 30rpx;
}
.fei-view-list span,.fei-view-list-z span{
}
.fei-view-list span,.fei-view-list-z span{
font-weight: bold;
font-size: 26rpx;
}
.fei-view-list-z{
font-size: 25rpx;
}
.fei-view-list-z{
height: 65rpx;
background-color: rgba(247, 247, 247, 0.8);
border-radius: 33rpx;
padding: 0px 5px;
}
.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
}
.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
color: #666666;
}
.fei-view-list span:nth-child(2){
}
.fei-view-list span:nth-child(2){
color: #333333;
}
.fei-view-list,.fei-view-list-z{
}
.fei-view-list,.fei-view-list-z{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
margin-top: 5px;
}
.fei-view{
}
.fei-view{
width: 100%;
display: flex;
flex-direction: column;
}
.fei-title{
}
.fei-title{
width: 100%;
text-align: center;
font-weight: bold;
@ -2143,141 +2144,141 @@
padding-bottom: 10px;
margin-bottom: 10px;
border-bottom: 1px solid #E5E5E5;
}
.feiuong{
}
.feiuong{
padding: 29rpx;
}
/deep/.uni-textarea-textarea{
}
/deep/.uni-textarea-textarea{
font-weight: 400;
font-size: 25rpx;
}
/deep/.uni-textarea-placeholder{
}
/deep/.uni-textarea-placeholder{
font-weight: 400;
font-size: 25rpx;
color: #C5C5C5;
}
.textarea-pay-list{
}
.textarea-pay-list{
width: 100%;
height: 126rpx;
margin-top: 10px;
}
.textarea-pay{
}
.textarea-pay{
background-color: #f3f3f3;
width: 100%;
height: 100%;
background: #F3F3F3;
border-radius: 14rpx;
padding: 7px;
}
.list-pay{
}
.list-pay{
width: 100%;
padding: 0 32rpx 20rpx 32rpx ;
}
.pay-ding-top{
}
.pay-ding-top{
width: 100%;
height: 100rpx;
background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
border-top-left-radius: 24rpx;
border-top-right-radius: 24rpx;
padding: 0px 29rpx;
}
.pay-ding,.feiuong{
}
.pay-ding,.feiuong{
background-color: #ffffff;
border-radius: 24rpx;
margin-top: 24rpx;
// padding: 29rpx;
}
.phone-pay{
}
.phone-pay{
width: 49rpx;
height: 44rpx;
}
.d-title{
}
.d-title{
font-weight: 550;
font-size: 30rpx;
color: #333333;
}
.d-touxiang{
}
.d-touxiang{
width: 55rpx;
height: 55rpx;
border-radius: 50%;
border: 1px solid #f2fffd;
}
.money-pay-jia{
}
.money-pay-jia{
font-weight: 400;
font-size: 25rpx;
color: #666666;
text-decoration-line: line-through;
margin-left: 5px;
}
.money-pay-zhen span{
}
.money-pay-zhen span{
color: #FF6000;
}
.money-pay-zhen span:nth-child(1){
}
.money-pay-zhen span:nth-child(1){
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
}
.money-pay-zhen span:nth-child(2){
font-size: 32rpx;
font-weight: bold;
}
.money-pay-zhen{
}
.money-pay-zhen{
display: flex;
flex-direction: row;
align-items: center;
}
.money-pay{
}
.money-pay{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
.head-top{
}
.head-top{
background-color: #ffffff;
border-radius: 24rpx;
padding: 29rpx;
}
.content{
}
.content{
padding-bottom: 140rpx;
padding-top: 20px;
width: 100%;
background-color: #f7f7f7;
}
.pay-title{
}
.pay-title{
font-weight: bold;
font-size: 32rpx;
color: #333333;
margin-bottom: 12px;
}
.page {
}
.page {
background: #f7f7f7;
}
.jusitify-line{
height: 74rpx;
}
.jusitify-line{
height: 78rpx;
padding: 20rpx 0;
font-size: 30rpx;
display: flex;
justify-content: space-between;
}
.jusitify-line-end{
}
.jusitify-line-end{
height:1px;
border-bottom: 1px #e5e5e5 solid;
margin: 30rpx 0;
}
.line-word{
color: #666;
}
.line-word-r{
}
.line-word{
color: #999;
}
.line-word-r{
color: #333;
}
.bgImg {
}
.bgImg {
background-image: url('https://admin.sjajk.com/file/uploadPath/2023/01/03/02952e7260e553d0f3bb26a1cd154921.png');
background-size: 100% 1161rpx;
}
}
.bg {
.bg {
background: linear-gradient(to right, #223845, #00a85b);
}
}
.list_item {
.list_item {
// width: 650upx;
// height: 160upx;
width: 92%;
@ -2376,9 +2377,9 @@
height: 160upx;
border-radius: 24upx;
}
}
}
.jz_btn {
.jz_btn {
width: 170rpx;
height: 56upx;
background: #096f4b;
@ -2390,9 +2391,9 @@
font-family: PingFang SC;
font-weight: bold;
color: #FFFFFF;
}
}
.tabber {
.tabber {
width: 100%;
background: #ffffff;
position: fixed;
@ -2403,9 +2404,9 @@
height: 110rpx;
padding: 0 30rpx;
border-top: 1px solid #f5f5f5;
}
}
.box {
.box {
/* border: 1px solid #005dff; */
background: #E8FAE1;
border-radius: 4rpx;
@ -2413,9 +2414,9 @@
padding: 5upx 10upx;
font-size: 22rpx;
margin-top: 10rpx;
}
}
.popup_pay {
.popup_pay {
width: 100%;
position: relative;
padding-bottom: 45rpx;
@ -2424,9 +2425,9 @@
/* height: 130px; */
/* #endif */
}
}
.pay_btn {
.pay_btn {
width: 90%;
margin: 0 auto;
text-align: center;
@ -2435,38 +2436,38 @@
border-radius: 60rpx;
color: #ffffff;
line-height: 80rpx;
}
}
.serverAddress {
.serverAddress {
display: flex;
justify-content: space-between;
align-items: center;
}
.level_button{
}
.level_button{
background: #019C88;
border-radius: 20rpx 8rpx 20rpx 8rpx;
padding: 10rpx 20rpx;
color: #fff;
font-size: 12px;
}
.justify-title-nav{
}
.justify-title-nav{
width: 90%;
display: flex;
flex-direction: column;
position: relative;
margin: 10px 0;
}
.justify-title{
}
.justify-title{
font-weight: bold;
font-size: 16px;
color: #333;
}
.justify-title-nav-bor{
}
.justify-title-nav-bor{
width: 64px;
height: 5px;
border-radius: 3px;
position: absolute;
bottom: 0;
background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7));
}
}
</style>

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 class="flex justify-between 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="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">{{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;">
小计
@ -380,7 +386,6 @@
</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>
@ -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; //