yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单页面调整

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

311
my/order/pay.vue
View File

@ -1,9 +1,8 @@
<template> <template>
<view class="content"> <view class="content">
<view v-if="order.overTimeOrders == 1" class="prompt"> <!-- <view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
<image class="promptimg" src="../../static/reminder.png"></image> <view style="color: red;font-size:26rpx">(订单已超时)</view>
<view style="color: #ff8542;font-size:26rpx">订单已超时</view> </view> -->
</view>
<view class="padding-bottom u-skeleton"> <view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0" <view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
style="padding: 0 29rpx;"> style="padding: 0 29rpx;">
@ -59,21 +58,21 @@
</view> </view>
<view class="add-content"> <view class="add-content">
<view class="" v-if="order.artificer"> <view class="" v-if="order.artificer">
<view class="jusitify-line"> <view class="flex align-center justify-between add-lin">
<view class="line-word">下单人</view> <view class="add-con-title">下单人</view>
<view class="line-word-r"> <view class="add-con-cont">
{{order.userName}} {{order.userName}}
</view> </view>
</view> </view>
<view class="jusitify-line"> <view class="flex align-center justify-between add-lin">
<view class="line-word">联系方式</view> <view class="add-con-title">联系方式</view>
<view class="line-word-r"> <view class="add-con-cont">
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}} {{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</view> </view>
</view> </view>
<view class="serverAddress jusitify-line"> <view class="serverAddress add-lin">
<view class="line-word">服务地址</view> <view class="add-con-title">服务地址</view>
<view class="line-word-r" style="width: 73%; text-align: right;">{{order.address}}</view> <view class="add-con-cont" style="width: 73%; line-height: 34rpx;">{{order.address}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -92,7 +91,7 @@
@click="bindphone(order.artificer.phone)"></image> --> @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> --> @click="bindphone(order.artificer.phone)"></image> -->
<view class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':order.technicianType=='5'?'资深':''}}</view> <view class="level_button">{{order.technicianTypeName}}</view>
</view> </view>
<view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount"> <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right"> <view class="margin-right">
@ -111,21 +110,21 @@
<view class="justify-title">订单信息</view> <view class="justify-title">订单信息</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">订单编号</view> <view class="add-con-title">订单编号</view>
<view class="line-word-r flex" @tap="copy(order.ordersNo)"> <view class="flex add-con-cont" @tap="copy(order.ordersNo)">
<view class="">{{order.ordersNo}}</view> <view class="">{{order.ordersNo}}</view>
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon> <u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
</view> </view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">预约时间</view> <view class="add-con-title">预约时间</view>
<view class="line-word-r" >{{order.serveTime}}</view> <view class="add-con-cont" >{{order.serveTime}}</view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">下单时间</view> <view class="add-con-title">下单时间</view>
<view class="line-word-r">{{order.createTime}}</view> <view class="add-con-cont">{{order.createTime}}</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
@ -133,28 +132,32 @@
<view class="justify-title">订单费用</view> <view class="justify-title">订单费用</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line" > <view class="flex justify-between add-lin" >
<view class="line-word">项目名称</view> <view class="add-con-title">项目名称</view>
<view class="line-word-r">{{order.entryName}}</view> <view class="add-con-cont">{{order.entryName}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">服务时长</view>
<view class="line-word-r">{{order.duration}}分钟</view>
</view>
<view class="jusitify-line" >
<view class="line-word">项目价格</view>
<view class="line-word-r">￥{{order.priceMarkup}}</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="line-word">会员减免</view> <view class="add-con-title">服务时长</view>
<view class="line-word-r" >-￥{{order.vipReductionMoney}}</view> <view class="add-con-cont">{{order.duration}}分钟</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">项目原价</view>
<view class="add-con-cont">￥{{order.massagePrice}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">{{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>
<view class="add-con-cont" >-￥{{order.vipReductionMoney}}</view>
</view> </view>
<view class="jusitify-line"> <view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
<view class="line-word"> <view class="add-con-title">
小计： 小计：
</view> </view>
<view class="line-word-r"> <view class="" style="color: #333;">
<text style="font-size: 35rpx;font-weight: bold;"> <text style="font-size: 35rpx;font-weight: bold;">
￥{{order.massageMoney}} ￥{{order.massageMoney}}
</text> </text>
@ -166,56 +169,54 @@
<view class="justify-title">出行费用</view> <view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line" v-if="order.tripWay" > <view class="flex justify-between add-lin" v-if="order.tripWay" >
<view class="line-word">出行方式</view> <view class="add-con-title">出行方式</view>
<view class="line-word-r" v-if="order.tripWay == 1">公交</view> <view class="add-con-cont" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r" v-if="order.tripWay == 2">出租</view> <view class="add-con-cont" v-if="order.tripWay == 2">出租</view>
<view class="line-word-r" v-if="order.tripWay == 3">免费</view> <view class="add-con-cont" v-if="order.tripWay == 3">免费</view>
</view> </view>
<view class="jusitify-line" v-if="order.km"> <view class="flex justify-between add-lin" v-if="order.km">
<view class="line-word">全程距离</view> <view class="add-con-title">全程距离</view>
<view class="line-word-r">{{order.km}}km</view> <view class="add-con-cont">{{order.km}}km</view>
</view> </view>
<view class="jusitify-line" > <view class="flex justify-between add-lin" >
<view class="line-word">出行费用</view> <view class="add-con-title">出行费用</view>
<view class="line-word-r">￥{{order.taxiMoney}}</view> <view class="add-con-cont">￥{{order.taxiMoney}}</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end add-lin"></view>
<view class="justify-title-nav"> <view class="justify-title-nav">
<view class="justify-title">优惠券信息</view> <view class="justify-title">优惠券信息</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">优惠券</view> <view class="add-con-title">优惠券</view>
<view class="line-word-r" style="color: #F93731;font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view> <view class="add-con-cont" style="color: #F93731;font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="" v-else>-</view> <view class="" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
<view class="justify-title-nav"> <view class="justify-title-nav">
<view class="justify-title">费用明细</view> <view class="justify-title">费用明细</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">订单费用：</view> <view class="add-con-title">订单费用：</view>
<view class="line-word-r">￥<text style=" font-weight: bold;">{{order.massageMoney}}</text></view> <view class="add-con-cont">￥<text style=" font-weight: bold;">{{order.massageMoney}}</text></view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">出行费用：</view> <view class="add-con-title">出行费用：</view>
<view class="line-word-r">￥<text>{{order.taxiMoney}}</text></view> <view class="add-con-cont">￥<text>{{order.taxiMoney}}</text></view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">优惠券：</view> <view class="add-con-title">优惠券：</view>
<view class="line-word-r" style="color: #F93731;" v-if="order.couponMoney"> <view class="add-con-cont" style="color: #F93731;" v-if="order.couponMoney">
-￥<text style="font-weight: bold;">{{order.couponMoney}}</text></view> -￥<text style="font-weight: bold;">{{order.couponMoney}}</text></view>
<view class="" v-else>-</view> <view class="" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
<view class="jusitify-line" > <view class="flex justify-between add-lin" >
<view class="line-word">合计：</view> <view class="add-con-title">合计：</view>
<view class="line-word-r" style="color: #FF3939;font-size: 32rpx;">￥ <view class="add-con-cont" style="color: #FF3939;font-size: 32rpx;">￥
<text style="font-size: 35rpx;font-weight: bold;"> <text style="font-size: 35rpx;font-weight: bold;">
{{order.payMoneyTotal}} {{order.payMoneyTotal}}
</text> </text>
@ -233,50 +234,50 @@
<view class="justify-title">订单信息</view> <view class="justify-title">订单信息</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">订单编号</view> <view class="add-con-title">订单编号</view>
<view class="line-word-r" @tap="copy(order.ordersNo)"> <view class="flex add-con-cont" @tap="copy(order.ordersNo)">
<view class="">{{order.ordersNo}}</view> <view class="">{{order.ordersNo}}</view>
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon> <u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
</view> </view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">预约时间</view> <view class="add-con-title">预约时间</view>
<view class="add-con-cont" >{{order.serveTime}}</view> <view class="add-con-cont" >{{order.serveTime}}</view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">下单时间</view> <view class="add-con-title">下单时间</view>
<view class="line-word-r">{{order.createTime}}</view> <view class="add-con-cont">{{order.createTime}}</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
<view class="justify-title-nav"> <view class="justify-title-nav">
<view class="line-word">订单费用</view> <view class="justify-title">订单费用</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line" > <view class="flex justify-between add-lin" >
<view class="line-word">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view> <view class="add-con-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
<view class="line-word-r">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view> <view class="add-con-cont">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
</view> </view>
<view class="jusitify-line" > <view class="flex justify-between add-lin" >
<view class="line-word">项目名称</view> <view class="add-con-title">项目名称</view>
<view class="line-word-r">{{order.entryName}}</view> <view class="add-con-cont">{{order.entryName}}</view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">服务时长</view> <view class="add-con-title">服务时长</view>
<view class="line-word-r">{{order.duration}}分钟</view> <view class="add-con-cont">{{order.duration}}分钟</view>
</view> </view>
<view class="jusitify-line" > <view class="flex justify-between add-lin" >
<view class="line-word">项目价格</view> <view class="add-con-title">项目价格</view>
<view class="line-word-r">￥{{order.massagePrice}}</view> <view class="add-con-cont">￥{{order.massagePrice}}</view>
</view> </view>
<view class="jusitify-line" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;"> <view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
<view class="line-word"> <view class="add-con-title">
小计： 小计：
</view> </view>
<view class="line-word-r"> <view class="" style="color: #333;">
<text style="font-size: 35rpx;font-weight: bold;"> <text style="font-size: 35rpx;font-weight: bold;">
￥{{order.massagePrice}} ￥{{order.massagePrice}}
</text> </text>
@ -288,29 +289,29 @@
<view class="justify-title">出行费用</view> <view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line" v-if="order.tripWay" > <view class="flex justify-between add-lin" v-if="order.tripWay" >
<view class="line-word">出行方式</view> <view class="add-con-title">出行方式</view>
<view class="line-word-r" v-if="order.tripWay == 1">公交</view> <view class="add-con-cont" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r" v-if="order.tripWay == 2">出租</view> <view class="add-con-cont" v-if="order.tripWay == 2">出租</view>
<view class="line-word-r" v-if="order.tripWay == 3">免费</view> <view class="add-con-cont" v-if="order.tripWay == 3">免费</view>
</view> </view>
<view class="jusitify-line" v-if="order.km"> <view class="flex justify-between add-lin" v-if="order.km">
<view class="line-word">全程距离</view> <view class="add-con-title">全程距离</view>
<view class="line-word-r">{{order.km}}km</view> <view class="add-con-cont">{{order.km}}km</view>
</view> </view>
<view class="jusitify-line" > <view class="flex justify-between add-lin" >
<view class="line-word">出行费用</view> <view class="add-con-title">出行费用</view>
<view class="line-word-r" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view> <view class="add-con-cont" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view>
<view class="line-word-r" v-else>-</view> <view class="add-con-cont" v-else>-</view>
</view> </view>
<view class="jusitify-line-end add-lin"></view> <view class="jusitify-line-end add-lin"></view>
<view class="justify-title-nav"> <view class="justify-title-nav">
<view class="justify-title">优惠券信息</view> <view class="justify-title">优惠券信息</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">优惠券</view> <view class="add-con-title">优惠券</view>
<view class="line-word-r" style="color: #F93731;font-size: 30rpx;font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view> <view class="add-con-cont" style="color: #F93731;font-size: 30rpx;font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="" v-else>-</view> <view class="" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
@ -318,25 +319,25 @@
<view class="justify-title">费用明细</view> <view class="justify-title">费用明细</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">订单费用：</view> <view class="add-con-title">订单费用：</view>
<view class="line-word-r">￥<text>{{order.massageMoney}}</text></view> <view class="add-con-cont">￥<text>{{order.massageMoney}}</text></view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">出行费用：</view> <view class="add-con-title">出行费用：</view>
<view class="line-word-r" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view> <view class="add-con-cont" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view>
<view class="line-word-r" v-else>-</view> <view class="add-con-cont" v-else>-</view>
</view> </view>
<view class="jusitify-line"> <view class="flex justify-between add-lin">
<view class="line-word">优惠券：</view> <view class="add-con-title">优惠券：</view>
<view class="line-word-r" style="color: #F93731;" v-if="order.couponMoney"> <view class="add-con-cont" style="color: #F93731;" v-if="order.couponMoney">
-￥<text style="font-weight: bold;">{{order.couponMoney}}</text></view> -￥<text style="font-weight: bold;">{{order.couponMoney}}</text></view>
<view class="" v-else>-</view> <view class="" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
<view class="jusitify-line" > <view class="flex justify-between add-lin" >
<view class="line-word">合计：</view> <view class="add-con-title">合计：</view>
<view class="line-word-r" style="color: #FF3939;font-size: 32rpx;">￥ <view class="add-con-cont" style="color: #FF3939;font-size: 32rpx;">￥
<text style="font-size: 35rpx;font-weight: bold;"> <text style="font-size: 35rpx;font-weight: bold;">
{{order.payMoneyTotal}} {{order.payMoneyTotal}}
</text> </text>
@ -726,13 +727,14 @@
}, },
customStyle2: { customStyle2: {
backgroundColor: '#ffffff', backgroundColor: '#ffffff',
border: '', border: '1px solid #ffffff',
color: '#333', color: '#333',
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
width: "310upx", width: "310upx",
// #endif // #endif
// #ifndef MP-WEIXIN // #ifndef MP-WEIXIN
width: '310upx', width: '310upx',
// #endif // #endif
margin: '0 10upx', margin: '0 10upx',
}, },
@ -1303,6 +1305,15 @@
this.loading = false this.loading = false
uni.hideLoading() uni.hideLoading()
this.order = res.data; 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 date = new Date(); // 当前日期和时间
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数 const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
@ -2340,24 +2351,7 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.prompt{
background: #ffefe2;
height: 100rpx;
color: #ff7a03;
margin:0 26rpx 26rpx 26rpx;
border-radius: 20rpx;
text-align: center;
display: flex;
line-height: 100rpx;
justify-content: center;
align-items: center;
border: 1px #ff7a03 dashed;
}
.promptimg{
width: 40rpx;
height: 40rpx;
margin-right: 10rpx;
}
/deep/.u-size-default{ /deep/.u-size-default{
width: 85px !important; width: 85px !important;
height:34rpx; height:34rpx;
@ -2540,14 +2534,9 @@
color: #019C88 !important; color: #019C88 !important;
margin-left: 10rpx !important; margin-left: 10rpx !important;
} }
.btns-state{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
margin-left: 10rpx;
color: #ffffff;
}
.eject-btns{ .eject-btns{
height:70rpx; height:60rpx;
line-height: 70rpx; line-height: 60rpx;
border-bottom: 1px solid #f7f7f7; border-bottom: 1px solid #f7f7f7;
padding: 0 20rpx; padding: 0 20rpx;
color: #666666; color: #666666;
@ -2621,7 +2610,6 @@
.zhuangtai{ .zhuangtai{
color: #029D88; color: #029D88;
font-weight: bold; font-weight: bold;
font-size: 30rpx;
} }
.head-title-right{ .head-title-right{
display: flex; display: flex;
@ -2638,7 +2626,7 @@
} }
.fei-view-list span,.fei-view-list-z span{ .fei-view-list span,.fei-view-list-z span{
font-weight: bold; font-weight: bold;
font-size: 26rpx; font-size: 25rpx;
} }
.fei-view-list-z{ .fei-view-list-z{
height: 65rpx; height: 65rpx;
@ -2963,8 +2951,8 @@
margin-top: 24rpx; margin-top: 24rpx;
} }
.add-lin{ .add-lin{
height: 70rpx; height: 74rpx;
line-height: 70rpx; line-height: 74rpx;
} }
.add-con-title{ .add-con-title{
color: #999; color: #999;
@ -2978,11 +2966,11 @@
} }
.level_button{ .level_button{
padding: 4rpx 20rpx; padding: 4rpx 20rpx;
background: linear-gradient(to right, #ffddb3,#ffefdb, #ffe1be); background: linear-gradient(to right, #ffc1a9,#fedec9, #fdbb9f);
border-radius: 16rpx 16rpx 16rpx 1rpx ; border-radius: 16rpx 16rpx 16rpx 1rpx ;
color: #805c18; color: #e95c3b;
font-size: 12px; font-size: 12px;
border: 1px solid #f2cd9f; border: 1px solid #fd967c;
} }
.justify-title-nav{ .justify-title-nav{
width: 90%; width: 90%;
@ -3004,23 +2992,10 @@
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
} }
.jusitify-line{
height: 74rpx;
padding: 20rpx 0;
font-size: 30rpx;
display: flex;
justify-content: space-between;
}
.jusitify-line-end{ .jusitify-line-end{
height: 1px; height: 1px;
border-bottom: 1px #e5e5e5 solid; border-bottom: 1px #f4f4f4 solid;
margin: 30rpx 0; margin: 15px 0;
}
.line-word{
color: #666;
}
.line-word-r{
color: #333;
} }
.prompt-text{ .prompt-text{
width: 100%; width: 100%;

41
my/order/payJaZ.vue
View File

@ -191,7 +191,7 @@
</view> </view>
<view class="jusitify-line" > <view class="jusitify-line" >
<view class="line-word">优惠券</view> <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 class="" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
@ -212,10 +212,10 @@
<view class="line-word">加钟时长</view> <view class="line-word">加钟时长</view>
<view class="line-word-r">{{order.addTime}}分钟</view> <view class="line-word-r">{{order.addTime}}分钟</view>
</view> </view>
<view class="jusitify-line"> <!-- <view class="jusitify-line">
<view class="line-word">加钟次数</view> <view class="line-word">加钟次数</view>
<view class="line-word-r">{{order.addNum}}</view> <view class="line-word-r">{{order.addNum}}</view>
</view> </view> -->
<view class="jusitify-line"> <view class="jusitify-line">
<view class="add-con-title">会员减免</view> <view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-￥{{order.addVipReductionMoney}}</view> <view class="add-con-cont" >-￥{{order.addVipReductionMoney}}</view>
@ -386,10 +386,10 @@
<view class="line-word">加钟时长</view> <view class="line-word">加钟时长</view>
<view class="line-word-r">{{order.addTime}}分钟</view> <view class="line-word-r">{{order.addTime}}分钟</view>
</view> </view>
<view class="jusitify-line"> <!-- <view class="jusitify-line">
<view class="line-word">加钟次数</view> <view class="line-word">加钟次数</view>
<view class="line-word-r">{{order.addNum}}</view> <view class="line-word-r">{{order.addNum}}</view>
</view> </view> -->
<view class="jusitify-line"> <view class="jusitify-line">
<view class="add-con-title">会员减免</view> <view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-￥{{order.addVipReductionMoney}}</view> <view class="add-con-cont" >-￥{{order.addVipReductionMoney}}</view>
@ -448,6 +448,7 @@
<view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</view> <view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
</view> </view>
</view> </view>
</view> </view>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center"> <view class="flex tabber padding-top-sm padding-bottom-sm align-center">
@ -464,14 +465,14 @@
提前结束 提前结束
</u-button> </u-button>
<u-button <u-button
v-if="order.ordersMassageList[0].massageType" v-if="order.addNum ==null && order.ordersMassageList[0].massageType"
shape="circle" :plain="true" shape="circle" :plain="true"
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)" @tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
class="btns"> class="btns">
加钟 加钟
</u-button> </u-button>
<u-button <u-button
v-if="order.ordersMassageList[0].userPackageDetail" v-if="order.addNum ==null && order.ordersMassageList[0].userPackageDetail"
shape="circle" :plain="true" shape="circle" :plain="true"
@tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)" @tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
class="btns"> class="btns">
@ -502,20 +503,20 @@
</view> </view>
</view> </view>
<view class="showBtn-mian" v-else> <view class="showBtn-mian" v-else>
<view class="flex"> <view class="showBtn" style="justify-content: center;">
<u-button :custom-style="customStyle2" <view :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)" @click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="btns"> class="eject-btns">
去投诉 去投诉
</u-button> </view>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" <view :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)" @click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
class="btns"> class="eject-btns">
去评价 去评价
</u-button> </view>
<u-button shape="circle" :plain="true" @click="goChat" <view shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button> class="eject-btns">联系客服</view>
</view> </view>
</view> </view>
@ -698,7 +699,7 @@
}, },
customStyle2: { customStyle2: {
backgroundColor: '', backgroundColor: '',
color: '#019C88', color: '#FFFFFF',
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
width: "310upx", width: "310upx",
// #endif // #endif
@ -2107,7 +2108,7 @@
} }
.fei-view-list span,.fei-view-list-z span{ .fei-view-list span,.fei-view-list-z span{
font-weight: bold; font-weight: bold;
font-size: 26rpx; font-size: 25rpx;
} }
.fei-view-list-z{ .fei-view-list-z{
height: 65rpx; height: 65rpx;
@ -2251,7 +2252,7 @@
background: #f7f7f7; background: #f7f7f7;
} }
.jusitify-line{ .jusitify-line{
height: 74rpx; height: 78rpx;
padding: 20rpx 0; padding: 20rpx 0;
font-size: 30rpx; font-size: 30rpx;
display: flex; display: flex;
@ -2263,7 +2264,7 @@
margin: 30rpx 0; margin: 30rpx 0;
} }
.line-word{ .line-word{
color: #666; color: #999;
} }
.line-word-r{ .line-word-r{
color: #333; color: #333;

17
my/order/payModify.vue
View File

@ -84,6 +84,23 @@
<span class="view-more"></span> <span class="view-more"></span>
</view> </view>
</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="jusitify-line" @click="youhuijuan">
<view class="line-word">平台优惠劵</view> <view class="line-word">平台优惠劵</view>
<view class="header-bottom-money-zhen"> <view class="header-bottom-money-zhen">

17
my/order/payModifyDd.vue
View File

@ -93,6 +93,23 @@
<span class="view-more"></span> <span class="view-more"></span>
</view> </view>
</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">
<view class="liliao-top" style="width: 30%;"> <view class="liliao-top" style="width: 30%;">
<span>平台优惠劵</span> <span>平台优惠劵</span>

21
my/order/payModifyTcMyDaiB.vue
View File

@ -96,7 +96,7 @@
<!-- <image src="../../static/img/phone.png" class="phone-pay" <!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> --> @click="bindphone(order.artificer.phone)"></image> -->
</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="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right"> <view class="margin-right">
<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;"> <image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
@ -143,8 +143,12 @@
<view class="add-con-cont">{{order.duration}}分钟</view> <view class="add-con-cont">{{order.duration}}分钟</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="add-con-title">项目价格</view> <view class="add-con-title">项目原价</view>
<view class="add-con-cont">￥{{order.priceMarkup}}</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>
<view class="flex justify-between add-lin" > <view class="flex justify-between add-lin" >
<view class="add-con-title">会员减免</view> <view class="add-con-title">会员减免</view>
@ -200,7 +204,7 @@
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="add-con-title">订单费用：</view> <view class="add-con-title">订单费用：</view>
<view class="add-con-cont">￥<text <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>
<view class="flex justify-between add-lin" v-if="order.taxiMoney"> <view class="flex justify-between add-lin" v-if="order.taxiMoney">
<view class="add-con-title">出行费用：</view> <view class="add-con-title">出行费用：</view>
@ -462,6 +466,15 @@
this.loading = false this.loading = false
uni.hideLoading() uni.hideLoading()
this.order = res.data; 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 date = new Date(); // 当前日期和时间
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数 const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数

193
my/order/payShengji.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<view class="content"> <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 style="color: red;font-size:26rpx">(订单已超时)</view>
</view> </view> -->
<view class="padding-bottom u-skeleton"> <view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" <view class="bgImg u-skeleton-fillet"
style="padding: 0 29rpx;"> style="padding: 0 29rpx;">
@ -129,11 +129,11 @@
<view class="line-word-r" v-else>{{order.oldEntryName}}</view> <view class="line-word-r" v-else>{{order.oldEntryName}}</view>
</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">服务时长</view>
<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view> <view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view> <view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view>
</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 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-if="order.oldPriceMarkup==null">￥{{order.priceMarkup}}</view>
<view class="line-word-r" v-else>￥{{order.oldPriceMarkup}}</view> <view class="line-word-r" v-else>￥{{order.oldPriceMarkup}}</view>
@ -141,10 +141,21 @@
<view class="flex justify-between jusitify-line" > <view class="flex justify-between jusitify-line" >
<view style="color: #999;font-size: 26rpx;">下单数量</view> <view style="color: #999;font-size: 26rpx;">下单数量</view>
<view class="line-word-r">{{order.massageNum}}</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>
<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">{{order.technicianTypeName}}价格</view>
<view class="line-word-r" >-￥{{order.vipReductionMoney}}</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>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;"> <view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
@ -178,8 +189,7 @@
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word">出行费用</view> <view class="line-word">出行费用</view>
<view class="line-word-r" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view> <view class="line-word-r">￥{{order.taxiMoney}}</view>
<view class="line-word-r" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
<view class="justify-title-nav"> <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" style="color: #F93731;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="line-word-r" v-else>-</view> <view class="line-word-r" v-else>-</view>
</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 class="jusitify-line-end"></view>
<view> <view>
<view class="justify-title-nav"> <view class="justify-title-nav">
@ -244,13 +222,12 @@
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word">升级差额</view> <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>
<view class="flex justify-between jusitify-line"> <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 class="line-word-r" >-￥{{order.vipReductionMoney}}</view>
</view> </view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;"> <view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">小计：</view> <view style="color: #333;font-size: 26rpx;">小计：</view>
<view class="" style="color: #333;"> <view class="" style="color: #333;">
@ -261,6 +238,38 @@
</view> </view>
</view> </view>
<view class="jusitify-line-end"></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-nav">
<view class="justify-title">费用明细</view> <view class="justify-title">费用明细</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
@ -271,13 +280,10 @@
style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view> style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
<view class="line-word-r" v-else>￥<text <view class="line-word-r" v-else>￥<text
style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view> style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word">出行费用：</view> <view class="line-word">出行费用：</view>
<view class="line-word-r" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view> <view class="line-word-r">￥<text>{{order.taxiMoney}}</text></view>
<view class="line-word-r" v-else>-</view>
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word">优惠券：</view> <view class="line-word">优惠券：</view>
@ -288,6 +294,13 @@
</view> </view>
<view class="" v-else>-</view> <view class="" v-else>-</view>
</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="flex justify-between jusitify-line" v-if="order.addMoney">
<view class="line-word">加钟费用：</view> <view class="line-word">加钟费用：</view>
<view class="" style="color: #333;" > <view class="" style="color: #333;" >
@ -297,13 +310,6 @@
<text style="font-size: 30rpx;font-weight: bold;" v-else>-</text> <text style="font-size: 30rpx;font-weight: bold;" v-else>-</text>
</view> </view>
</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="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word">合计：</view> <view class="line-word">合计：</view>
<view class="" style="color: #333;"> <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-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view>
<view class="line-word-r" v-else>￥{{order.oldMassagePrice}}</view> <view class="line-word-r" v-else>￥{{order.oldMassagePrice}}</view>
</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 style="color: #999;font-size: 26rpx;">下单数量</view>
<view class="line-word-r">{{order.massageNum}}</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 class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;"> <view style="color: #333;font-size: 26rpx;">
小计： 小计：
@ -380,7 +386,6 @@
</view> </view>
</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-nav jusitify-line">
<view class="justify-title">出行费用</view> <view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></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" style="color: #F93731;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="line-word-r" v-else>-</view> <view class="line-word-r" v-else>-</view>
</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 class="jusitify-line-end"></view>
<view> <view>
<view class="justify-title-nav"> <view class="justify-title-nav">
@ -463,7 +436,7 @@
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word">升级差额</view> <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>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">会员减免</view> <view style="color: #999;font-size: 26rpx;">会员减免</view>
@ -477,6 +450,37 @@
</view> </view>
</view> </view>
<view class="jusitify-line-end"></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-nav">
<view class="justify-title">费用明细</view> <view class="justify-title">费用明细</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
@ -1432,6 +1436,15 @@
this.loading = false this.loading = false
uni.hideLoading() uni.hideLoading()
this.order = res.data; 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 date = new Date(); // 当前日期和时间
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数 const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数

21
my/order/payding.vue
View File

@ -100,7 +100,8 @@
<!-- <image src="../../static/img/phone.png" class="phone-pay" <!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> --> @click="bindphone(order.artificer.phone)"></image> -->
</view> </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="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right"> <view class="margin-right">
<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;"> <image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
@ -147,9 +148,12 @@
<view class="add-con-cont">{{order.duration}}分钟</view> <view class="add-con-cont">{{order.duration}}分钟</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="add-con-title">项目价格</view> <view class="add-con-title">项目原价</view>
<view class="add-con-cont" v-if="order.userPackageDetailId==null">￥{{order.priceMarkup}}</view> <view class="add-con-cont">￥{{order.massagePrice}}</view>
<view class="add-con-cont" v-else>￥{{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>
<view class="flex justify-between add-lin" v-if="order.userPackageDetailId==null"> <view class="flex justify-between add-lin" v-if="order.userPackageDetailId==null">
<view class="add-con-title">会员减免</view> <view class="add-con-title">会员减免</view>
@ -469,6 +473,15 @@
this.loading = false this.loading = false
uni.hideLoading() uni.hideLoading()
this.order = res.data; 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 date = new Date(); // 当前日期和时间
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数 const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数