From 820c1c23027dfe95a02d93d6a1611f8ef7f6d6c9 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 九月 2024 16:45:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/marketing/point-mall/point-distribution.vue | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/pages/marketing/point-mall/point-distribution.vue b/pages/marketing/point-mall/point-distribution.vue
index 1137570..8406679 100644
--- a/pages/marketing/point-mall/point-distribution.vue
+++ b/pages/marketing/point-mall/point-distribution.vue
@@ -31,10 +31,13 @@
{ label: '用户信息', prop: 'customerName' },
{ label: '总积分', prop: 'totalPoint' },
{ label: '已使用积分', prop: 'usedPoint' },
+ { label: '过期积分', prop: 'expiredPoint' },
+ { label: '扣减积分', formatter: (row) => row.deductionPoint ?? 0 },
{
label: '剩余积分',
formatter: (row) =>
parseInt(row.totalPoint) -
+ parseInt(row.deductionPoint ?? 0) -
parseInt(row.usedPoint) -
parseInt(row.expiredPoint),
},
--
Gitblit v1.9.3