diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index 7483389..c769c4e 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -45,8 +45,11 @@
-
-
+
+ -
+ {{order.ordersMassageList[0].num}}
+ +
+
@@ -69,7 +72,7 @@
-->
项目金额
- ￥{{order.massagePrice}}
+ ￥{{order.oldMassagePrice}}
优惠券
-￥{{order.couponMoney}}
-
- 实付金额
-
+
是否提前结束
{{order.earlyFinishReason!=null?'是':'-'}}
@@ -162,7 +164,7 @@
服务项目
- {{order.jzName!=null?order.jzName:'-'}}
+ {{order.addEntryName!=null?order.addEntryName:'-'}}
项目价格
@@ -176,14 +178,14 @@
加钟费用
- ￥{{order.addMoney}}
+ ￥{{order.addArtificerMoney}}
-
小计
-
+
￥
- {{order.addMoney}}
+ {{order.addArtificerMoney}}
-
@@ -198,12 +200,21 @@
{{order.isSupplement!=null?'是':'否'}}
- 升级项目
- {{order.gjName!=null?order.gjName:'-'}}
+ 升级前项目
+ {{order.oldEntryName!=null?order.oldEntryName:'-'}}
- 项目价格
- ￥{{order.gjPrice}}
+ 升级前价格
+ ￥{{order.oldMassagePrice}}
+ -
+
+
+ 升级后项目
+ {{order.entryName!=null?order.entryName:'-'}}
+
+
+ 升级后价格
+ ￥{{order.massagePrice}}
-
支付差价
- ￥{{order.gjcePrice}}
+ ￥{{order.payMoney}}
-
小计
-
+
￥
- {{order.gjcePrice}}
+ {{order.artificerMoney}}
-
@@ -263,8 +274,8 @@
{{order.artificerRate*100}}%
- 项目金额
- ￥{{xiangmuMoney}}
+ 项目收益
+ ￥{{order.oldArtificerMoney}}
优惠券
@@ -275,12 +286,12 @@
￥{{order.taxiMoney}}
- 加钟费用
- ￥{{order.addMoney!=null?order.addMoney:0}}
+ 加钟收益
+ ￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}
- 升级费用
- ￥{{order.gjPrice!=null?order.gjPrice:0}}
+ 升级收益
+ ￥{{order.artificerMoney!=null?order.artificerMoney:0}}
+ {{order.artificerMoneyTotal}}
@@ -690,6 +702,54 @@
}
},
methods:{
+ getOrder() {
+ let data = {
+ ordersId: this.ordersId
+ }
+ this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
+ if (res.code == 0) {
+ this.goods = [];
+ this.loading = false
+ uni.hideLoading()
+ this.order = res.data;
+ //扣费明细 小计
+ this.koufeiMoney=this.order.channelDeduction+this.order.valueStorageDeduction+this.order.pingMoney
+ //预计收益下面 实际金额
+ this.xiangmuMoney=this.order.massagePrice*this.order.ordersMassageList[0].num*(this.order.vipRate/100)*(1+this.order.technicianRate/100)
+ //技师的总共收益
+ //技师收益（升级）=（升级后项目价格（488）*会议折扣（0.9）-优惠卷（14））* 分成比例（0.65）* 用户余额比例（0.9) + 车费（14）
+ // this.jishishouyi=((this.xiangmuMoney-this.order.couponMoney)*this.order.artificerRate*(this.order.walletRate/100)+this.order.taxiMoney+order.addMoney).toFixed(2)
+ this.jishishouyi=(((this.xiangmuMoney+this.order.addMoney+this.order.taxiMoney-this.order.couponMoney)-this.order.couponMoney)*this.order.artificerRate*(this.order.walletRate/100)+this.order.taxiMoney).toFixed(2)
+ this.formatEndTime = res.data.endTime;
+ if (this.order.artificerTaxiMoney && this.order.sumArtificerMoney) {
+ this.sumMoney = parseFloat(parseFloat(this.order.sumArtificerMoney) - parseFloat(this
+ .order.artificerTaxiMoney)).toFixed(2);
+ } else {
+ this.sumMoney = this.order.sumArtificerMoney;
+ }
+ if (this.order.startImg) {
+ this.order.startImg = this.order.startImg.split(',')
+ }
+ if (this.order.endServiceImg) {
+ this.order.endServiceImg = this.order.endServiceImg.split(',')
+ }
+ let aliphone = this.$queue.getData('aliphone');
+ if (aliphone === '是' && this.order.artificer) {
+ this.ysPhone(this.order.phone, this.order.artificer.phone);
+ }
+ if (res.data.status == 6 && res.data.endTime) {
+ let afterTimeStamp = new Date(res.data.endTime).getTime() / 1000;
+ let currentTimeStamp = new Date().getTime() / 1000;
+ let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
+ console.log("eeee",currentTimeStamp);
+ this.endOfServiceTimer = formatTimeStamp;
+ }
+ this.goods = res.data;
+ // if (this.$refs.countDownEl) this.$refs.countDownEl.update();
+ uni.stopPullDownRefresh();
+ }
+ })
+ },
goBack(){//返回上一页
console.log("asdsad")
uni.switchTab({
@@ -1065,53 +1125,7 @@
}
});
},
- getOrder() {
- let data = {
- ordersId: this.ordersId
- }
- this.$Request.get('/app/artificer/selectOrdersDetails', data).then(res => {
- if (res.code == 0) {
- this.goods = [];
- this.loading = false
- uni.hideLoading()
- this.order = res.data;
- //扣费明细 小计
- this.koufeiMoney=this.order.channelDeduction+this.order.valueStorageDeduction+this.order.pingMoney
- //预计收益下面 实际金额
- this.xiangmuMoney=this.order.massagePrice*this.order.ordersMassageList[0].num*(this.order.vipRate/100)*(1+this.order.technicianRate/100)
- //技师的总共收益
- this.jishishouyi=((this.xiangmuMoney-this.order.couponMoney)*this.order.artificerRate+this.order.taxiMoney).toFixed(2)
-
- this.formatEndTime = res.data.endTime;
- if (this.order.artificerTaxiMoney && this.order.sumArtificerMoney) {
- this.sumMoney = parseFloat(parseFloat(this.order.sumArtificerMoney) - parseFloat(this
- .order.artificerTaxiMoney)).toFixed(2);
- } else {
- this.sumMoney = this.order.sumArtificerMoney;
- }
- if (this.order.startImg) {
- this.order.startImg = this.order.startImg.split(',')
- }
- if (this.order.endServiceImg) {
- this.order.endServiceImg = this.order.endServiceImg.split(',')
- }
- let aliphone = this.$queue.getData('aliphone');
- if (aliphone === '是' && this.order.artificer) {
- this.ysPhone(this.order.phone, this.order.artificer.phone);
- }
- if (res.data.status == 6 && res.data.endTime) {
- let afterTimeStamp = new Date(res.data.endTime).getTime() / 1000;
- let currentTimeStamp = new Date().getTime() / 1000;
- let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
- console.log("eeee",currentTimeStamp);
- this.endOfServiceTimer = formatTimeStamp;
- }
- this.goods = res.data;
- // if (this.$refs.countDownEl) this.$refs.countDownEl.update();
- uni.stopPullDownRefresh();
- }
- })
- },
+
delOrder(e) {
let that = this
uni.showModal({
@@ -1517,6 +1531,38 @@