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

订单

This commit is contained in:
Mr.jiang 2024-07-17 16:15:29 +08:00
parent 15cb892cb6
commit cf97759eff
18 changed files with 200 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
my/order/pay.vue
View File

@ -44,7 +44,7 @@
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span>￥</span>
<span>{{order.massagePrice}}</span>
<span>{{order.priceMarkup}}</span>
<view style="margin-left: 5px;font-size: 12px;color: #999;text-decoration: line-through;" v-if="order.ordersMassageList[0].userPackageDetail">￥{{order.price}}</view>
</view>
<view>
@ -142,16 +142,13 @@
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">项目价格</view>
<view class="add-con-cont">￥{{order.massagePrice}}</view>
<view class="add-con-cont">￥{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont" >{{order.vipRate}}%</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">技师加成</view>
<view class="add-con-cont" >{{order.technicianRate}}%</view>
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
<view style="color: #333;font-size: 26rpx;">
小计：
@ -200,7 +197,7 @@
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">订单费用：</view>
<view class="add-con-cont">￥<text style="font-size: 26rpx; font-weight: bold;">{{order.massageMoney}}</text></view>
<view class="add-con-cont">￥<text style="font-size: 26rpx; font-weight: bold;">{{order.priceMarkup}}</text></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">出行费用：</view>
@ -272,14 +269,7 @@
<view class="add-con-title">项目价格</view>
<view class="add-con-cont">￥{{order.massagePrice}}</view>
</view>
<!-- <view class="flex justify-between add-lin">
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont" >{{order.vipRate}}%</view>
</view> -->
<!-- <view class="flex justify-between add-lin">
<view class="add-con-title">技师加成</view>
<view class="add-con-cont" >{{order.technicianRate}}%</view>
</view> -->
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
<view style="color: #333;font-size: 26rpx;">
小计：
@ -858,7 +848,10 @@
title: '支付成功'
})
that.getOrder()
that.showpayL = false
that.showpayL = false;
uni.switchTab({
url:'/pages/order/index'
})
} else {
uni.showToast({
title: res.msg,
@ -891,6 +884,9 @@
title: '支付成功',
icon: 'none'
})
uni.switchTab({
url:'/pages/order/index'
})
that.getOrder()
// this.$queue.showToast('支付成功');
@ -926,7 +922,10 @@
title: '支付成功'
})
that.getOrder()
that.showpayL = false
that.showpayL = false;
uni.switchTab({
url:'/pages/order/index'
})
that.callPay(rea.data);
} else {
@ -956,6 +955,9 @@
title: '支付成功'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
that.showpayL = false
uni.hideLoading();
const urlArr = window.location.href;
@ -990,6 +992,9 @@
title: '支付成功'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
that.showpayL = false
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
@ -1013,6 +1018,9 @@
title: '支付成功'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
that.showpayL = false
const div = document.createElement('div')
div.innerHTML = rea.data //此处form就是后台返回接收到的数据
@ -1035,6 +1043,9 @@
title: '支付成功'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
that.showpayL = false
that.setPayment('alipay', rea.data);
@ -1081,6 +1092,9 @@
})
that.showpayL = false
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
// that.showorderS=false;
} else {
@ -1115,7 +1129,9 @@
icon: 'none'
})
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
that.showpayL = false
// this.$queue.showToast('支付成功');
@ -1151,6 +1167,9 @@
})
that.showpayL = false
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
that.callPay(rea.data);
} else {
@ -1179,6 +1198,9 @@
})
that.showpayL = false
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
const urlArr = window.location.href;
const hostUrl = urlArr.split("/");
const callBack = hostUrl[0] + "//" + hostUrl[2] + "/";
@ -1210,6 +1232,9 @@
})
that.showpayL = false
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
}
@ -1229,6 +1254,9 @@
})
that.showpayL = false
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
const div = document.createElement('div')
div.innerHTML = rea.data //此处form就是后台返回接收到的数据
document.body.appendChild(div)
@ -1249,6 +1277,9 @@
})
that.showpayL = false
that.getOrder()
uni.switchTab({
url:'/pages/order/index'
})
that.setPayment('alipay', rea.data);
});
@ -1382,7 +1413,6 @@
});
},
goOrderS(item,text) {//升级 生成订单
let that = this
that.shengji=text
let data = {
@ -1432,9 +1462,12 @@
uni.showToast({
title: '支付成功'
})
uni.navigateTo({
url:'/my/order/payShengji?ordersId='+that.tordersId
uni.switchTab({
url:'/pages/order/index'
})
// uni.navigateTo({
// url:'/my/order/payShengji?ordersId='+that.tordersId
// })
// that.getOrder()
// that.showorderS=false;
@ -1468,8 +1501,8 @@
uni.showToast({
title: '支付成功'
})
uni.navigateTo({
url:'/my/order/payShengji?ordersId='+that.tordersId
uni.switchTab({
url:'/pages/order/index'
})
// this.$queue.showToast('支付成功');
@ -1504,8 +1537,8 @@
uni.showToast({
title: '支付成功'
})
uni.navigateTo({
url:'/my/order/payShengji?ordersId='+that.tordersId
uni.switchTab({
url:'/pages/order/index'
})
that.callPay(rea.data);
@ -1533,8 +1566,8 @@
uni.showToast({
title: '支付成功'
})
uni.navigateTo({
url:'/my/order/payShengji?ordersId='+that.tordersId
uni.switchTab({
url:'/pages/order/index'
})
const urlArr = window.location.href;
const hostUrl = urlArr.split("/");
@ -1564,8 +1597,8 @@
uni.showToast({
title: '支付成功'
})
uni.navigateTo({
url:'/my/order/payShengji?ordersId='+that.tordersId
uni.switchTab({
url:'/pages/order/index'
})
that.isCheckPay(rea.code, 'wxpay', JSON.stringify(rea.data));
}
@ -1583,8 +1616,8 @@
uni.showToast({
title: '支付成功'
})
uni.navigateTo({
url:'/my/order/payShengji?ordersId='+that.tordersId
uni.switchTab({
url:'/pages/order/index'
})
const div = document.createElement('div')
div.innerHTML = rea.data //此处form就是后台返回接收到的数据
@ -1603,8 +1636,8 @@
uni.showToast({
title: '支付成功'
})
uni.navigateTo({
url:'/my/order/payShengji?ordersId='+that.tordersId
uni.switchTab({
url:'/pages/order/index'
})
that.setPayment('alipay', rea.data);
});

8
my/order/payCLDetail.vue
View File

@ -157,8 +157,8 @@
<view class="add-con-cont" >￥{{order.oldMassagePrice}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont" >{{order.vipRate}}%</view>
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
<view style="color: #333;font-size: 26rpx;">
@ -291,8 +291,8 @@
<view class="add-con-cont" >￥{{order.ordersMassageList[0].userPackageDetail.packagePrice}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont" >{{order.vipRate}}%</view>
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
<view style="color: #333;font-size: 26rpx;">

47
my/order/payJaZ.vue
View File

@ -43,7 +43,7 @@
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span>￥</span>
<span>{{order.massagePrice}}</span>
<span>{{order.priceMarkup}}</span>
</view>
<view>
<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
@ -142,17 +142,14 @@
</view>
<view class="jusitify-line">
<view class="line-word">项目价格</view>
<view class="line-word-r" v-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view>
<view class="line-word-r" v-else>￥{{order.oldMassagePrice}}</view>
<view class="line-word-r" v-if="order.oldPriceMarkup==null">￥{{order.priceMarkup}}</view>
<view class="line-word-r" v-else>￥{{order.oldPriceMarkup}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</view>
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-￥{{order.vipReductionMoney}}</view>
</view>
<view class="jusitify-line">
<view style="color: #333;font-size: 26rpx;">
小计：
@ -210,7 +207,7 @@
</view>
<view class="jusitify-line">
<view class="line-word">加钟价格</view>
<view class="line-word-r">￥{{order.addPrice}}</view>
<view class="line-word-r">￥{{order.addPriceMarkup}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">加钟时长</view>
@ -221,13 +218,10 @@
<view class="line-word-r">{{order.addNum}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</view>
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-￥{{order.addVipReductionMoney}}</view>
</view>
<view class="jusitify-line">
<view style="color: #333;font-size: 26rpx;">小计：</view>
<view class="" style="color: #333;">￥<text
@ -330,14 +324,8 @@
<view class="line-word-r" v-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view>
<view class="line-word-r" v-else>￥{{order.oldMassagePrice}}</view>
</view>
<!-- <view class="jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</view>
</view> -->
<view class="jusitify-line">
<view style="color: #333;font-size: 26rpx;">
小计：
@ -395,7 +383,7 @@
</view>
<view class="jusitify-line">
<view class="line-word">加钟价格</view>
<view class="line-word-r">￥{{order.addPrice}}</view>
<view class="line-word-r">￥{{order.addPriceMarkup}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">加钟时长</view>
@ -406,13 +394,10 @@
<view class="line-word-r">{{order.addNum}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</view>
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-￥{{order.addVipReductionMoney}}</view>
</view>
<view class="jusitify-line">
<view style="color: #333;font-size: 26rpx;">小计：</view>
<view class="" style="color: #333;">￥<text

37
my/order/payModify.vue
View File

@ -21,7 +21,10 @@
<view class="money-pay">
<view class="money-pay-zhen">
<span>￥</span>
<span>{{orderXm.price}}</span>
<span v-if="jishiName!=null||jishiName==''">
{{technicianRate}}
</span>
<span v-else>{{orderXm.price}}</span>
</view>
<view v-if="orderXm.qyType!='1'">
<uni-number-box :width='27' :min="1" @change="changeValue" />
@ -122,26 +125,6 @@
</view>
</view>
<!-- <view class="margin-top-xl pay-ding">
<view class="d-title" style="margin-bottom: 5px;">服务保障</view>
<view class="list-pay">
<view class="list-pay-text">
<span>*每单保险</span>
<span>赠送意外险，每单保障您的人身及财产安全</span>
</view>
<view class="list-pay-text">
<span>*迟到补偿</span>
<span>调理师迟到，按迟到时长规则补偿一定金额给客户</span>
</view>
<view class="list-pay-text">
<span>*不满意退全款</span>
<span>服务不满意，可在订单结束48小时内向平台提出异议</span>
</view>
</view>
<view class="checkbox-data">
<uni-data-checkbox v-model="radio1" :localdata="sex"></uni-data-checkbox>
</view>
</view> -->
</view>
@ -299,7 +282,8 @@
couponDataList:'',
orderXm:[],
number:1,
qyMinNum:''
qyMinNum:'',
technicianRate:''
}
},
onLoad(e) {
@ -318,15 +302,14 @@
this.yearsDate = Time;
this.jishiName=this.$queue.getData('getJishi');
if(this.jishiName){
this.getMsTime(Time);
}
this.couponId=this.$queue.getData('youhui');
if(this.couponId){
this.youhuiF(this.couponId)
}
this.orderXm=this.$queue.getData('xiangmu');//上一个页面带过来的全部数据
console.log("this.orderXm",this.orderXm)
this.ordersId = this.$queue.getData('ordersId');
this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
this.youhui()
@ -334,6 +317,10 @@
this.qyMinNum=this.orderXm.qyMinNum;
this.number=this.orderXm.qyMinNum;
}
if(this.jishiName){
this.getMsTime(Time);
this.technicianRate=Math.ceil((this.orderXm.price*this.number)+(this.orderXm.price*this.number*(this.jishiName.technicianTypeRate/100)))
}
},
onShow() {

23
my/order/payModifyDd.vue
View File

@ -26,10 +26,16 @@
</view>
</view>
<view class="money-pay">
<view class="money-pay-zhen">
<view class="money-pay-zhen" v-if="orderXm.userPackageDetailId==null">
<span>￥</span>
<span>{{orderXm.price}}</span>
<!-- <span style="color: #666;font-size: 12px;">x{{orderXm.massageNum}}</span> -->
<span v-if="jishiName!=null||jishiName==''">
{{technicianRate}}
</span>
<span v-else>{{orderXm.priceMarkup}}</span>
</view>
<view class="money-pay-zhen" v-else>
<span>￥</span>
<span>{{orderXm.priceMarkup}}</span>
</view>
<view>
<uni-number-box :disabled="true" :value="orderXm.massageNum" :width='27' :min="1" @change="changeValue" />
@ -301,6 +307,7 @@
couponDataList:'',
orderXm:[],
number:1,
technicianRate:''
}
},
onLoad(e) {
@ -318,9 +325,7 @@
let Time = year + '-' + fullDate
this.yearsDate = Time;
this.jishiName=this.$queue.getData('getJishi');
if(this.jishiName){
this.getMsTime(Time);
}
this.couponId=this.$queue.getData('youhui');
if(this.couponId){
this.youhuiF(this.couponId)
@ -331,7 +336,11 @@
console.log('this.orderXm',this.orderXm)
this.youhui()
// this.getOrder()
// couponMoney
if(this.jishiName){
this.getMsTime(Time);
this.technicianRate=Math.ceil(this.orderXm.price+(this.orderXm.price*(this.jishiName.technicianTypeRate/100)))
console.log("jishiName",this.jishiName)
}
},
onShow() {

26
my/order/payModifyDzhifu.vue
View File

@ -36,9 +36,15 @@
</view>
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<view class="money-pay-zhen" v-if="orderXm.userPackageDetailId==null">
<span>￥</span>
<span>{{orderXm.massagePrice}}</span>
<span>
{{technicianRate}}
</span>
</view>
<view class="money-pay-zhen" v-else>
<span>￥</span>
<span>{{orderXm.priceMarkup}}</span>
</view>
<view>
<uni-number-box :disabled="true" :value="orderXm.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" />
@ -324,6 +330,7 @@
couponDataList:'',
orderXm:[],
number:1,
technicianRate:''
}
},
onLoad(e) {
@ -345,17 +352,18 @@
this.userPackageDetailId = this.$queue.getData('userPackageDetailId');
this.youhui()
this.jishiName=this.$queue.getData('getJishi');
if(this.jishiName){
this.getMsTime(Time);
}else{
this.jishiName=this.orderXm;
}
console.log("this.jishiName===>",this.orderXm)
this.couponId=this.$queue.getData('youhui');
if(this.couponId){
this.youhuiF(this.couponId)
}
if(this.jishiName){
this.getMsTime(Time);
this.technicianRate=Math.ceil(this.orderXm.price+(this.orderXm.price*(this.jishiName.technicianTypeRate/100)))
}else{
this.jishiName=this.orderXm;
this.technicianRate=Math.ceil(this.orderXm.price+(this.orderXm.price*(this.orderXm.technicianRate/100)))
}
console.log("jishiName",this.jishiName)
// this.getOrder()
},

15
my/order/payModifyTcMyDaiB.vue
View File

@ -44,7 +44,7 @@
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span>￥</span>
<span>{{order.massagePrice}} </span>
<span>{{order.priceMarkup}} </span>
<!-- <span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span> -->
</view>
<view>
@ -144,16 +144,13 @@
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">项目价格</view>
<view class="add-con-cont">￥{{order.massagePrice}}</view>
<view class="add-con-cont">￥{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont">{{order.vipRate}}%</view>
<view class="add-con-title">会员减免</view>
<view class="add-con-cont">-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">技师加成</view>
<view class="add-con-cont">{{order.technicianRate}}%</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">小计：</view>
<view class="" style="color: #333;">￥<text
@ -203,7 +200,7 @@
<view class="flex justify-between add-lin">
<view class="add-con-title">订单费用：</view>
<view class="add-con-cont">￥<text
style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
style="font-size: 26rpx;font-weight: bold;">{{order.priceMarkup}}</text></view>
</view>
<view class="flex justify-between add-lin" v-if="order.taxiMoney">
<view class="add-con-title">出行费用：</view>

74
my/order/payShengji.vue
View File

@ -37,7 +37,7 @@
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span>￥</span>
<span>{{order.massagePrice}}</span>
<span>{{order.priceMarkup}}</span>
</view>
<view>
<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" />
@ -135,21 +135,18 @@
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">项目价格</view>
<view class="line-word-r" v-if="order.oldMassagePrice==null">￥{{order.massagePrice}}</view>
<view class="line-word-r" v-else>￥{{order.oldMassagePrice}}</view>
<view class="line-word-r" v-if="order.oldPriceMarkup==null">￥{{order.priceMarkup}}</view>
<view class="line-word-r" v-else>￥{{order.oldPriceMarkup}}</view>
</view>
<view class="flex justify-between jusitify-line" >
<view style="color: #999;font-size: 26rpx;">下单数量</view>
<view class="line-word-r">{{order.massageNum}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</view>
<view style="color: #999;font-size: 26rpx;">会员减免</view>
<view class="line-word-r" >-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">
小计：
@ -205,7 +202,7 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">加钟价格</view>
<view class="line-word-r">￥{{order.addPrice}}</view>
<view class="line-word-r">￥{{order.addPriceMarkup}}</view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="line-word">加钟时长</view>
@ -216,13 +213,10 @@
<view class="line-word-r">{{order.addNum}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</view>
<view style="color: #999;font-size: 26rpx;">会员减免</view>
<view class="line-word-r" >-￥{{order.addVipReductionMoney}}</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">小计：</view>
<view class="" style="color: #333;">￥<text
@ -242,7 +236,7 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">项目价格</view>
<view class="line-word-r">￥{{order.massagePrice}}</view>
<view class="line-word-r">￥{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="line-word">服务时长</view>
@ -250,16 +244,13 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">升级差额</view>
<view class="line-word-r">￥{{(order.massagePrice - order.oldMassagePrice).toFixed(2)}}</view>
<view class="line-word-r">￥{{(order.priceMarkup - order.oldPriceMarkup).toFixed(2)}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</view>
<view style="color: #999;font-size: 26rpx;">会员减免</view>
<view class="line-word-r" >-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">小计：</view>
<view class="" style="color: #333;">
@ -276,10 +267,10 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">订单费用：</view>
<view class="line-word-r" v-if="order.oldMassageMoney==null">￥<text
style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
<view class="line-word-r" v-if="order.oldPriceMarkup==null">￥<text
style="font-size: 26rpx;font-weight: bold;">{{order.priceMarkup}}</text></view>
<view class="line-word-r" v-else>￥<text
style="font-size: 26rpx;font-weight: bold;">{{order.oldMassageMoney}}</text></view>
style="font-size: 26rpx;font-weight: bold;">{{order.oldPriceMarkup}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
@ -374,11 +365,6 @@
<view style="color: #999;font-size: 26rpx;">下单数量</view>
<view class="line-word-r">{{order.massageNum}}</view>
</view>
<!-- <view class="flex justify-between jusitify-line">
<view style="color: #999;font-size: 26rpx;">会员折扣</view>
<view class="line-word-r">100%</view>
</view> -->
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">
小计：
@ -434,7 +420,7 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">加钟价格</view>
<view class="line-word-r">￥{{order.addPrice}}</view>
<view class="line-word-r">￥{{order.addPriceMarkup}}</view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="line-word">加钟时长</view>
@ -445,13 +431,10 @@
<view class="line-word-r">{{order.addNum}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</view>
<view style="color: #999;font-size: 26rpx;">会员减免</view>
<view class="line-word-r" >-￥{{order.addVipReductionMoney}}</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">小计：</view>
<view class="" style="color: #333;">￥<text
@ -471,7 +454,7 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">项目价格</view>
<view class="line-word-r">￥{{order.massagePrice}}</view>
<view class="line-word-r">￥{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between jusitify-line" >
<view class="line-word">服务时长</view>
@ -479,16 +462,13 @@
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">升级差额</view>
<view class="line-word-r">￥{{(order.massagePrice-order.oldMassagePrice).toFixed(2)}}</view>
<view class="line-word-r">￥{{(order.priceMarkup-order.oldPriceMarkup).toFixed(2)}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">会员折扣</view>
<view class="line-word-r">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word">技师加成</view>
<view class="line-word-r">{{order.technicianRate}}%</view>
<view style="color: #999;font-size: 26rpx;">会员减免</view>
<view class="line-word-r" >-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">小计：</view>
<view class="" style="color: #333;">￥<text

15
my/order/payding.vue
View File

@ -42,7 +42,7 @@
<view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen">
<span>￥</span>
<span>{{order.massagePrice}} </span>
<span>{{order.priceMarkup}} </span>
<!-- <span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span> -->
</view>
<view>
@ -142,16 +142,13 @@
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">项目价格</view>
<view class="add-con-cont">￥{{order.massagePrice}}</view>
<view class="add-con-cont">￥{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont">{{order.vipRate}}%</view>
<view class="add-con-title">会员减免</view>
<view class="add-con-cont">-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">技师加成</view>
<view class="add-con-cont">{{order.technicianRate}}%</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view style="color: #333;font-size: 26rpx;">小计：</view>
<view class="" style="color: #333;">￥<text
@ -201,7 +198,7 @@
<view class="flex justify-between add-lin">
<view class="add-con-title">订单费用：</view>
<view class="add-con-cont">￥<text
style="font-size: 26rpx;font-weight: bold;">{{order.massageMoney}}</text></view>
style="font-size: 26rpx;font-weight: bold;">{{order.priceMarkup}}</text></view>
</view>
<view class="flex justify-between add-lin" v-if="order.taxiMoney">
<view class="add-con-title">出行费用：</view>

6
my/order/paydingCi.vue
View File

@ -70,9 +70,9 @@
<span>优惠券</span>
<span style="color: rgb(249, 55, 49);">-￥{{order.couponMoney}}</span>
</view>
<view class="fei-view-list" v-if="order.vipRate">
<span>会员折扣</span>
<span>{{order.vipRate}}%</span>
<view class="fei-view-list" v-if="order.vipReductionMoney">
<view>会员减免</view>
<view>-￥{{order.vipReductionMoney}}</view>
</view>
<view class="fei-view-list-z">
<span>总金额</span>

9
my/order/paydingDd.vue
View File

@ -184,9 +184,7 @@
<view class="" style="color: #F93731;">￥<text
style="font-size: 35rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;margin-bottom: 10px;">
<view style="color: rgb(249, 55, 49);font-size: 26rpx;">会员折扣{{order.vipRate}}%，技师浮动比例{{order.techniciaRate}}%</view>
</view> -->
-->
</view>
</view>
<view class="pay-ding feiuong">
@ -202,8 +200,9 @@
<span>-￥{{order.couponMoney}}</span>
</view>
<view class="fei-view-list">
<span>会员折扣</span>
<span>{{order.vipRate}}%</span>
<view>会员减免</view>
<view>-￥{{order.vipReductionMoney}}</view>
</view>
<view class="fei-view-list">
<span>技师等级</span>

7
my/order/paydingLiao.vue
View File

@ -70,9 +70,10 @@
<span>优惠券</span>
<span style="color: rgb(249, 55, 49);">-￥{{order.couponMoney}}</span>
</view>
<view class="fei-view-list" v-if="order.vipRate">
<span>会员折扣</span>
<span>{{order.vipRate}}%</span>
<view class="fei-view-list" v-if="order.vipReductionMoney">
<view>会员减免</view>
<view>-￥{{order.vipReductionMoney}}</view>
</view>
<view class="fei-view-list-z">
<span>总金额</span>

9
my/order/paydingTCX.vue
View File

@ -144,13 +144,10 @@
<view class="add-con-cont">￥{{order.massagePrice}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont">{{order.vipRate}}%</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">技师加成</view>
<view class="add-con-cont">{{order.technicianRate}}%</view>
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">应付金额</view>
<view class="add-con-cont">￥{{order.massagePrice}}</view>

7
my/order/paydingTc.vue
View File

@ -63,9 +63,10 @@
<span>优惠券</span>
<span style="color: rgb(249, 55, 49);">-￥{{order.couponMoney}}</span>
</view>
<view class="fei-view-list" v-if="order.vipRate">
<span>会员折扣</span>
<span>{{order.vipRate}}%</span>
<view class="fei-view-list" v-if="order.vipReductionMoney">
<view>会员减免</view>
<view>-￥{{order.vipReductionMoney}}</view>
</view>
<view class="fei-view-list-z">
<span>总金额</span>

13
my/order/paydingXiuGai.vue
View File

@ -156,8 +156,8 @@
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.massagePrice}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">会员折扣</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.vipRate}}%</view>
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;border-bottom:1px solid #ccc;padding-bottom:5px ;margin: 5px 0px;">
<view style="color: #333;font-size: 26rpx;">小计：</view>
@ -222,9 +222,7 @@
<view class="" style="color: #F93731;">￥<text
style="font-size: 35rpx;font-weight: bold;">{{order.sumMoney}}</text></view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;margin-bottom: 10px;">
<view style="color: rgb(249, 55, 49);font-size: 26rpx;">会员折扣{{order.vipRate}}%，技师浮动比例{{order.techniciaRate}}%</view>
</view> -->
-->
</view>
</view>
<view class="pay-ding feiuong">
@ -256,10 +254,7 @@
<span>优惠券</span>
<span>-￥{{order.couponMoney}}</span>
</view>
<view class="fei-view-list">
<span>会员折扣</span>
<span>{{order.vipRate}}%</span>
</view>
<view class="fei-view-list">
<span>服务费用</span>

1
pages/order/index.vue
View File

@ -470,6 +470,7 @@
},
goNav(url,item,text) {
this.$queue.setData('xiangmu',item);
this.$queue.setData('getJishi','')
if(item.isSupplement=='2'){//如果有订单有升级 那就去升级订单详情
if(item.addNum||item.isSupplement=='2'){
uni.navigateTo({

4
pages/therapist/orderDetail.vue
View File

@ -42,8 +42,8 @@
<span class="headset-text1">专家</span>
</view>-->
<view class="headset-line">
<image class="headset-img" src="../../static/vip/headset3.png" mode=""></image>
<span class="headset-text2">资深</span>
<image class="headset-img" :src="order.technicianType=='3'?'../../static/vip/headset1.png':order.technicianType=='4'?'../../static/vip/headset3.png':'../../static/vip/headset2.png'" mode=""></image>
<span class="headset-text2">{{order.technicianTypeName}}</span>
</view>
<view class="keyuyue">
<view>

5
pages/videoCircle/index.vue
View File

@ -4,6 +4,7 @@
<image style="width: 380rpx; height: 330rpx;" src="../../static/coming.png" mode=""></image>
<view class="com-text">系统建设中,敬请期待！</view>
</view>
<!-- v-if="videoShow==true" -->
<swiper v-if="videoShow==true" @animationfinish="qiehuan" :current="activeIndex" @change="swiper" :circular="index==0?true:false" vertical
class="list">
<swiper-item disable-programmatic-animation class="item" v-for="(item,index) in list" :key="index">
@ -11,7 +12,7 @@
@timeupdate="long($event,item,index)" :id="'Video'+index" class="video"
:show-center-play-btn='false' :controls="false" object-fit="cover" :autoplay='false' loop
src="https://media.w3.org/2010/05/sintel/trailer.mp4">
<cover-view class="back" v-if="!item.active">
<cover-view class="back" v-if="item.active==false">
<cover-image class="pauseIcon" src="../../static/bofang.png"></cover-image>
</cover-view>
<cover-view class="iconList">
@ -300,7 +301,7 @@
.video {
flex: 1;
width: 100%;
height: 97%;
height: 90%;
}
.back {