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

订单页面调整

This commit is contained in:
曹磊 2024-07-20 18:17:16 +08:00
parent 820acb72c4
commit d07e3905e2
6 changed files with 950 additions and 934 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

366
my/order/pay.vue
View File

@ -17,7 +17,7 @@
</view> </view>
<view class="u-flex-1 margin-left-sm"> <view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right"> <view class="flex head-title-right">
<view class="head-title" style="font-size: 30rpx;"> <view class="head-title">
{{order.entryName}} {{order.entryName}}
</view> </view>
<view class="zhuangtai"> <view class="zhuangtai">
@ -37,15 +37,16 @@
<view style="width: 100%;"> <view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;"> <view class="flex justify-between margin-tb-sm" style="color: #999999;">
<view style="justify-content: space-between;"> <view style="justify-content: space-between;">
{{order.duration}}分钟 <text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text>
</view> </view>
</view> </view>
<view class="money-pay" style="justify-content: space-between;"> <view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen"> <view class="money-pay-zhen">
<text class="title-font">项目价格：</text>
<span>￥</span> <span>￥</span>
<span>{{order.priceMarkup}}</span> <span>{{order.priceMarkup}} </span>
<view style="margin-left: 5px;font-size: 12px;color: #999;text-decoration: line-through;" v-if="order.ordersMassageList[0].userPackageDetail">￥{{order.price}}</view> <!-- <view style="margin-left: 5px;font-size: 12px;color: #999;text-decoration: line-through;" v-if="order.ordersMassageList[0].userPackageDetail">￥{{order.price}}</view> -->
</view> </view>
<view> <view>
<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" /> <uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
@ -58,21 +59,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="flex align-center justify-between add-lin"> <view class="flex align-center justify-between jusitify-line">
<view class="add-con-title">下单人</view> <view class="line-word title-font">客户姓名</view>
<view class="add-con-cont"> <view class="line-word-r value-font">
{{order.userName}} {{order.userName}}
</view> </view>
</view> </view>
<view class="flex align-center justify-between add-lin"> <view class="flex align-center justify-between jusitify-line">
<view class="add-con-title">联系方式</view> <view class="line-word title-font">联系方式</view>
<view class="add-con-cont"> <view class="line-word-r value-font">
{{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 add-lin"> <view class="serverAddress jusitify-line">
<view class="add-con-title">服务地址</view> <view class="line-word title-font">服务地址</view>
<view class="add-con-cont" style="width: 73%; line-height: 34rpx;">{{order.address}}</view> <view class="line-word-r value-font" style="width: 75%; text-align: right;">{{order.address}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -110,21 +111,22 @@
<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="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">订单编号</view> <view class="line-word title-font">订单编号</view>
<view class="flex add-con-cont" @tap="copy(order.ordersNo)"> <view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
<view class="">{{order.ordersNo}}</view> <view class="">{{order.ordersNo}}
<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>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">预约时间</view> <view class="line-word title-font">预约时间</view>
<view class="add-con-cont" >{{order.serveTime}}</view> <view class="line-word-r value-font" >{{order.serveTime}}</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">下单时间</view> <view class="line-word title-font">下单时间</view>
<view class="add-con-cont">{{order.createTime}}</view> <view class="line-word-r value-font">{{order.createTime}}</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
@ -132,33 +134,30 @@
<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="flex justify-between add-lin" > <view class="flex justify-between jusitify-line" >
<view class="add-con-title">项目名称</view> <view class="line-word title-font">项目名称</view>
<view class="add-con-cont">{{order.entryName}}</view> <view class="line-word-r value-font">{{order.entryName}}</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">服务时长</view> <view class="line-word title-font">服务时长</view>
<view class="add-con-cont">{{order.duration}}分钟</view> <view class="line-word-r value-font">{{order.duration}}分钟</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">项目原价</view> <view class="line-word title-font">项目原价</view>
<view class="add-con-cont">￥{{order.massagePrice}}</view> <view class="line-word-r value-font">￥{{order.massagePrice}}</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">{{order.technicianTypeName}}价格</view> <view class="line-word title-font">{{order.technicianTypeName}}价格</view>
<view class="add-con-cont" style="color: #F93731;">￥{{order.priceMarkup}}</view> <view class="line-word-r value-font" style="color: #019c88;">￥{{order.priceMarkup}}</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">会员减免</view> <view class="line-word title-font">会员减免</view>
<view class="add-con-cont" >-￥{{order.vipReductionMoney}}</view> <view class="line-word-r value-font" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
</view> </view>
<view class="flex align-center jusitify-line" style="justify-content: flex-end;">
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;"> <view class="line-word title-font">小计：</view>
<view class="add-con-title"> <view class="value-font" style="font-weight: bold;">
小计： <text>
</view>
<view class="" style="color: #333;">
<text style="font-size: 35rpx;font-weight: bold;">
￥{{order.massageMoney}} ￥{{order.massageMoney}}
</text> </text>
</view> </view>
@ -169,63 +168,58 @@
<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="flex justify-between add-lin" v-if="order.tripWay" > <view class="flex justify-between jusitify-line" v-if="order.tripWay" >
<view class="add-con-title">出行方式</view> <view class="line-word title-font">出行方式</view>
<view class="add-con-cont" v-if="order.tripWay == 1">公交</view> <view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="add-con-cont" v-if="order.tripWay == 2">出租</view> <view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
<view class="add-con-cont" v-if="order.tripWay == 3">免费</view> <view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
</view> </view>
<view class="flex justify-between add-lin" v-if="order.km"> <view class="flex justify-between jusitify-line" v-if="order.km">
<view class="add-con-title">全程距离</view> <view class="line-word title-font">全程距离</view>
<view class="add-con-cont">{{order.km}}km</view> <view class="line-word-r value-font">{{order.km}}km</view>
</view> </view>
<view class="flex justify-between add-lin" > <view class="flex justify-between jusitify-line" >
<view class="add-con-title">出行费用</view> <view class="line-word title-font">出行费用</view>
<view class="add-con-cont">￥{{order.taxiMoney}}</view> <view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
</view> </view>
<view class="jusitify-line-end add-lin"></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="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">优惠券</view> <view class="line-word title-font">优惠券</view>
<view class="add-con-cont" style="color: #F93731;font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view> <view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="" v-else>-</view> <view class="value-font" 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="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">订单费用：</view> <view class="line-word title-font">订单费用</view>
<view class="add-con-cont">￥<text style=" font-weight: bold;">{{order.massageMoney}}</text></view> <view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">出行费用：</view> <view class="line-word title-font">出行费用</view>
<view class="add-con-cont">￥<text>{{order.taxiMoney}}</text></view> <view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">优惠券：</view> <view class="line-word title-font">优惠券</view>
<view class="add-con-cont" style="color: #F93731;" v-if="order.couponMoney"> <view class="line-word-r value-font" style="color: #FF6000;" 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="value-font" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view class="flex justify-between add-lin" > <view class="line-word title-font">合计：</view>
<view class="add-con-title">合计：</view> <view class="value-font">
<view class="add-con-cont" style="color: #FF3939;font-size: 32rpx;">￥ <text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
<text style="font-size: 35rpx;font-weight: bold;"> ￥{{order.payMoneyTotal}}
{{order.payMoneyTotal}} </text>
</text>
</view> </view>
</view> </view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view> </view>
<!-- 套餐 次卡 疗程 信息 --> <!-- 套餐 次卡 疗程 信息 -->
@ -234,21 +228,22 @@
<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="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">订单编号</view> <view class="line-word title-font">订单编号</view>
<view class="flex add-con-cont" @tap="copy(order.ordersNo)"> <view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
<view class="">{{order.ordersNo}}</view> <view class="">{{order.ordersNo}}
<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>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">预约时间</view> <view class="line-word title-font">预约时间</view>
<view class="add-con-cont" >{{order.serveTime}}</view> <view class="line-word-r value-font" >{{order.serveTime}}</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">下单时间</view> <view class="line-word title-font">下单时间</view>
<view class="add-con-cont">{{order.createTime}}</view> <view class="line-word-r value-font">{{order.createTime}}</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
@ -256,29 +251,27 @@
<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="flex justify-between add-lin" > <view class="flex justify-between jusitify-line" >
<view class="add-con-title">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view> <view class="line-word title-font">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
<view class="add-con-cont">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view> <view class="line-word-r value-font">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
</view> </view>
<view class="flex justify-between add-lin" > <view class="flex justify-between jusitify-line" >
<view class="add-con-title">项目名称</view> <view class="line-word title-font">项目名称</view>
<view class="add-con-cont">{{order.entryName}}</view> <view class="line-word-r value-font">{{order.entryName}}</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">服务时长</view> <view class="line-word title-font">服务时长</view>
<view class="add-con-cont">{{order.duration}}分钟</view> <view class="line-word-r value-font">{{order.duration}}分钟</view>
</view> </view>
<view class="flex justify-between add-lin" > <view class="flex justify-between jusitify-line" >
<view class="add-con-title">项目价格</view> <view class="line-word title-font">项目价格</view>
<view class="add-con-cont">￥{{order.massagePrice}}</view> <view class="line-word-r value-font">￥{{order.massagePrice}}</view>
</view> </view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;"> <view class="flex align-center jusitify-line" style="justify-content: flex-end;">
<view class="add-con-title"> <view class="line-word title-font">小计：</view>
小计： <view class="value-font" style="font-weight: bold;">
</view> <text>
<view class="" style="color: #333;">
<text style="font-size: 35rpx;font-weight: bold;">
￥{{order.massagePrice}} ￥{{order.massagePrice}}
</text> </text>
</view> </view>
@ -289,64 +282,58 @@
<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="flex justify-between add-lin" v-if="order.tripWay" > <view class="flex justify-between jusitify-line" v-if="order.tripWay" >
<view class="add-con-title">出行方式</view> <view class="line-word title-font">出行方式</view>
<view class="add-con-cont" v-if="order.tripWay == 1">公交</view> <view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="add-con-cont" v-if="order.tripWay == 2">出租</view> <view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
<view class="add-con-cont" v-if="order.tripWay == 3">免费</view> <view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
</view> </view>
<view class="flex justify-between add-lin" v-if="order.km"> <view class="flex justify-between jusitify-line" v-if="order.km">
<view class="add-con-title">全程距离</view> <view class="line-word title-font">全程距离</view>
<view class="add-con-cont">{{order.km}}km</view> <view class="line-word-r value-font">{{order.km}}km</view>
</view> </view>
<view class="flex justify-between add-lin" > <view class="flex justify-between jusitify-line" >
<view class="add-con-title">出行费用</view> <view class="line-word title-font">出行费用</view>
<view class="add-con-cont" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view> <view class="line-word-r value-font" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view>
<view class="add-con-cont" v-else>-</view> <view class="line-word-r value-font" v-else>-</view>
</view> </view>
<view class="jusitify-line-end add-lin"></view> <view class="jusitify-line-end jusitify-line"></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="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">优惠券</view> <view class="line-word title-font">优惠券</view>
<view class="add-con-cont" style="color: #F93731;font-size: 30rpx;font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view> <view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="" v-else>-</view> <view class="value-font" 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="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">订单费用：</view> <view class="line-word title-font">订单费用</view>
<view class="add-con-cont">￥<text>{{order.massageMoney}}</text></view> <view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">出行费用：</view> <view class="line-word title-font">出行费用</view>
<view class="add-con-cont" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view> <view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
<view class="add-con-cont" v-else>-</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">优惠券：</view> <view class="line-word title-font">优惠券</view>
<view class="add-con-cont" style="color: #F93731;" v-if="order.couponMoney"> <view class="line-word-r value-font" style="color: #FF6000;" 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="value-font" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view class="flex justify-between add-lin" > <view class="line-word title-font">合计：</view>
<view class="add-con-title">合计：</view> <view class="value-font">
<view class="add-con-cont" style="color: #FF3939;font-size: 32rpx;">￥ <text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
<text style="font-size: 35rpx;font-weight: bold;"> ￥{{order.payMoneyTotal}}
{{order.payMoneyTotal}}
</text> </text>
</view> </view>
</view> </view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view> </view>
</view> </view>
<view style="height: 100rpx;"></view> <view style="height: 100rpx;"></view>
@ -2610,6 +2597,7 @@ export default {
.zhuangtai{ .zhuangtai{
color: #029D88; color: #029D88;
font-weight: bold; font-weight: bold;
font-size: 32rpx;
} }
.head-title-right{ .head-title-right{
display: flex; display: flex;
@ -2617,13 +2605,7 @@ export default {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.head-title{
margin-top: -2px;display: inline-block;
width: 300rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.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: 25rpx; font-size: 25rpx;
@ -2689,16 +2671,17 @@ export default {
padding: 7px; padding: 7px;
} }
.list-pay{ .list-pay{
width: 100%; width: 100%;
padding:0 15px 15px 29rpx; padding: 10rpx 29rpx;
margin-bottom: 40rpx;
} }
.pay-ding-top{ .pay-ding-top{
width: 100%; width: 100%;
height: 50px; height: 100rpx;
background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff); background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
border-top-left-radius: 12px; border-top-left-radius: 24rpx;
border-top-right-radius: 12px; border-top-right-radius: 24rpx;
padding: 0px 14px; padding: 0px 29rpx;
} }
.pay-ding,.feiuong{ .pay-ding,.feiuong{
background-color: #ffffff; background-color: #ffffff;
@ -2711,15 +2694,15 @@ export default {
height: 44rpx; height: 44rpx;
} }
.d-title{ .d-title{
font-weight: 400; font-weight: 550;
font-size: 32rpx; font-size: 30rpx;
color: #333333; color: #333333;
font-weight: bold;
} }
.d-touxiang{ .d-touxiang{
width: 60rpx; width: 55rpx;
height: 60rpx; height: 55rpx;
border-radius: 50%; border-radius: 50%;
border: 1px solid #f2fffd;
} }
.money-pay-jia{ .money-pay-jia{
font-weight: 400; font-weight: 400;
@ -2729,14 +2712,9 @@ export default {
margin-left: 5px; margin-left: 5px;
} }
.money-pay-zhen span{ .money-pay-zhen span{
color: #FF6000; color: #FF6000;
} font-size: 32rpx;
.money-pay-zhen span:nth-child(1){ font-weight: bold;
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 30rpx;
font-weight: bold;
} }
.money-pay-zhen{ .money-pay-zhen{
display: flex; display: flex;
@ -2763,7 +2741,7 @@ export default {
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
margin-bottom: 20rpx; margin-bottom: 12px;
} }
page { page {
background: #f7f7f7; background: #f7f7f7;
@ -2992,10 +2970,15 @@ page {
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
} }
.jusitify-line{
height: 78rpx;
padding: 20rpx 0;
font-size: 30rpx;
}
.jusitify-line-end{ .jusitify-line-end{
height: 1px; height:1px;
border-bottom: 1px #f4f4f4 solid; border-bottom: 1px #e5e5e5 solid;
margin: 15px 0; margin: 30rpx 0;
} }
.prompt-text{ .prompt-text{
width: 100%; width: 100%;
@ -3010,4 +2993,17 @@ page {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.head-title{
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.title-font{
font-size: 30rpx;
color: #666666;
}
.value-font{
font-size: 30rpx;
color: #333333;
}
</style> </style>

385
my/order/payJaZ.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" 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;">
@ -35,15 +35,16 @@
</view> </view>
<view class="flex align-center"> <view class="flex align-center">
<view style="width: 100%;"> <view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;"> <view class="flex justify-between margin-tb-sm">
<view style="justify-content: space-between;"> <view style="justify-content: space-between;">
{{order.duration}}分钟 <text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text>
</view> </view>
</view> </view>
<view class="money-pay" style="justify-content: space-between;"> <view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen"> <view class="money-pay-zhen">
<text class="title-font">项目价格：</text>
<span>￥</span> <span>￥</span>
<span>{{order.priceMarkup}}</span> <span>{{order.priceMarkup}} </span>
</view> </view>
<view> <view>
<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" /> <uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
@ -54,23 +55,23 @@
</view> </view>
</view> </view>
</view> </view>
<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;"> <view class="add-content">
<view class="" v-if="order.artificer"> <view class="" v-if="order.artificer">
<view class="flex align-center jusitify-line"> <view class="flex align-center jusitify-line">
<view class="line-word">客户姓名</view> <view class="line-word title-font">客户姓名</view>
<view class="line-word-r"> <view class="line-word-r value-font">
{{order.userName}} {{order.userName}}
</view> </view>
</view> </view>
<view class="flex align-center jusitify-line"> <view class="flex align-center jusitify-line">
<view class="line-word">联系方式</view> <view class="line-word title-font">联系方式</view>
<view class="line-word-r"> <view class="line-word-r value-font">
{{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 jusitify-line">
<view class="line-word">服务地址</view> <view class="line-word title-font">服务地址</view>
<view class="line-word-r" style="width: 73%; text-align: right;">{{order.address}}</view> <view class="line-word-r value-font" style="width: 75%; text-align: right;">{{order.address}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -109,21 +110,21 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">订单编号</view> <view class="line-word title-font">订单编号</view>
<view class="flex align-center" @tap="copy(order.ordersNo)" <view class="flex align-center" @tap="copy(order.ordersNo)">
style="color: #333;font-size: 30rpx;"> <view class="value-font">{{order.ordersNo}}
<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: #1db18f;margin-left: 10rpx;"></u-icon> </view>
</view> </view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">预约时间</view> <view class="line-word title-font">预约时间</view>
<view class="line-word-r">{{order.serveTime}}</view> <view class="line-word-r value-font">{{order.serveTime}}</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">下单时间</view> <view class="line-word title-font">下单时间</view>
<view class="flex line-word-r">{{order.createTime}}</view> <view class="flex line-word-r value-font">{{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">
@ -131,33 +132,36 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">项目名称</view> <view class="line-word title-font">项目名称</view>
<view class="line-word-r" v-if="order.oldEntryName==null">{{order.entryName}}</view> <view class="line-word-r value-font" v-if="order.oldEntryName==null">{{order.entryName}}</view>
<view class="line-word-r" v-else>{{order.oldEntryName}}</view> <view class="line-word-r value-font" v-else>{{order.oldEntryName}}</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">服务时长</view> <view class="line-word title-font">服务时长</view>
<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view> <view class="line-word-r value-font" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view> <view class="line-word-r value-font" v-else>{{order.oldMassageDuration}}分钟</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">项目价格</view> <view class="line-word title-font">项目原价</view>
<view class="line-word-r" v-if="order.oldPriceMarkup==null">￥{{order.priceMarkup}}</view> <view class="line-word-r value-font" v-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view>
<view class="line-word-r" v-else>￥{{order.oldPriceMarkup}}</view> <view class="line-word-r value-font" v-else>￥{{order.oldMassagePrice}}</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="add-con-title">会员减免</view> <view class="line-word title-font">{{order.technicianTypeName}}价格</view>
<view class="add-con-cont" >-￥{{order.vipReductionMoney}}</view> <view class="line-word-r value-font" style="color: #019c88;" v-if="order.oldPriceMarkup==null">￥{{order.priceMarkup}}</view>
<view class="line-word-r value-font" style="color: #019c88;" v-else>￥{{order.oldPriceMarkup}}</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word"> <view class="add-con-title title-font">会员减免</view>
小计： <view class="add-con-cont value-font" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
</view> </view>
<view class="" style="color: #333;"> <view class="jusitify-line" style="justify-content: flex-end;">
<text v-if="order.oldMassageMoney==null" style="font-size: 35rpx;font-weight: bold;"> <view class="line-word title-font">小计：</view>
<view class="value-font" style="font-weight: bold;">
<text v-if="order.oldMassageMoney==null" >
￥{{order.massageMoney}} ￥{{order.massageMoney}}
</text> </text>
<text v-else style="font-size: 35rpx;font-weight: bold;"> <text v-else>
￥{{order.oldMassageMoney}} ￥{{order.oldMassageMoney}}
</text> </text>
</view> </view>
@ -170,29 +174,29 @@
<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="jusitify-line" v-if="order.tripWay" >
<view class="line-word">出行方式</view> <view class="line-word title-font">出行方式</view>
<view class="line-word-r" v-if="order.tripWay == 1">公交</view> <view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r" v-if="order.tripWay == 2">出租</view> <view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
<view class="line-word-r" v-if="order.tripWay == 3">免费</view> <view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
</view> </view>
<view class="jusitify-line" v-if="order.km"> <view class="jusitify-line" v-if="order.km">
<view class="line-word">全程距离</view> <view class="line-word title-font">全程距离</view>
<view class="line-word-r" >{{order.km}}km</view> <view class="line-word-r value-font" >{{order.km}}km</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">出行费用</view> <view class="line-word title-font">出行费用</view>
<view class="line-word-r" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view> <view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
<view class="line-word-r" v-else>-</view>
</view> </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="jusitify-line" >
<view class="line-word">优惠券</view> <view class="line-word title-font">优惠券</view>
<view class="line-word" style="color: #F93731;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view> <view class="line-word value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="" v-else>-</view> <view class="value-font" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
<view> <view>
@ -201,30 +205,29 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line" > <view class="jusitify-line" >
<view class="line-word">加钟项目</view> <view class="line-word title-font">加钟项目</view>
<view class="line-word-r">{{order.addEntryName}}</view> <view class="line-word-r value-font">{{order.addEntryName}}</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">加钟价格</view> <view class="line-word title-font">加钟价格</view>
<view class="line-word-r">￥{{order.addPriceMarkup}}</view> <view class="line-word-r value-font" style="color: #019c88;">￥{{order.addPriceMarkup}}</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">加钟时长</view> <view class="line-word title-font">加钟时长</view>
<view class="line-word-r">{{order.addTime}}分钟</view> <view class="line-word-r value-font">{{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 title-font">会员减免</view>
<view class="add-con-cont" >-￥{{order.addVipReductionMoney}}</view> <view class="add-con-cont value-font" style="color: #FF6000;">-￥{{order.addVipReductionMoney}}</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line" style="justify-content: flex-end;">
<view class="line-word">小计：</view> <view class="line-word title-font">小计：</view>
<view class="" style="color: #333;">￥<text <view class="value-font"><text style="font-weight: bold;">￥{{order.addMoney}}</text></view>
style="font-size: 35rpx;font-weight: bold;">{{order.addMoney}}</text></view>
</view> </view>
</view> </view>
@ -235,44 +238,41 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">订单费用：</view> <view class="line-word title-font">订单费用</view>
<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text>{{order.massageMoney}}</text></view> <view class="line-word-r value-font" v-if="order.oldMassageMoney==null">
<view class="line-word-r" v-else>￥<text>{{order.oldMassageMoney}}</text></view> <text style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
<view class="line-word-r value-font" v-else><text style="font-weight: bold;">￥{{order.oldMassageMoney}}</text></view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">出行费用：</view> <view class="line-word title-font">出行费用</view>
<view class="line-word-r" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view> <view class="line-word-r value-font">
<view class="line-word-r" v-else>-</view> <text style="font-weight: bold;">￥{{order.taxiMoney}}</text>
</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">优惠券：</view> <view class="line-word title-font">优惠券</view>
<view class="" style="color: #F93731;" v-if="order.couponMoney"> <view class="value-font" style="color: #FF6000;" v-if="order.couponMoney">
-￥<text style="font-size: 30rpx;font-weight: bold;"> -<text style="font-weight: bold;">￥{{order.couponMoney}}</text>
{{order.couponMoney}}
</text>
</view> </view>
<view class="" v-else>-</view> <view class="value-font" v-else>-</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">加钟费用：</view> <view class="line-word title-font">加钟费用</view>
<view class="line-word-r" > <view class="line-word-r value-font">
<text v-if="order.addMoney"> <text style="font-weight: bold;" v-if="order.addMoney">￥{{order.addMoney}}</text>
￥{{order.addMoney}} <text class="line-word-r value-font" v-else>-</text>
</text>
<text class="line-word-r" v-else>-</text>
</view> </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 class="line-word">合计：</view> <view class="line-word title-font">合计：</view>
<view class="line-word-r">￥ <view class="line-word-r value-font">
<text style="font-size: 35rpx;font-weight: bold;"> <text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
{{order.payMoneyTotal}} ￥{{order.payMoneyTotal}}
</text> </text>
</view> </view>
</view> </view>
<!-- <view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</view> -->
<view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
</view> </view>
<!-- 套餐 次卡 疗程 加钟信息 --> <!-- 套餐 次卡 疗程 加钟信息 -->
<view class="list-pay" v-else> <view class="list-pay" v-else>
@ -281,21 +281,20 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">订单编号</view> <view class="line-word title-font">订单编号</view>
<view class="flex align-center" @tap="copy(order.ordersNo)" <view class="flex align-center" @tap="copy(order.ordersNo)">
style="color: #333;font-size: 30rpx;"> <view class="value-font">{{order.ordersNo}}
<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>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">预约时间</view> <view class="line-word title-font">预约时间</view>
<view class="line-word-r">{{order.serveTime}}</view> <view class="line-word-r value-font">{{order.serveTime}}</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">下单时间</view> <view class="line-word title-font">下单时间</view>
<view class="flex line-word-r">{{order.createTime}}</view> <view class="flex line-word-r value-font">{{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">
@ -303,70 +302,63 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view> <view class="line-word title-font">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view>
<view class="line-word-r">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view> <view class="line-word-r value-font">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">项目名称</view> <view class="line-word title-font">项目名称</view>
<view class="line-word-r" v-if="order.oldEntryName==null">{{order.entryName}}</view> <view class="line-word-r value-font" v-if="order.oldEntryName==null">{{order.entryName}}</view>
<view class="line-word-r" v-else>{{order.oldEntryName}}</view> <view class="line-word-r value-font" v-else>{{order.oldEntryName}}</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">服务时长</view> <view class="line-word title-font">服务时长</view>
<view class="line-word-r" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view> <view class="line-word-r value-font" v-if="order.oldMassageDuration==null">{{order.duration}}分钟</view>
<view class="line-word-r" v-else>{{order.oldMassageDuration}}分钟</view> <view class="line-word-r value-font" v-else>{{order.oldMassageDuration}}分钟</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">项目价格</view> <view class="line-word title-font">项目价格</view>
<view class="line-word-r" v-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view> <view class="line-word-r value-font" v-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view>
<view class="line-word-r" v-else>￥{{order.oldMassagePrice}}</view> <view class="line-word-r value-font" v-else>￥{{order.oldMassagePrice}}</view>
</view> </view>
<view class="jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="jusitify-line"> <view class="value-font" style="font-weight: bold;">
<view class="line-word"> <text v-if="order.oldMassageMoney==null">
小计：
</view>
<view class="" style="color: #333;">
<text v-if="order.oldMassageMoney==null" style="font-size: 35rpx;font-weight: bold;">
￥{{order.massageMoney}} ￥{{order.massageMoney}}
</text> </text>
<text v-else style="font-size: 35rpx;font-weight: bold;"> <text v-else>
￥{{order.oldMassageMoney}} ￥{{order.oldMassageMoney}}
</text> </text>
</view> </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" v-if="order.tripWay" > <view class="jusitify-line" v-if="order.tripWay" >
<view class="line-word">出行方式</view> <view class="line-word title-font">出行方式</view>
<view class="line-word-r" v-if="order.tripWay == 1">公交</view> <view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="line-word-r" v-if="order.tripWay == 2">出租</view> <view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
<view class="line-word-r" v-if="order.tripWay == 3">免费</view> <view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
</view> </view>
<view class="jusitify-line" v-if="order.km"> <view class="jusitify-line" v-if="order.km">
<view class="line-word">全程距离</view> <view class="line-word title-font">全程距离</view>
<view class="line-word-r" >{{order.km}}km</view> <view class="line-word-r value-font" >{{order.km}}km</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">出行费用</view> <view class="line-word title-font">出行费用</view>
<view class="line-word-r" v-if="order.taxiMoney">￥{{order.taxiMoney}}</view> <view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
<view class="line-word-r" v-else>-</view>
</view> </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="jusitify-line" >
<view class="line-word">优惠券</view> <view class="line-word title-font">优惠券</view>
<view class="line-word" v-if="order.couponMoney">-￥{{order.couponMoney}}</view> <view class="line-word value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="" v-else>-</view> <view class="value-font" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
<view> <view>
@ -375,78 +367,71 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="jusitify-line" > <view class="jusitify-line" >
<view class="line-word">加钟项目</view> <view class="line-word title-font">加钟项目</view>
<view class="line-word-r">{{order.addEntryName}}</view> <view class="line-word-r value-font">{{order.addEntryName}}</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">加钟价格</view> <view class="line-word title-font">加钟价格</view>
<view class="line-word-r">￥{{order.addPriceMarkup}}</view> <view class="line-word-r value-font" style="color: #019c88;">￥{{order.addPriceMarkup}}</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">加钟时长</view> <view class="line-word title-font">加钟时长</view>
<view class="line-word-r">{{order.addTime}}分钟</view> <view class="line-word-r value-font">{{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 title-font">会员减免</view>
<view class="add-con-cont" >-￥{{order.addVipReductionMoney}}</view> <view class="add-con-cont value-font" style="color: #FF6000;">-￥{{order.addVipReductionMoney}}</view>
</view> </view>
<view class="jusitify-line" style="justify-content: flex-end;">
<view class="jusitify-line"> <view class="line-word title-font">小计：</view>
<view class="line-word">小计：</view> <view class="value-font"><text style="font-weight: bold;">￥{{order.addMoney}}</text></view>
<view class="" style="color: #333;">￥<text
style="font-size: 35rpx;font-weight: bold;">{{order.addMoney}}</text></view>
</view> </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="jusitify-line">
<view class="line-word">订单费用：</view> <view class="line-word title-font">订单费用：</view>
<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text>{{order.massageMoney}}</text></view> <view class="line-word-r value-font" v-if="order.oldMassageMoney==null">
<view class="line-word-r" v-else>￥<text>{{order.oldMassageMoney}}</text></view> <text style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
<view class="line-word-r value-font" v-else><text style="font-weight: bold;">￥{{order.oldMassageMoney}}</text></view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">出行费用：</view> <view class="line-word title-font">出行费用：</view>
<view class="line-word-r" v-if="order.taxiMoney">￥<text>{{order.taxiMoney}}</text></view> <view class="line-word-r value-font">
<view class="line-word-r" v-else>-</view> <text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">优惠券：</view> <view class="line-word title-font">优惠券：</view>
<view class="" style="color: #F93731;" v-if="order.couponMoney"> <view class="value-font" style="color: #FF6000;" v-if="order.couponMoney">
-￥<text > -<text style="font-weight: bold;">￥{{order.couponMoney}}</text>
{{order.couponMoney}}
</text>
</view> </view>
<view class="" v-else>-</view> <view class="value-font" v-else>-</view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">加钟费用：</view> <view class="line-word title-font">加钟费用：</view>
<view class="line-word-r" > <view class="line-word-r value-font" >
<text v-if="order.addMoney"> <text style="font-weight: bold;" v-if="order.addMoney">￥{{order.addMoney}}</text>
￥{{order.addMoney}} <text class="line-word-r value-font" v-else>-</text>
</text>
<text class="line-word-r" v-else>-</text>
</view> </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 class="line-word">合计：</view> <view class="line-word title-font">合计：</view>
<view class="line-word-r">￥ <view class="line-word-r value-font">
<text style="font-size: 35rpx;font-weight: bold;"> <text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
{{order.payMoneyTotal}} ￥{{order.payMoneyTotal}}
</text> </text>
</view> </view>
</view> </view>
<view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</view> <!-- <view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>-->
</view> </view>
</view> </view>
@ -1124,6 +1109,15 @@ export default {
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; // 两个小时的毫秒数
@ -1842,7 +1836,7 @@ export default {
padding: 0px 42px !important; padding: 0px 42px !important;
} }
/deep/.padding-bottom{ /deep/.padding-bottom{
padding-bottom: 50px; padding-bottom: 0px;
} }
/deep/.u-drawer{ /deep/.u-drawer{
@ -2020,6 +2014,9 @@ export default {
height:64rpx; height:64rpx;
font-size: 28rpx; font-size: 28rpx;
} }
/deep/.u-size-default{
margin: 5px 0px 0px 0px;
}
.showbtn-line{ .showbtn-line{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -2089,7 +2086,8 @@ export default {
} }
.zhuangtai{ .zhuangtai{
color: #029D88; color: #029D88;
font-size: 30rpx; font-weight: bold;
font-size: 32rpx;
} }
.head-title-right{ .head-title-right{
display: flex; display: flex;
@ -2098,14 +2096,6 @@ export default {
justify-content: space-between; justify-content: space-between;
font-weight: bold; font-weight: bold;
} }
.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-weight: bold;
font-size: 25rpx; font-size: 25rpx;
@ -2171,8 +2161,9 @@ export default {
padding: 7px; padding: 7px;
} }
.list-pay{ .list-pay{
width: 100%; width: 100%;
padding: 0 32rpx 20rpx 32rpx ; padding: 10rpx 29rpx;
margin-bottom: 40rpx;
} }
.pay-ding-top{ .pay-ding-top{
width: 100%; width: 100%;
@ -2211,14 +2202,9 @@ export default {
margin-left: 5px; margin-left: 5px;
} }
.money-pay-zhen span{ .money-pay-zhen span{
color: #FF6000; color: #FF6000;
} font-size: 32rpx;
.money-pay-zhen span:nth-child(1){ font-weight: bold;
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 32rpx;
font-weight: bold;
} }
.money-pay-zhen{ .money-pay-zhen{
display: flex; display: flex;
@ -2459,7 +2445,7 @@ export default {
} }
.justify-title{ .justify-title{
font-weight: bold; font-weight: bold;
font-size: 16px; font-size: 32rpx;
color: #333; color: #333;
} }
.justify-title-nav-bor{ .justify-title-nav-bor{
@ -2470,4 +2456,23 @@ export default {
bottom: 0; bottom: 0;
background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7)); background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7));
} }
.head-title{
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.title-font{
font-size: 30rpx;
color: #666666;
}
.value-font{
font-size: 30rpx;
color: #333333;
}
.add-content{
background: #fff;
padding: 30rpx;
border-radius: 24rpx;
margin-top: 24rpx;
}
</style> </style>

150
my/order/payModify.vue
View File

@ -14,16 +14,21 @@
<view class="margin-right-xs text-df u-skeleton-fillet head-title"> <view class="margin-right-xs text-df u-skeleton-fillet head-title">
{{orderXm.title}} {{orderXm.title}}
</view> </view>
</view>
<view class="flex align-center">
<view style="justify-content: space-between;">
<text class="title-font">服务时长：</text><text class="value-font">{{orderXm.duration}}分钟</text>
</view>
</view> </view>
<view class="flex align-center"> <view class="flex align-center">
<view style="width: 100%;"> <view style="width: 100%;">
<view class="money-pay"> <view class="money-pay">
<view class="money-pay-zhen"> <view class="money-pay-zhen">
<span>￥</span> <text class="title-font">项目价格：</text>
<span v-if="jishiName!=null||jishiName==''"> <span>￥</span>
{{technicianRate}} <span v-if="jishiName!=null||jishiName==''">
</span> {{technicianRate}}
</span>
<span v-else>{{orderXm.price}}</span> <span v-else>{{orderXm.price}}</span>
</view> </view>
<view v-if="orderXm.qyType!='1'"> <view v-if="orderXm.qyType!='1'">
@ -42,30 +47,30 @@
<view v-if="!detailaddress">请选择地址</view> <view v-if="!detailaddress">请选择地址</view>
<view class="margin-right-xs"> <view class="margin-right-xs">
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">联系人</view> <view class="line-word title-font">客户姓名</view>
<view class="line-word-r" > <view class="line-word-r value-font" >
<text>{{name}}</text> <text>{{name}}</text>
<text class="xuanzhe" @click="getAddressList()">修改</text> <text class="xuanzhe" @click="getAddressList()">更换</text>
</view> </view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">手机号码</view> <view class="line-word title-font">联系方式</view>
<view class="line-word-r"> <view class="line-word-r value-font">
{{mobile}} {{mobile}}
</view> </view>
</view> </view>
<view class="jusitify-line" style="align-items: center;"> <view class="jusitify-line" style="align-items: center;">
<view class="line-word">详细地址</view> <view class="line-word title-font">服务地址</view>
<view class="line-word-r" style="width: 73%; text-align: right; "> <view class="line-word-r value-font" style="width: 73%; text-align: right; ">
<span> <span>
{{province}}/{{city}}/{{district}}/{{detailaddress}} {{province}}/{{city}}/{{district}}/{{detailaddress}}
</span> </span>
</view> </view>
</view> </view>
<view class="jusitify-line" v-if="order.remark"> <view class="jusitify-line" v-if="order.remark">
<view class="line-word">备注内容</view> <view class="line-word title-font">备注内容</view>
<view class="flex"> <view class="flex">
<view class=""> <view class="value-font">
{{order.remark}} {{order.remark}}
</view> </view>
</view> </view>
@ -74,67 +79,67 @@
</view> </view>
<view class="ske-padding margin-top-sm header-view"> <view class="ske-padding margin-top-sm header-view">
<view class="jusitify-line" @click="liliaoshi"> <view class="jusitify-line" @click="liliaoshi">
<view class="line-word" > <view class="line-word title-font" >
<span >技师</span>
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span> <span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
<span >技师</span>
</view> </view>
<view > <view >
<span class="line-word-r" v-if="jishiName">{{jishiName.artificerName}}</span> <span class="line-word-r value-font" v-if="jishiName">{{jishiName.artificerName}}</span>
<span class="line-word-r" v-else>选择不同技师价格可能不一样哦~</span> <span class="line-word-r value-font" v-else>选择不同等级的技师价格不同哦~</span>
<span class="view-more"></span> <span class="view-more"></span>
</view> </view>
</view> </view>
<view class="jusitify-line" v-if="jishiName"> <view class="jusitify-line" v-if="jishiName">
<view class="line-word" > <view class="line-word title-font" >
<span >项目原价</span> <span >项目原价</span>
</view> </view>
<view > <view >
<span class="line-word-r">￥{{orderXm.price}}</span> <span class="line-word-r value-font">￥{{orderXm.price}}</span>
</view> </view>
</view> </view>
<view class="jusitify-line" v-if="jishiName"> <view class="jusitify-line" v-if="jishiName">
<view class="line-word" > <view class="line-word title-font" >
<span>{{jishiName.technicianTypeName}}</span> <span>{{jishiName.technicianTypeName}}</span>
<span >价格</span> <span >价格</span>
</view> </view>
<view > <view >
<span class="line-word-r" style="color: #FF6000">￥{{technicianRate}}</span> <span class="line-word-r value-font" style="color: #019c88">￥{{technicianRate}}</span>
</view> </view>
</view> </view>
<view class="jusitify-line" @click="youhuijuan"> <view class="jusitify-line" @click="youhuijuan">
<view class="line-word">平台优惠劵</view> <view class="line-word title-font">优惠券</view>
<view class="header-bottom-money-zhen"> <view class="header-bottom-money-zhen">
<view v-if="couponDataList" class="" style="margin-right: 5px;"> <view v-if="couponDataList" class="" style="margin-right: 5px;">
<span>-￥{{couponDataList}}</span> <span>-￥{{couponDataList}}</span>
</view> </view>
<span v-else>选择优惠劵</span> <span v-else>选择优惠券</span>
<span class="view-more"></span> <span class="view-more"></span>
</view> </view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">服务时间</view> <view class="line-word title-font">服务时间</view>
<!-- <view class="fuwu-time-view" @change="changeLog"> <!-- <view class="fuwu-time-view" @change="changeLog">
<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker> <uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image> <image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
</view> --> </view> -->
<view class="flex align-center justify-between" style="margin-top: 15rpx;"> <view class="flex align-center justify-between value-font" style="margin-top: 15rpx;">
<view class="flex justify-between margin-tb-sm" @click="openData()"> <view class="flex justify-between margin-tb-sm" @click="openData()">
<view v-if="startTime">{{startTime}}</view> <view v-if="startTime">{{startTime}}</view>
<view class="line-word-r" v-else>请选择预约时间<span class="view-more"></span></view> <view class="line-word-r" v-else>选择预约时间<span class="view-more"></span></view>
<!---<u-icon name="arrow-right" color="#999999"></u-icon>--> <!---<u-icon name="arrow-right" color="#999999"></u-icon>-->
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="margin-top-xl pay-ding"> <view class="margin-top-xl pay-ding">
<view class="d-title">备注</view> <view class="d-title title-font">备注</view>
<view class="list-pay"> <view class="list-pay">
<view class="textarea-pay-list"> <view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea> <textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -143,8 +148,8 @@
<view class="push-button"> <view class="push-button">
<view class="pay_btn" @click="openpay()">去支付</view> <view class="pay_btn" @click="openpay()">去支付</view>
</view> </view>
</view> </view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> --> <!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
<u-popup v-model="showorder" mode="bottom" :closeable="closeable"> <u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@ -196,7 +201,7 @@
立即支付 立即支付
</u-button> </u-button>
</view> </view>
</view> </view>
</u-popup> </u-popup>
<!-- 预约弹窗 --> <!-- 预约弹窗 -->
@ -243,7 +248,7 @@
// #ifndef MP-WEIXIN // #ifndef MP-WEIXIN
width: '310upx', width: '310upx',
// #endif // #endif
margin: '0 10upx', margin: '0 10upx',
}, },
customStyle2: { customStyle2: {
@ -255,7 +260,7 @@
// #ifndef MP-WEIXIN // #ifndef MP-WEIXIN
width: '310upx', width: '310upx',
// #endif // #endif
margin: '0 10upx', margin: '0 10upx',
}, },
id: '', id: '',
@ -314,16 +319,16 @@
let fullDate = `${month}-${days}` let fullDate = `${month}-${days}`
let Time = year + '-' + fullDate let Time = year + '-' + fullDate
this.yearsDate = Time; this.yearsDate = Time;
this.jishiName=this.$queue.getData('getJishi'); this.jishiName=this.$queue.getData('getJishi');
this.couponId=this.$queue.getData('youhui'); this.couponId=this.$queue.getData('youhui');
if(this.couponId){ if(this.couponId){
this.youhuiF(this.couponId) this.youhuiF(this.couponId)
} }
this.orderXm=this.$queue.getData('xiangmu');//上一个页面带过来的全部数据 this.orderXm=this.$queue.getData('xiangmu');//上一个页面带过来的全部数据
console.log("this.orderXm",this.orderXm) console.log("this.orderXm",this.orderXm)
this.ordersId = this.$queue.getData('ordersId'); this.ordersId = this.$queue.getData('ordersId');
this.userPackageDetailId = this.$queue.getData('userPackageDetailId'); this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
this.youhui() this.youhui()
@ -336,7 +341,7 @@
this.technicianRate=Math.ceil((this.orderXm.price*this.number)+(this.orderXm.price*this.number*(this.jishiName.technicianTypeRate/100))) this.technicianRate=Math.ceil((this.orderXm.price*this.number)+(this.orderXm.price*this.number*(this.jishiName.technicianTypeRate/100)))
} }
}, },
onShow() { onShow() {
this.addressId = this.$queue.getData('EditAddress'); this.addressId = this.$queue.getData('EditAddress');
if (this.addressId) { if (this.addressId) {
@ -447,7 +452,7 @@
// this.showpay = true; // this.showpay = true;
this.goOrder() this.goOrder()
} }
}, },
textareaChange(e){//备注 textareaChange(e){//备注
this.textareaData=e.detail.value this.textareaData=e.detail.value
@ -456,7 +461,7 @@
checkboxChange(e){ checkboxChange(e){
this.couponId=e.detail.value.join(",") this.couponId=e.detail.value.join(",")
}, },
youhuiF(couponId){//获取优惠卷 youhuiF(couponId){//获取优惠券
let that = this; let that = this;
let data = { let data = {
page: 1, page: 1,
@ -471,10 +476,10 @@
} else { } else {
that.$queue.showToast(res.msg) that.$queue.showToast(res.msg)
} }
}); });
}, },
youhui(){//获取优惠卷 youhui(){//获取优惠券
let that = this let that = this
let data = { let data = {
status: 0, status: 0,
@ -487,7 +492,7 @@
} else { } else {
that.$queue.showToast(res.msg) that.$queue.showToast(res.msg)
} }
}); });
}, },
liliaoshi(){ liliaoshi(){
@ -560,7 +565,7 @@
this.province = res.data.province this.province = res.data.province
this.city = res.data.city this.city = res.data.city
this.district = res.data.district this.district = res.data.district
// this.getChuXing(); // this.getChuXing();
} }
// uni.hideLoading(); // uni.hideLoading();
@ -570,14 +575,14 @@
url: '../address/address?id=' + 2 url: '../address/address?id=' + 2
}) })
} }
}, },
changeLog(e){//服务时间 changeLog(e){//服务时间
console.log("11111",e) console.log("11111",e)
this.single=e; this.single=e;
}, },
goChat() { goChat() {
let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信
let kefuPhone = this.$queue.getData('kefuPhone'); let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) { if (uni.getStorageSync('token')) {
if (kefu == 1) { if (kefu == 1) {
@ -685,7 +690,7 @@
} else { } else {
that.$queue.showToast(res.msg) that.$queue.showToast(res.msg)
} }
}); });
}, },
payJZ() { payJZ() {
@ -908,7 +913,7 @@
bindGps(latitude, longitude, name, detailsadd) { bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd) console.log(latitude, longitude, name, detailsadd)
uni.openLocation({ uni.openLocation({
latitude: latitude - 0, //要去的纬度-地址 latitude: latitude - 0, //要去的纬度-地址
longitude: longitude - 0, //要去的经度-地址 longitude: longitude - 0, //要去的经度-地址
name: name, //地址名称 name: name, //地址名称
address: detailsadd, //详细地址名称 address: detailsadd, //详细地址名称
@ -1002,7 +1007,7 @@
} }
}); });
}, },
// 支付订单 // 支付订单
pay() { pay() {
let that = this let that = this
@ -1320,12 +1325,12 @@
} }
}) })
}, },
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.jusitify-line{ .jusitify-line{
height: 78rpx; height: 78rpx;
padding: 20rpx 0; padding: 20rpx 0;
@ -1358,12 +1363,7 @@
} }
.money-pay-zhen span{ .money-pay-zhen span{
color: #FF6000; color: #FF6000;
} font-size: 32rpx;
.money-pay-zhen span:nth-child(1){
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 31.25rpx;
font-weight: bold; font-weight: bold;
} }
.money-pay-zhen{ .money-pay-zhen{
@ -1385,7 +1385,7 @@
} }
.pay-title{ .pay-title{
font-weight: bold; font-weight: bold;
font-size: 30rpx; font-size: 32rpx;
color: #333333; color: #333333;
margin-bottom: 8px; margin-bottom: 8px;
} }
@ -1395,7 +1395,7 @@
border-right:1px solid; border-right:1px solid;
width: 15rpx; width: 15rpx;
height: 15rpx; height: 15rpx;
border-color:#999; border-color:#333;
transform:rotate(45deg); transform:rotate(45deg);
margin-top: 14rpx; margin-top: 14rpx;
} }
@ -1407,14 +1407,14 @@
padding:20rpx 35rpx; padding:20rpx 35rpx;
} }
.header-bottom-money-zhen span{ .header-bottom-money-zhen span{
color: #F95900 !important; color: #FF6000 !important;
font-size: 28rpx !important; font-size: 30rpx !important;
} }
.header-bottom-money-zhen{ .header-bottom-money-zhen{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: baseline; align-items: baseline;
} }
/deep/uni-checkbox .uni-checkbox-input{ /deep/uni-checkbox .uni-checkbox-input{
width: 26px; width: 26px;
@ -1592,7 +1592,7 @@
line-height: 25px; line-height: 25px;
width: 50px; width: 50px;
text-align: center; text-align: center;
font-size: 13px; font-size: 14px;
padding:6rpx 16rpx padding:6rpx 16rpx
} }
.header-view-data{ .header-view-data{
@ -1787,7 +1787,7 @@
border-radius: 14rpx; border-radius: 14rpx;
padding: 7px; padding: 7px;
} }
.pay-ding{ .pay-ding{
padding-bottom: 15px; padding-bottom: 15px;
} }
@ -1801,7 +1801,7 @@
width: 49rpx; width: 49rpx;
height: 44rpx; height: 44rpx;
} }
.d-touxiang{ .d-touxiang{
width: 46rpx; width: 46rpx;
height: 46rpx; height: 46rpx;
@ -1835,7 +1835,7 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.content{ .content{
padding-top: 1px; padding-top: 1px;
width: 100%; width: 100%;
@ -2043,6 +2043,16 @@
align-items: center; align-items: center;
} }
.head-title{ .head-title{
font-size: 30rpx; font-weight: bold;
font-size: 32rpx;
color: #333333;
} }
</style> .title-font{
font-size: 30rpx;
color: #666666;
}
.value-font{
font-size: 30rpx;
color: #333333;
}
</style>

618
my/order/payShengji.vue
View File

File diff suppressed because it is too large Load Diff

270
my/order/payding.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" 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;">
@ -10,7 +10,6 @@
<view class="pay-title">服务项目</view> <view class="pay-title">服务项目</view>
<view class="flex justify-around"> <view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;"> <view class="" style="width: 160upx;height: 160upx;">
<image v-if="order.userPackageDetailId==null" :src="order.ordersMassageList[0].massageType.massageImg" <image v-if="order.userPackageDetailId==null" :src="order.ordersMassageList[0].massageType.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image> style="width: 100%;height: 100%;border-radius: 19upx;"></image>
<image v-else :src="order.ordersMassageList[0].userPackageDetail.massageImg" <image v-else :src="order.ordersMassageList[0].userPackageDetail.massageImg"
@ -18,7 +17,7 @@
</view> </view>
<view class="u-flex-1 margin-left-sm"> <view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right"> <view class="flex head-title-right">
<view class="head-text"> <view class="head-title">
{{order.entryName}} {{order.entryName}}
</view> </view>
<view class="zhuangtai"> <view class="zhuangtai">
@ -36,18 +35,20 @@
</view> </view>
<view class="flex align-center"> <view class="flex align-center">
<view style="width: 100%;"> <view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;"> <view class="flex justify-between margin-tb-sm">
<view style="justify-content: space-between;"> <view style="justify-content: space-between;">
{{order.duration}}分钟 <text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text>
</view> </view>
</view> </view>
<view class="money-pay" style="justify-content: space-between;"> <view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen" v-if="order.userPackageDetailId==null"> <view class="money-pay-zhen" v-if="order.userPackageDetailId==null">
<text class="title-font">项目价格：</text>
<span>￥</span> <span>￥</span>
<span>{{order.priceMarkup}} </span> <span>{{order.priceMarkup}} </span>
</view> </view>
<view class="money-pay-zhen" v-else> <view class="money-pay-zhen" v-else>
<text class="title-font">项目价格：</text>
<span>￥</span> <span>￥</span>
<span>{{order.massagePrice}} </span> <span>{{order.massagePrice}} </span>
</view> </view>
@ -69,20 +70,20 @@
<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;"> <view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
<view class="" v-if="order.artificer"> <view class="" v-if="order.artificer">
<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 title-font">客户姓名</view>
<view class="add-con-cont"> <view class="add-con-cont value-font">
{{order.userName}} {{order.userName}}
</view> </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 title-font">联系方式</view>
<view class="add-con-cont"> <view class="add-con-cont value-font">
{{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"> <view class="serverAddress">
<view class="add-con-title">服务地址</view> <view class="add-con-title title-font">服务地址</view>
<view style="color: #666;margin-top: 8rpx;font-size: 30rpx;width: 73%; text-align: right;">{{order.address}}</view> <view class=" value-font" style=";width: 73%; text-align: right;">{{order.address}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -119,20 +120,20 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></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 title-font">订单编号</view>
<view class="flex align-center" @tap="copy(order.ordersNo)" <view class="flex align-center" @tap="copy(order.ordersNo)">
style="color: #333;font-size: 30rpx;"> <view class="value-font">{{order.ordersNo}}
<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>
<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 title-font">预约时间</view>
<view class="add-con-cont">{{order.serveTime}}</view> <view class="add-con-cont value-font">{{order.serveTime}}</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 title-font">下单时间</view>
<view class="add-con-cont">{{order.createTime}}</view> <view class="add-con-cont value-font">{{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 ">
@ -140,50 +141,50 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></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 title-font">项目名称</view>
<view class="add-con-cont">{{order.entryName}}</view> <view class="add-con-cont value-font">{{order.entryName}}</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 title-font">服务时长</view>
<view class="add-con-cont">{{order.duration}}分钟</view> <view class="add-con-cont value-font">{{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 title-font">项目原价</view>
<view class="add-con-cont">￥{{order.massagePrice}}</view> <view class="add-con-cont value-font">￥{{order.massagePrice}}</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="add-con-title">{{order.technicianTypeName}}价格</view> <view class="add-con-title title-font">{{order.technicianTypeName}}价格</view>
<view class="add-con-cont" style="color: #F93731;">￥{{order.priceMarkup}}</view> <view class="add-con-cont value-font" style="color: #019c88;">￥{{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 title-font">会员减免</view>
<view class="add-con-cont">-￥{{order.vipReductionMoney}}</view> <view class="add-con-cont value-font" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
</view> </view>
<view class="flex align-center" style="justify-content: flex-end;"> <view class="flex justify-between add-lin" style="justify-content: flex-end;">
<view class="add-con-cont">小计：</view> <view class="add-con-title title-font">小计：</view>
<view class="add-con-cont" style=" font-weight: bold;">￥<text>{{order.massageMoney}}</text></view> <view class="add-con-cont value-font" style="font-weight: bold;">￥<text>{{order.massageMoney}}</text></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="flex justify-between add-lin" v-if="order.tripWay"> <view class="flex justify-between add-lin" v-if="order.tripWay">
<view class="add-con-title">出行方式</view> <view class="add-con-title title-font">出行方式</view>
<view class="add-con-cont" v-if="order.tripWay == 1">公交</view> <view class="add-con-cont value-font" v-if="order.tripWay == 1">公交</view>
<view class="add-con-cont" v-if="order.tripWay == 2">出租</view> <view class="add-con-cont value-font" v-if="order.tripWay == 2">出租</view>
<view class="add-con-cont" v-if="order.tripWay == 3">免费</view> <view class="add-con-cont value-font" v-if="order.tripWay == 3">免费</view>
</view> </view>
<view class="flex justify-between add-lin" v-if="order.km"> <view class="flex justify-between add-lin" v-if="order.km">
<view class="add-con-title">全程距离</view> <view class="add-con-title title-font">全程距离</view>
<view class="add-con-cont">{{order.km}}km</view> <view class="add-con-cont value-font">{{order.km}}km</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 title-font">出行费用</view>
<view class="add-con-cont">￥{{order.taxiMoney}}</view> <view class="add-con-cont value-font">￥{{order.taxiMoney}}</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,14 +192,14 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></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 title-font">优惠券</view>
<view class="add-con-cont" style="color: rgb(249, 55, 49); font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view> <view class="add-con-cont value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="add-con-cont" v-else>-</view> <view class="add-con-cont value-font" v-else>-</view>
</view> </view>
<view class="textarea-pay-list" v-if="order.remark"> <view class="textarea-pay-list" v-if="order.remark">
<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view> <view calss="title-font">备注内容</view>
<view class="beizhu">{{order.remark}}</view> <view class="beizhu value-font">{{order.remark}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -209,41 +210,41 @@
</view> </view>
<view class="fei-view"> <view class="fei-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 title-font">订单费用</view>
<view class="add-con-cont">￥ <view class="add-con-cont value-font">
<text style="font-weight: bold;">{{order.massageMoney}}</text> <text style="font-weight: bold;">￥{{order.massageMoney}}</text>
</view> </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 title-font">出行费用</view>
<view class="add-con-cont">￥<text style="font-weight: bold;">{{order.taxiMoney}}</text></view> <view class="add-con-cont value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></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 title-font">优惠券</view>
<view class="add-con-cont" style="color: #F93731;" v-if="order.couponMoney"> <view class="add-con-cont value-font" style="color: #FF6000;" 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="value-font" v-else>-</view>
</view> </view>
<view class="fei-view-list-z"> <view class="fei-view-list-z" style="justify-content: flex-end;">
<span>总金额</span> <span class="title-font">合计：</span>
<span style="color: #FF3939;font-weight: bold;font-size: 32rpx;">￥{{order.payMoneyTotal}}</span> <span class="value-font" style="color: #FF1200;font-weight: bold;font-size: 40rpx;">￥{{order.payMoneyTotal}}</span>
</view> </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">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false" <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false" class="btns"
v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单 v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
</u-button> </u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false" <u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
v-if="order.status == 1" v-if="order.status == 1"
class="dingshi">立即支付 class="btns">立即支付
</u-button> </u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="dingshi">联系客服</u-button>
</view> </view>
</view> </view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
<!-- 支付方式 --> <!-- 支付方式 -->
@ -299,7 +300,7 @@
// #ifndef MP-WEIXIN // #ifndef MP-WEIXIN
width: '190upx', width: '190upx',
// #endif // #endif
margin: '0 10upx', margin: '0 10upx',
}, },
customStyle2: { customStyle2: {
@ -311,7 +312,7 @@
// #ifndef MP-WEIXIN // #ifndef MP-WEIXIN
width: '190upx', width: '190upx',
// #endif // #endif
margin: '0 10upx', margin: '0 10upx',
}, },
id: '', id: '',
@ -418,7 +419,7 @@
uni.hideLoading(); uni.hideLoading();
that.$queue.showToast(res.msg); that.$queue.showToast(res.msg);
} }
}) })
}, },
saveJZ(classifyId) { saveJZ(classifyId) {
@ -449,17 +450,17 @@
uni.hideLoading(); uni.hideLoading();
that.$queue.showToast(res.msg); that.$queue.showToast(res.msg);
} }
}) })
}, },
getTimeStampWithoutSeconds(date) { getTimeStampWithoutSeconds(date) {
// 将日期转换为标准的UTC时间 // 将日期转换为标准的UTC时间
var utcDate = new Date( var utcDate = new Date(
date.getUTCFullYear(), date.getUTCFullYear(),
date.getUTCMonth(), date.getUTCMonth(),
date.getUTCDate(), date.getUTCDate(),
date.getUTCHours(), date.getUTCHours(),
date.getUTCMinutes(), date.getUTCMinutes(),
0); 0);
// 返回不含秒的时间戳 // 返回不含秒的时间戳
return utcDate.getTime(); return utcDate.getTime();
@ -506,7 +507,7 @@
}, },
toggleQ(type,item) {//确认拒单 弹出框 toggleQ(type,item) {//确认拒单 弹出框
this.qurenJd=item; this.qurenJd=item;
this.type = type this.type = type
// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性 // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
this.$refs.popupQ.open(type) this.$refs.popupQ.open(type)
@ -532,7 +533,7 @@
title:'操作失败！' title:'操作失败！'
}) })
} }
}).catch(() => { }).catch(() => {
this.getOrder() this.getOrder()
//联网失败, 结束加载 //联网失败, 结束加载
@ -580,12 +581,12 @@
title:'操作失败！' title:'操作失败！'
}) })
} }
}).catch(() => { }).catch(() => {
//联网失败, 结束加载 //联网失败, 结束加载
that.getOrder() that.getOrder()
}); });
}, },
fail: function(e) { fail: function(e) {
that.getOrder() that.getOrder()
@ -599,14 +600,14 @@
// #endif // #endif
} }
}); });
}else{ }else{
uni.showToast({ uni.showToast({
icon:'error', icon:'error',
title:'请输入提前结束原因！' title:'请输入提前结束原因！'
}) })
} }
}, },
toggle(type,item) {//提前结束 弹出框 toggle(type,item) {//提前结束 弹出框
this.tiqianData=item; this.tiqianData=item;
@ -614,12 +615,12 @@
// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性 // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
this.$refs.popup.open(type); this.$refs.popup.open(type);
}, },
gengBtn(){ gengBtn(){
this.btnShow=!this.btnShow this.btnShow=!this.btnShow
}, },
goChat() { goChat() {
let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信
let kefuPhone = this.$queue.getData('kefuPhone'); let kefuPhone = this.$queue.getData('kefuPhone');
if (uni.getStorageSync('token')) { if (uni.getStorageSync('token')) {
if (kefu == 1) { if (kefu == 1) {
@ -717,13 +718,13 @@
} else { } else {
that.$queue.showToast(res.msg) that.$queue.showToast(res.msg)
} }
}); });
}, },
payJZ() { payJZ() {
let that = this; let that = this;
if (that.openWay == 1) { //零钱支付 if (that.openWay == 1) { //零钱支付
uni.showModal({ uni.showModal({
title: '付款提示', title: '付款提示',
content: '确认支付' + that.order.sumMoney + '元吗?', content: '确认支付' + that.order.sumMoney + '元吗?',
@ -900,7 +901,7 @@
} }
}, },
//支付选择 //支付选择
selectWay: function(item) { selectWay: function(item) {
this.openWay = item.id; this.openWay = item.id;
@ -929,7 +930,7 @@
bindGps(latitude, longitude, name, detailsadd) { bindGps(latitude, longitude, name, detailsadd) {
console.log(latitude, longitude, name, detailsadd) console.log(latitude, longitude, name, detailsadd)
uni.openLocation({ uni.openLocation({
latitude: latitude - 0, //要去的纬度-地址 latitude: latitude - 0, //要去的纬度-地址
longitude: longitude - 0, //要去的经度-地址 longitude: longitude - 0, //要去的经度-地址
name: name, //地址名称 name: name, //地址名称
address: detailsadd, //详细地址名称 address: detailsadd, //详细地址名称
@ -972,7 +973,7 @@
url: e url: e
}) })
}, },
delOrder(e) { delOrder(e) {
let that = this let that = this
uni.showModal({ uni.showModal({
@ -1072,7 +1073,7 @@
}) })
that.getOrder() that.getOrder()
// this.$queue.showToast('支付成功'); // this.$queue.showToast('支付成功');
uni.switchTab({ uni.switchTab({
url:'/pages/order/index' url:'/pages/order/index'
}) })
@ -1089,7 +1090,7 @@
} }
}); });
// #endif // #endif
// #ifdef H5 // #ifdef H5
let ua = navigator.userAgent.toLowerCase(); let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) { if (ua.indexOf('micromessenger') != -1) {
@ -1107,7 +1108,7 @@
url:'/pages/order/index' url:'/pages/order/index'
}) })
that.callPay(rea.data); that.callPay(rea.data);
} else { } else {
uni.showToast({ uni.showToast({
title: rea.msg, title: rea.msg,
@ -1128,7 +1129,7 @@
// const url = '&redirect_url=' + callBack + 'my/order/pay'; // const url = '&redirect_url=' + callBack + 'my/order/pay';
// window.location = rea.mweb_url + url // window.location = rea.mweb_url + url
that.showpay = false; that.showpay = false;
if (rea.code == 0) { if (rea.code == 0) {
uni.showToast({ uni.showToast({
title: '支付成功' title: '支付成功'
@ -1141,7 +1142,7 @@
const callBack = hostUrl[0] + "//" + hostUrl[2] + "/"; const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
const url = '&redirect_url=' + callBack + 'my/order/pay'; const url = '&redirect_url=' + callBack + 'my/order/pay';
window.location = rea.data.mweb_url + url window.location = rea.data.mweb_url + url
} else { } else {
uni.showToast({ uni.showToast({
title: rea.msg, title: rea.msg,
@ -1150,9 +1151,9 @@
} }
}); });
} }
// #endif // #endif
// #ifdef APP // #ifdef APP
let data = { let data = {
ordersId: that.order.ordersId, ordersId: that.order.ordersId,
@ -1169,7 +1170,7 @@
url:'/pages/order/index' url:'/pages/order/index'
}) })
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data)); that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
}else{ }else{
uni.showToast({ uni.showToast({
icon:'error', icon:'error',
@ -1197,10 +1198,10 @@
div.innerHTML = rea.data //此处form就是后台返回接收到的数据 div.innerHTML = rea.data //此处form就是后台返回接收到的数据
document.body.appendChild(div) document.body.appendChild(div)
document.forms[0].submit() document.forms[0].submit()
}); });
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
let data = { let data = {
ordersId: that.order.ordersId, ordersId: that.order.ordersId,
@ -1218,15 +1219,15 @@
}); });
// #endif // #endif
} }
} else if (re.cancel) { } else if (re.cancel) {
uni.hideLoading(); uni.hideLoading();
console.log('用户点击取消'); console.log('用户点击取消');
} }
} }
}) })
}, },
callPay: function(response) { callPay: function(response) {
if (typeof WeixinJSBridge === "undefined") { if (typeof WeixinJSBridge === "undefined") {
@ -1322,7 +1323,7 @@
}, },
// 取消订单待确认 // 取消订单待确认
cancelOrder(e) { cancelOrder(e) {
let that = this let that = this
uni.showModal({ uni.showModal({
title: '温馨提示', title: '温馨提示',
@ -1334,7 +1335,7 @@
} }
that.$queue.showLoading('提交中...') that.$queue.showLoading('提交中...')
that.cancelOrders(data) that.cancelOrders(data)
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
} }
@ -1481,7 +1482,7 @@
font-size: 33rpx; font-size: 33rpx;
color: #333333; color: #333333;
} }
.xiangmu-cont-top{ .xiangmu-cont-top{
width: 100%; width: 100%;
display: flex; display: flex;
@ -1511,7 +1512,7 @@
align-items: center; align-items: center;
padding: 10px; padding: 10px;
} }
.popup-mian-btn span:nth-child(1){ .popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970); background: linear-gradient(90deg, #FE912E, #FF9970);
} }
@ -1579,10 +1580,12 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
/deep/.btns{ /deep/.btns{
background: #019C88 !important; color: #019C88 !important;
color: #fff !important; margin-left: 10rpx !important;
} height:64rpx;
font-size: 28rpx;
}
/deep/.u-size-default{ /deep/.u-size-default{
margin: 5px 0px 0px 0px; margin: 5px 0px 0px 0px;
} }
@ -1613,16 +1616,17 @@
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
}
}
.dingshi{ .dingshi{
background: #ffffff; background: #ffffff;
font-size: 28rpx;
height:64rpx;
} }
.zhuangtai{ .zhuangtai{
color: #029D88; color: #029D88;
font-weight: bold; font-weight: bold;
font-size: 32rpx;
} }
.head-title-right{ .head-title-right{
display: flex; display: flex;
@ -1630,19 +1634,11 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.head-title{
margin-top: -2px;display: inline-block;
width: 300rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.fei-view-list span,.fei-view-list-z span{ .fei-view-list span,.fei-view-list-z span{
font-size: 30rpx; font-size: 30rpx;
} }
.fei-view-list-z{ .fei-view-list-z{
height: 65rpx; height: 65rpx;
border-top: 1px solid #f3f3f3;
padding-top: 20rpx; padding-top: 20rpx;
} }
.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){
@ -1741,12 +1737,7 @@
} }
.money-pay-zhen span{ .money-pay-zhen span{
color: #FF6000; color: #FF6000;
} font-size: 32rpx;
.money-pay-zhen span:nth-child(1){
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 31.25rpx;
font-weight: bold; font-weight: bold;
} }
.money-pay-zhen{ .money-pay-zhen{
@ -1775,7 +1766,7 @@
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
margin-bottom: 20rpx; margin-bottom: 8px;
} }
page { page {
background: #f7f7f7; background: #f7f7f7;
@ -2015,4 +2006,17 @@
border-bottom: 1px #f4f4f4 solid; border-bottom: 1px #f4f4f4 solid;
margin: 15px 0; margin: 15px 0;
} }
</style> .head-title{
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.title-font{
font-size: 30rpx;
color: #666666;
}
.value-font{
font-size: 30rpx;
color: #333333;
}
</style>

95
pages/order/index.vue
View File

@ -29,7 +29,7 @@
<view v-if="item.status ==8"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-i">技师到达</span></view> <view v-if="item.status ==8"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-i">技师到达</span></view>
<view v-if="item.status ==9"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-g">待确认</span></view> <view v-if="item.status ==9"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-g">待确认</span></view>
<view v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">待补单</span></view> <view v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">待补单</span></view>
<!-- <view class="u-tips-color">{{item.createTime}}</view> --> <!-- <view class="u-tips-color">{{item.createTime}}</view> -->
</view> </view>
<view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view> <view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view>
@ -43,19 +43,18 @@
<view class="u-flex-1" style="margin-left: 20rpx;"> <view class="u-flex-1" style="margin-left: 20rpx;">
<view class="text-bold u-line-1" style="width: 560rpx;"> <view class="text-bold u-line-1" style="width: 560rpx;">
<view class=" text-lg " <view class=" text-lg "
style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"> style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
{{item.ordersMassageList[0].massageType?item.ordersMassageList[0].massageType.title:item.ordersMassageList[0].userPackageDetail.title}} {{item.ordersMassageList[0].massageType?item.ordersMassageList[0].massageType.title:item.ordersMassageList[0].userPackageDetail.title}}
</view> </view>
</view> </view>
<view class="u-font-13 u-tips-color flex justify-between" style="margin-top: 6rpx;"> <view class="u-font-13 u-tips-color justify-between title-font" style="margin-top: 14rpx;">
预约时间：{{item.serveTime}} <text class="title-font">预约时间：</text><text class="value-font">{{item.serveTime}}</text>
</view> </view>
<view class="flex-sub u-font-13 margin-top-xs" style="color: #999999;"> <view class="flex-sub u-font-13" style="color: #999999;">
实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text> <text class="title-font">实付金额：</text><text class="text-xl text-bold" style="color: #FF1200;">￥{{item.payMoneyTotal}}</text>
</view> </view>
</view> </view>
</view> </view>
<view class="flex u-p-t-20 justify-between align-center" style="justify-content: flex-end;"> <view class="flex u-p-t-20 justify-between align-center" style="justify-content: flex-end;">
<view class="flex text-right" style="flex-direction: column;width: 100%;"> <view class="flex text-right" style="flex-direction: column;width: 100%;">
@ -66,7 +65,7 @@
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 取消订单
</u-button> </u-button>
<!-- <u-button <!-- <u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true" v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item,'修改')" class="btns xianshi"> @click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item,'修改')" class="btns xianshi">
修改订单 修改订单
@ -81,7 +80,7 @@
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btns"> @click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" class="btns">
去支付 去支付
</u-button> </u-button>
</view> </view>
<view class="showBtn" v-if="item.status ==2"> <view class="showBtn" v-if="item.status ==2">
<u-button <u-button
@ -90,7 +89,7 @@
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 取消订单
</u-button> </u-button>
<u-button <u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true" v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item,'修改')" class="btns xianshi"> @click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item,'修改')" class="btns xianshi">
修改订单 修改订单
@ -104,8 +103,8 @@
<u-button :custom-style="customStyle1" class="btns xianshi" shape="circle" :plain="true" <u-button :custom-style="customStyle1" class="btns xianshi" shape="circle" :plain="true"
@click="goNav('/my/order/feedback?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)"> @click="goNav('/my/order/feedback?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)">
待评价 待评价
</u-button> </u-button>
<u-button :custom-style="customStyle1" shape="circle" class="btns xianshi" :plain="true" <u-button :custom-style="customStyle1" shape="circle" class="btns xianshi" :plain="true"
@click="goToushu('/my/order/complain?ordersId='+item.ordersId + '&byUserId=' + item.artificerUserId + '&byuserName=' + item.artificerName)" > @click="goToushu('/my/order/complain?ordersId='+item.ordersId + '&byUserId=' + item.artificerUserId + '&byuserName=' + item.artificerName)" >
去投诉 去投诉
</u-button> </u-button>
@ -138,7 +137,7 @@
@click="goNav('/my/order/pay?ordersId='+item.ordersId)"> @click="goNav('/my/order/pay?ordersId='+item.ordersId)">
服务升级 服务升级
</u-button> </u-button>
<u-button :custom-style="customStyle1" class="btns" shape="circle" :plain="true" <u-button :custom-style="customStyle1" class="btns" shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)"> @click="goNav('/my/wallet/index?artificerId='+item.artificerId+'&ordersId='+item.ordersId,item)">
充值 充值
@ -148,8 +147,8 @@
加钟 加钟
</u-button> </u-button>
</view> </view>
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}"> <view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
<view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn"> <view @click="goNav('/my/order/pay?ordersId='+item.ordersId)" class="gengduoBtn">
联系客服 联系客服
@ -188,7 +187,7 @@
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 取消订单
</u-button> </u-button>
<u-button <u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true" v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item,'修改')" class="btns xianshi"> @click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item,'修改')" class="btns xianshi">
修改订单 修改订单
@ -205,7 +204,7 @@
@click="cancelOrder(item)"> @click="cancelOrder(item)">
取消订单 取消订单
</u-button> </u-button>
<u-button <u-button
v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true" v-if="item.btnShow == 'true'" :custom-style="customStyle1" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item,'修改')" class="btns xianshi"> @click="goNav('/my/order/payModifyDzhifu?ordersId='+item.ordersId,item,'修改')" class="btns xianshi">
修改订单 修改订单
@ -251,7 +250,7 @@
联系客服 联系客服
</u-button> </u-button>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -422,7 +421,7 @@
// } // }
earlyFinishReason:'', earlyFinishReason:'',
currentDate:new Date() currentDate:new Date()
} }
}, },
computed: { computed: {
@ -435,7 +434,7 @@
onLoad() { onLoad() {
this.userId = uni.getStorageSync('userId') this.userId = uni.getStorageSync('userId')
this.nickName = uni.getStorageSync('nickName'); this.nickName = uni.getStorageSync('nickName');
}, },
onShow() { onShow() {
this.yhqxSel = this.$queue.getData("yhqxSel"); this.yhqxSel = this.$queue.getData("yhqxSel");
@ -479,7 +478,7 @@
url:'/my/order/payShengji?ordersId='+item.ordersId url:'/my/order/payShengji?ordersId='+item.ordersId
}) })
} }
}else if(item.addNum&&item.isSupplement!='2'){ }else if(item.addNum&&item.isSupplement!='2'){
uni.navigateTo({ uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+item.ordersId url:'/my/order/payJaZ?ordersId='+item.ordersId
@ -527,7 +526,7 @@
var timestamp = this.timeToMilliseconds(this.getCurrentTime); var timestamp = this.timeToMilliseconds(this.getCurrentTime);
var twoTime=2* 60 * 60 * 1000; var twoTime=2* 60 * 60 * 1000;
var time=''; var time='';
for(var i=0;i<this.goods.length;i++){ for(var i=0;i<this.goods.length;i++){
time=this.timeToMilliseconds(this.goods[i].serveTime.slice(11, 16)) time=this.timeToMilliseconds(this.goods[i].serveTime.slice(11, 16))
if(time - timestamp>twoTime){ if(time - timestamp>twoTime){
@ -535,17 +534,17 @@
}else{ }else{
this.$set(this.goods[i], 'btnShow', 'false') this.$set(this.goods[i], 'btnShow', 'false')
} }
} }
console.log("this.goods[i].serveTime.slice(15, 16)",this.goods) console.log("this.goods[i].serveTime.slice(15, 16)",this.goods)
} }
}).catch(() => { }).catch(() => {
//联网失败, 结束加载 //联网失败, 结束加载
}); });
}, },
gengBtn(index){//更多按钮 gengBtn(index){//更多按钮
// console.log("inex=====",index) // console.log("inex=====",index)
this.gengNum=index; this.gengNum=index;
@ -557,7 +556,7 @@
}, },
toggleQ(type,item) {//确认拒单 弹出框 toggleQ(type,item) {//确认拒单 弹出框
this.qurenJd=item; this.qurenJd=item;
this.type = type this.type = type
// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性 // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
this.$refs.popupQ.open(type) this.$refs.popupQ.open(type)
@ -583,12 +582,12 @@
title:res.msg title:res.msg
}) })
} }
}).catch(() => { }).catch(() => {
//联网失败, 结束加载 //联网失败, 结束加载
}); });
}, },
closePopup(type){//提前结束 关闭弹出框 closePopup(type){//提前结束 关闭弹出框
this.type = type this.type = type
this.$refs.popup.close(type); this.$refs.popup.close(type);
@ -614,7 +613,7 @@
accomplishLatitude:latitude, accomplishLatitude:latitude,
earlyFinishReason: that.earlyFinishReason, earlyFinishReason: that.earlyFinishReason,
} }
that.$Request.post('/app/artificer/accomplishOrders', data).then(res => { that.$Request.post('/app/artificer/accomplishOrders', data).then(res => {
if (res.code == 0) { if (res.code == 0) {
uni.showToast({ uni.showToast({
@ -633,11 +632,11 @@
title:res.msg title:res.msg
}) })
} }
}).catch(() => { }).catch(() => {
//联网失败, 结束加载 //联网失败, 结束加载
}); });
}, },
fail: function(e) { fail: function(e) {
// #ifdef H5 // #ifdef H5
@ -650,14 +649,14 @@
// #endif // #endif
} }
}); });
}else{ }else{
uni.showToast({ uni.showToast({
icon:'error', icon:'error',
title:'请输入提前结束原因！' title:'请输入提前结束原因！'
}) })
} }
}, },
toggle(type,item) {//提前结束 弹出框 toggle(type,item) {//提前结束 弹出框
this.tiqianData=item; this.tiqianData=item;
@ -695,8 +694,8 @@
} }
return status; return status;
}, },
// 切换菜单 // 切换菜单
tabChange(index) { tabChange(index) {
uni.showLoading({ uni.showLoading({
@ -740,7 +739,7 @@
if (res.confirm) { if (res.confirm) {
that.cancelOrders(data) that.cancelOrders(data)
that.$queue.showLoading('取消中...') that.$queue.showLoading('取消中...')
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
} }
@ -750,7 +749,7 @@
that.$queue.showToast(res.msg); that.$queue.showToast(res.msg);
} }
}) })
}, },
/*下拉刷新的回调 */ /*下拉刷新的回调 */
downCallback() { downCallback() {
@ -818,7 +817,7 @@
} }
}); });
}, },
}, },
onReachBottom: function() { onReachBottom: function() {
this.page = this.page + 1; this.page = this.page + 1;
@ -877,7 +876,7 @@
} }
.profile-img{ .profile-img{
margin-top: -20rpx; margin-top: -20rpx;
} }
.ding-view{ .ding-view{
position: relative; position: relative;
@ -916,7 +915,7 @@
align-items: right; align-items: right;
justify-content: right; justify-content: right;
} }
.popup-mian-btn span:nth-child(1){ .popup-mian-btn span:nth-child(1){
background: linear-gradient(90deg, #FE912E, #FF9970); background: linear-gradient(90deg, #FE912E, #FF9970);
} }
@ -1050,7 +1049,7 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-top: 10px; margin-top: 10px;
} }
/* /*
sticky生效条件： sticky生效条件：
@ -1059,7 +1058,7 @@
3、父元素的高度不能低于sticky元素的高度 3、父元素的高度不能低于sticky元素的高度
4、sticky元素仅在其父元素内生效,所以父元素必须是 mescroll 4、sticky元素仅在其父元素内生效,所以父元素必须是 mescroll
*/ */
// 使用mescroll-uni,则top为0 // 使用mescroll-uni,则top为0
.mescroll-uni, .mescroll-uni,
@ -1138,4 +1137,12 @@
.status-num{ .status-num{
margin-right: 15rpx; margin-right: 15rpx;
} }
</style> .title-font{
font-size: 30rpx;
color: #666666;
}
.value-font{
font-size: 30rpx;
color: #333333;
}
</style>