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

订单页面调整

This commit is contained in:
曹磊 2024-08-08 22:44:40 +08:00
parent 373a6c99be
commit bdddc2e7fa
1 changed files with 92 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
my/order/revenueDetails.vue
View File

@ -204,7 +204,7 @@
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="title-font">升级差价</span> <span class="title-font">升级差价</span>
<span class="value-font">￥{{(order.priceMarkup - order.oldPriceMarkup).toFixed(0)}}</span> <span class="value-font">￥{{(order.priceMarkup - order.oldPriceMarkup).toFixed(2)}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<view class="title-font">会员减免</view> <view class="title-font">会员减免</view>
@ -212,7 +212,7 @@
</view> </view>
<view class="mian-view-list" style="justify-content: flex-end;"> <view class="mian-view-list" style="justify-content: flex-end;">
<view class="title-font">收益小计：</view> <view class="title-font">收益小计：</view>
<view class="value-font" style="font-weight: bold;">￥<text>{{order.artificerMoney}}</text> <view class="value-font" style="font-weight: bold;">￥<text>{{order.projectBenefits}}</text>
</view> </view>
</view> </view>
<view v-if="order.addNum!=null"> <view v-if="order.addNum!=null">
@ -223,7 +223,7 @@
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="title-font">服务项目</span> <span class="title-font">服务项目</span>
<span class="value-font">{{order.addEntryName!=null?order.addEntryName:'-'}}</span> <span class="value-font">{{order.addEntryName}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="title-font">服务时长</span> <span class="title-font">服务时长</span>
@ -242,7 +242,7 @@
<view class="mian-view-list" style="justify-content: flex-end;"> <view class="mian-view-list" style="justify-content: flex-end;">
<view class="title-font">收益小计：</view> <view class="title-font">收益小计：</view>
<view class="value-font" style="font-weight: bold;"> <view class="value-font" style="font-weight: bold;">
￥<text>{{order.addArtificerMoney}}</text></view> ￥<text>{{order.addProjectBenefits}}</text></view>
</view> </view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
@ -267,12 +267,27 @@
<view class="mian-view-list"> <view class="mian-view-list">
<span class="title-font">升级收益</span> <span class="title-font">升级收益</span>
<span class="value-font" <span class="value-font"
style="font-weight: bold;">￥{{order.artificerMoney!=null?order.artificerMoney:'-'}}</span> style="font-weight: bold;">￥{{order.projectBenefits!=null?order.projectBenefits:'-'}}</span>
</view> </view>
<view class="mian-view-list" v-if="order.addNum!=null"> <view class="mian-view-list" v-if="order.addNum!=null">
<span class="title-font">加钟收益</span> <span class="title-font">加钟收益</span>
<span class="value-font" <span class="value-font"
style="font-weight: bold;">￥{{order.addArtificerMoney!=null?order.addArtificerMoney:'-'}}</span> style="font-weight: bold;">￥{{order.addProjectBenefits!=null?order.addProjectBenefits:'-'}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">门店分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.shopMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">经纪人分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.jjrArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">分销员分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.fxyArtificerDeductMoneyTotal}}</span>
</view> </view>
</view> </view>
<view class="yiji"> <view class="yiji">
@ -545,7 +560,7 @@
<view class="mian-view-list" style="justify-content: flex-end;"> <view class="mian-view-list" style="justify-content: flex-end;">
<view class="title-font">收益小计：</view> <view class="title-font">收益小计：</view>
<view class="value-font" style="font-weight: bold;"> <view class="value-font" style="font-weight: bold;">
￥<text>{{order.addArtificerMoney}}</text></view> ￥<text>{{order.addProjectBenefits}}</text></view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
<view class="mina-title"> <view class="mina-title">
@ -569,8 +584,23 @@
<view class="mian-view-list"> <view class="mian-view-list">
<span class="title-font">加钟收益</span> <span class="title-font">加钟收益</span>
<span class="value-font" <span class="value-font"
style="font-weight: bold;">￥{{order.addArtificerMoney!=null?order.addArtificerMoney:'-'}}</span> style="font-weight: bold;">￥{{order.addProjectBenefits!=null?order.addProjectBenefits:'-'}}</span>
</view> </view>
<view class="mian-view-list">
<span class="title-font">门店分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.shopMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">经纪人分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.jjrArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">分销员分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.fxyArtificerDeductMoneyTotal}}</span>
</view>
</view> </view>
<view class="yiji"> <view class="yiji">
<view class="yuji-title">技师收益</view> <view class="yuji-title">技师收益</view>
@ -834,6 +864,21 @@
<span class="title-font">车费收益</span> <span class="title-font">车费收益</span>
<span class="value-font" style="font-weight: bold;">￥{{order.artificerTaxiMoney}}</span> <span class="value-font" style="font-weight: bold;">￥{{order.artificerTaxiMoney}}</span>
</view> </view>
<view class="mian-view-list">
<span class="title-font">门店分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.shopMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">经纪人分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.jjrArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">分销员分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.fxyArtificerDeductMoneyTotal}}</span>
</view>
</view> </view>
<view class="yiji"> <view class="yiji">
<view class="yuji-title">技师收益</view> <view class="yuji-title">技师收益</view>
@ -1090,6 +1135,21 @@
<span class="title-font">车费收益</span> <span class="title-font">车费收益</span>
<span class="value-font" style="font-weight: bold;">￥{{order.artificerTaxiMoney}}</span> <span class="value-font" style="font-weight: bold;">￥{{order.artificerTaxiMoney}}</span>
</view> </view>
<view class="mian-view-list">
<span class="title-font">门店分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.shopMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">经纪人分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.jjrArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">分销员分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.fxyArtificerDeductMoneyTotal}}</span>
</view>
</view> </view>
<view class="yiji"> <view class="yiji">
<view class="yuji-title">技师收益</view> <view class="yuji-title">技师收益</view>
@ -1351,7 +1411,7 @@
<view class="mian-view-list" style="justify-content: flex-end;"> <view class="mian-view-list" style="justify-content: flex-end;">
<view class="title-font">收益小计：</view> <view class="title-font">收益小计：</view>
<view class="value-font" style="font-weight: bold;"> <view class="value-font" style="font-weight: bold;">
￥<text>{{order.addArtificerMoney}}</text></view> ￥<text>{{order.addProjectBenefits}}</text></view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
<view class="mina-title"> <view class="mina-title">
@ -1377,6 +1437,21 @@
<span class="value-font" <span class="value-font"
style="font-weight: bold;">￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}</span> style="font-weight: bold;">￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}}</span>
</view> </view>
<view class="mian-view-list">
<span class="title-font">门店分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.shopMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">经纪人分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.jjrArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">分销员分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.fxyArtificerDeductMoneyTotal}}</span>
</view>
</view> </view>
<view class="yiji"> <view class="yiji">
<view class="yuji-title">技师收益</view> <view class="yuji-title">技师收益</view>
@ -1817,17 +1892,17 @@
uni.hideLoading() uni.hideLoading()
this.order = res.data; this.order = res.data;
//扣费明细 小计 //扣费明细 小计
this.koufeiMoney = this.order.channelDeduction + this.order.valueStorageDeduction + this // this.koufeiMoney = this.order.channelDeduction + this.order.valueStorageDeduction + this
.order.pingMoney // .order.pingMoney
//预计收益下面 实际金额 //预计收益下面 实际金额
this.xiangmuMoney = this.order.massagePrice * this.order.ordersMassageList[0].num * (this // this.xiangmuMoney = this.order.massagePrice * this.order.ordersMassageList[0].num * (this
.order.vipRate / 100) * (1 + this.order.technicianRate / 100) // .order.vipRate / 100) * (1 + this.order.technicianRate / 100)
//技师的总共收益 //技师的总共收益
//技师收益（升级）=（升级后项目价格（488）*会议折扣（0.9）-优惠卷（14））* 分成比例（0.65）* 用户余额比例（0.9) + 车费（14） //技师收益（升级）=（升级后项目价格（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.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 // this.jishishouyi = (((this.xiangmuMoney + this.order.addMoney + this.order.taxiMoney - this
.order.couponMoney) - this.order.couponMoney) * this.order.artificerRate * ( // .order.couponMoney) - this.order.couponMoney) * this.order.artificerRate * (
this.order.walletRate / 100) + this.order.taxiMoney).toFixed(2) // this.order.walletRate / 100) + this.order.taxiMoney).toFixed(2)
this.formatEndTime = res.data.endTime; this.formatEndTime = res.data.endTime;
if (this.order.artificerTaxiMoney && this.order.sumArtificerMoney) { if (this.order.artificerTaxiMoney && this.order.sumArtificerMoney) {
this.sumMoney = parseFloat(parseFloat(this.order.sumArtificerMoney) - parseFloat(this this.sumMoney = parseFloat(parseFloat(this.order.sumArtificerMoney) - parseFloat(this
@ -3395,4 +3470,4 @@
border-bottom: 1px #e5e5e5 solid; border-bottom: 1px #e5e5e5 solid;
margin: 30rpx 0; margin: 30rpx 0;
} }
</style> </style>