diff --git a/src/views/ss/reconciliationDate/index.vue b/src/views/ss/reconciliationDate/index.vue
index 675a217..015716d 100644
--- a/src/views/ss/reconciliationDate/index.vue
+++ b/src/views/ss/reconciliationDate/index.vue
@@ -59,7 +59,7 @@
实际分成 = 总分成 - 分成退款
收支差额 = 订单实收 - 实际分成
应收金额 = 月费 + 订单手机号服务费 + 其他费用
- 平台收益 = 平台分成 + 应收金额 + 提现服务费 - 平台分成退款 - 渠道成本
+ 平台收益 = 订单服务费 + 应收金额 + 提现服务费 - 服务费退款 - 渠道成本
@@ -87,10 +87,10 @@
+ ['orderAmount', 'vipOrderAmount', 'orderTotalAmount', 'refundAmount', 'orderReceiveAmount', 'totalBonus', 'totalBonusRefund', 'actualBonus'].includes(item.key))">
-
+
- {{d.row[column.key] | fix2}}
+ {{d.row[column.key] | fix2}}
+ ['userBonus', 'userActualBonus', 'userBonusRefund', 'difference', 'withdrawAmount'].includes(item.key))">
- {{d.row[column.key] | fix2}}
+ {{d.row[column.key] | fix2}}
+ ['platformBonus', 'platformActualBonus', 'withdrawServiceFee', 'platformBonusRefund', 'channelCost', 'receiveAmount', 'platformIncome'].includes(item.key))">
- {{d.row[column.key] | fix2}}
+ {{d.row[column.key] | fix2}}
@@ -173,16 +173,18 @@ export default {
{key: 'orderTotalAmount', visible: true, label: '订单总额', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
{key: 'refundAmount', visible: true, label: '订单退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
{key: 'orderReceiveAmount', visible: true, label: '订单实收', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
- {key: 'userBonus', visible: true, label: '用户分成', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
{key: 'totalBonus', visible: false, label: '分成总计', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
- {key: 'userBonusRefund', visible: true, label: '用户退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
{key: 'totalBonusRefund', visible: false, label: '分成退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
{key: 'actualBonus', visible: false, label: '实际分成', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+ {key: 'userBonus', visible: true, label: '用户分成', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+ {key: 'userBonusRefund', visible: true, label: '用户退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+ {key: 'userActualBonus', visible: true, label: '用户结算', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
{key: 'difference', visible: false, label: '收支差额', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
{key: 'withdrawAmount', visible: true, label: '提现金额', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
- {key: 'platformBonus', visible: true, label: '订单服务费', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+ {key: 'platformBonus', visible: false, label: '平台分成', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+ {key: 'platformBonusRefund', visible: false, label: '平台分成退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
+ {key: 'platformActualBonus', visible: true, label: '订单服务费实收', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
{key: 'withdrawServiceFee', visible: true, label: '提现服务费', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
- {key: 'platformBonusRefund', visible: true, label: '服务费退款', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
{key: 'channelCost', visible: true, label: '渠道成本', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
{key: 'receiveAmount', visible: true, label: '应收账', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},
{key: 'platformIncome', visible: true, label: '平台收益', minWidth: null, sortable: true, overflow: false, align: 'right', width: null},