diff --git a/src/types/api/commission.ts b/src/types/api/commission.ts index d7de662..c322f87 100644 --- a/src/types/api/commission.ts +++ b/src/types/api/commission.ts @@ -164,6 +164,7 @@ export interface MyCommissionSummary { frozen_commission: number // 冻结中佣金(分) withdrawing_commission: number // 提现中佣金(分) withdrawn_commission: number // 已提现佣金(分) + unwithdraw_commission?: number // 未提现佣金(分) } /** diff --git a/src/views/commission-management/my-commission/index.vue b/src/views/commission-management/my-commission/index.vue index 406d42b..c37d6f4 100644 --- a/src/views/commission-management/my-commission/index.vue +++ b/src/views/commission-management/my-commission/index.vue @@ -28,9 +28,45 @@ v-permission="'my_commission:add'" >发起提现 - - 可提现金额:{{ formatMoney(summary.available_commission) }} - + +
+
+ 总佣金 + {{ + formatMoney(summary.total_commission, false) + }} +
+
+ 可提现 + {{ + formatMoney(summary.available_commission, false) + }} +
+
+ 冻结中 + {{ + formatMoney(summary.frozen_commission, false) + }} +
+
+ 提现中 + {{ + formatMoney(summary.withdrawing_commission, false) + }} +
+
+ 已提现 + {{ + formatMoney(summary.withdrawn_commission, false) + }} +
+
+ 未提现 + {{ + formatMoney(summary.unwithdraw_commission, false) + }} +
+
@@ -242,7 +278,8 @@ available_commission: 0, frozen_commission: 0, withdrawing_commission: 0, - withdrawn_commission: 0 + withdrawn_commission: 0, + unwithdraw_commission: 0 }) // ==================== 佣金明细 ==================== @@ -403,19 +440,16 @@ { prop: 'iccid', label: 'ICCID', - width: 160, formatter: (row: ShopCommissionRecordItem) => row.iccid || '-' }, { prop: 'virtual_no', label: '虚拟号', - width: 160, formatter: (row: ShopCommissionRecordItem) => row.virtual_no || '-' }, { prop: 'order_no', label: '订单号', - width: 220, formatter: (row: ShopCommissionRecordItem) => row.order_no || '-' }, { @@ -873,7 +907,8 @@ available_commission: myShopData.available_commission, frozen_commission: myShopData.frozen_commission, withdrawing_commission: myShopData.withdrawing_commission, - withdrawn_commission: myShopData.withdrawn_commission + withdrawn_commission: myShopData.withdrawn_commission, + unwithdraw_commission: myShopData.unwithdraw_commission } } } @@ -902,22 +937,41 @@