diff --git a/src/views/marketing/platformCommission/commissionRecord/index.vue b/src/views/marketing/platformCommission/commissionRecord/index.vue
index 7305920..da2ce19 100644
--- a/src/views/marketing/platformCommission/commissionRecord/index.vue
+++ b/src/views/marketing/platformCommission/commissionRecord/index.vue
@@ -61,58 +61,97 @@
-
-
- {{ scope.row.platform_commission_money || '0.00' }}元
+
+
+ 抽成和佣金
- {{ scope.row.platform_commission_rate || '0' }}%
+ 总金额
+ 占有比例
+ 退款减少金额
+ 实际有效金额
+
+
+ {{ scope.row.platform_commission_money || '0.00' }}元
+
+ {{ scope.row.platform_commission_rate || '0' }}%
+
+ {{ scope.row.refund_platform_commission_money || '0' }}元
+
+ {{ scope.row.reality_platform_commission_money || '0' }}元
+
+
+
+
+ {{ scope.row.commission_platform_money || '0.00' }}元
+
+ {{ scope.row.commission_platform_rate || '0' }}%
+
+ {{ scope.row.refund_commission_platform_money || '0' }}元
+
+ {{ scope.row.reality_commission_platform_money || '0' }}元
+
+
+
+
+ {{ scope.row.commission_partner_money || '0.00' }}元
+
+ {{ scope.row.commission_partner_rate || '0' }}%
+
+ {{ scope.row.refund_commission_partner_money || '0' }}元
+
+ {{ scope.row.reality_commission_partner_money || '0' }}元
+
+ 待结算
+ 已结算
+ 无合伙人
+
+
+
+
+ {{ scope.row.commission_merchants_money || '0.00' }}元
+
+ {{ scope.row.commission_merchants_rate || '0' }}%
+
+ {{ scope.row.refund_commission_merchants_money || '0' }}元
+
+ {{ scope.row.reality_commission_merchants_money || '0' }}元
+
+ 待结算
+ 已结算
+ 无招商员
+
+
+
+
+ {{ scope.row.commission_promoter_money || '0.00' }}元
+
+ {{ scope.row.commission_promoter_rate || '0' }}%
+
+ {{ scope.row.refund_commission_promoter_money || '0' }}元
+
+ {{ scope.row.reality_commission_promoter_money || '0' }}元
+
+ 待结算
+ 已结算
+ 无推广员
+
+
+
+
+ {{ scope.row.commission_integral_release_money || '0.00' }}元
+
+ {{ scope.row.commission_integral_release_rate || '0' }}%
+
+ {{ scope.row.refund_commission_integral_release_money || '0' }}元
+
+ {{ scope.row.reality_commission_integral_release_money || '0' }}元
+
+
-
+
- {{ scope.row.commission_platform_money || '0.00' }}元
-
- {{ scope.row.commission_platform_rate || '0' }}%
-
-
-
-
- {{ scope.row.commission_partner_money || '0.00' }}元
-
- {{ scope.row.commission_partner_rate || '0' }}%
-
- 待结算
- 已结算
- 无合伙人
-
-
-
-
- {{ scope.row.commission_merchants_money || '0.00' }}元
-
- {{ scope.row.commission_merchants_rate || '0' }}%
-
- 待结算
- 已结算
- 无招商员
-
-
-
-
- {{ scope.row.commission_promoter_money || '0.00' }}元
-
- {{ scope.row.commission_promoter_rate || '0' }}%
-
- 待结算
- 已结算
- 无推广员
-
-
-
-
- {{ scope.row.commission_integral_release_money || '0.00' }}元
-
- {{ scope.row.commission_integral_release_rate || '0' }}%
+ {{ scope.row.refund_ratio || '0' }}%
diff --git a/src/views/marketing/platformCommission/legumes/index.vue b/src/views/marketing/platformCommission/legumes/index.vue
index 3b0ebc6..6a2c041 100644
--- a/src/views/marketing/platformCommission/legumes/index.vue
+++ b/src/views/marketing/platformCommission/legumes/index.vue
@@ -13,6 +13,8 @@
+
+
@@ -72,11 +74,39 @@
-
+
+
+
+
+
+ {{ (scope.row.order_money - scope.row.refund_order_money).toFixed(2) }}
+
+
+
-
-
-
+
+
+
+
+
+ {{ (scope.row.get_legumes - scope.row.refund_get_legumes).toFixed(2) }}
+
+
+
+
+
+
+ {{ (scope.row.order_money - scope.row.refund_order_money).toFixed(2) }}
+
+
+
+
+
+
+ {{ (scope.row.get_integral - scope.row.use_integral).toFixed(2) }}
+
+
+
@@ -126,10 +156,20 @@
-
+
+
+
+
+
+ {{ (scope.row.total_get_legumes - scope.row.total_refund_get_legumes).toFixed(2) }}
+
+
+
- {{ scope.row.total_get_integral }} / {{ scope.row.total_order_money }}
+
+ {{ scope.row.total_get_integral }} / {{ (scope.row.total_order_money - scope.row.total_refund_order_money).toFixed(2) }}
+
diff --git a/src/views/marketing/platformCommission/partner/index.vue b/src/views/marketing/platformCommission/partner/index.vue
index a5eb7c1..3e71772 100644
--- a/src/views/marketing/platformCommission/partner/index.vue
+++ b/src/views/marketing/platformCommission/partner/index.vue
@@ -4,6 +4,8 @@
+
+