From bdddc2e7fab155804fec331b5c5229fed793b0a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 8 Aug 2024 22:44:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
my/order/revenueDetails.vue | 109 ++++++++++++++++++++++++++++++------
1 file changed, 92 insertions(+), 17 deletions(-)
diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index b7984c6..884bd90 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -204,7 +204,7 @@
升级差价
- ￥{{(order.priceMarkup - order.oldPriceMarkup).toFixed(0)}}
+ ￥{{(order.priceMarkup - order.oldPriceMarkup).toFixed(2)}}
会员减免
@@ -212,7 +212,7 @@
收益小计：
- ￥{{order.artificerMoney}}
+ ￥{{order.projectBenefits}}
@@ -223,7 +223,7 @@
服务项目
- {{order.addEntryName!=null?order.addEntryName:'-'}}
+ {{order.addEntryName}}
服务时长
@@ -242,7 +242,7 @@
收益小计：
- ￥{{order.addArtificerMoney}}
+ ￥{{order.addProjectBenefits}}
@@ -267,12 +267,27 @@
升级收益
￥{{order.artificerMoney!=null?order.artificerMoney:'-'}}
+ style="font-weight: bold;">￥{{order.projectBenefits!=null?order.projectBenefits:'-'}}
加钟收益
￥{{order.addArtificerMoney!=null?order.addArtificerMoney:'-'}}
+ style="font-weight: bold;">￥{{order.addProjectBenefits!=null?order.addProjectBenefits:'-'}}
+
+
+ 门店分佣
+ -￥{{order.shopMoneyTotal}}
+
+
+ 经纪人分佣
+ -￥{{order.jjrArtificerDeductMoneyTotal}}
+
+
+ 分销员分佣
+ -￥{{order.fxyArtificerDeductMoneyTotal}}
@@ -545,7 +560,7 @@
收益小计：
- ￥{{order.addArtificerMoney}}
+ ￥{{order.addProjectBenefits}}
@@ -569,8 +584,23 @@
加钟收益
￥{{order.addArtificerMoney!=null?order.addArtificerMoney:'-'}}
+ style="font-weight: bold;">￥{{order.addProjectBenefits!=null?order.addProjectBenefits:'-'}}
+
+ 门店分佣
+ -￥{{order.shopMoneyTotal}}
+
+
+ 经纪人分佣
+ -￥{{order.jjrArtificerDeductMoneyTotal}}
+
+
+ 分销员分佣
+ -￥{{order.fxyArtificerDeductMoneyTotal}}
+
技师收益
@@ -834,6 +864,21 @@
车费收益
￥{{order.artificerTaxiMoney}}
+
+ 门店分佣
+ -￥{{order.shopMoneyTotal}}
+
+
+ 经纪人分佣
+ -￥{{order.jjrArtificerDeductMoneyTotal}}
+
+
+ 分销员分佣
+ -￥{{order.fxyArtificerDeductMoneyTotal}}
+
技师收益
@@ -1090,6 +1135,21 @@
车费收益
￥{{order.artificerTaxiMoney}}
+
+ 门店分佣
+ -￥{{order.shopMoneyTotal}}
+
+
+ 经纪人分佣
+ -￥{{order.jjrArtificerDeductMoneyTotal}}
+
+
+ 分销员分佣
+ -￥{{order.fxyArtificerDeductMoneyTotal}}
+
技师收益
@@ -1351,7 +1411,7 @@
收益小计：
- ￥{{order.addArtificerMoney}}
+ ￥{{order.addProjectBenefits}}
@@ -1377,6 +1437,21 @@
￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}
+
+ 门店分佣
+ -￥{{order.shopMoneyTotal}}
+
+
+ 经纪人分佣
+ -￥{{order.jjrArtificerDeductMoneyTotal}}
+
+
+ 分销员分佣
+ -￥{{order.fxyArtificerDeductMoneyTotal}}
+
技师收益
@@ -1817,17 +1892,17 @@
uni.hideLoading()
this.order = res.data;
//扣费明细 小计
- this.koufeiMoney = this.order.channelDeduction + this.order.valueStorageDeduction + this
- .order.pingMoney
+ // 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.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.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
@@ -3395,4 +3470,4 @@
border-bottom: 1px #e5e5e5 solid;
margin: 30rpx 0;
}
-
\ No newline at end of file
+