From 4b7d8ed05a2e5780bc57ee7fd85a3fb28cf185e5 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 11 九月 2024 15:19:57 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/marketing/point-mall/point-distribution.vue | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/pages/marketing/point-mall/point-distribution.vue b/pages/marketing/point-mall/point-distribution.vue
index 1137570..29925c8 100644
--- a/pages/marketing/point-mall/point-distribution.vue
+++ b/pages/marketing/point-mall/point-distribution.vue
@@ -29,12 +29,16 @@
columns: [
{ label: '序号', type: 'index' },
{ label: '用户信息', prop: 'customerName' },
+ { label: '联系方式', prop: 'customerTel' },
{ 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),
},
@@ -42,7 +46,10 @@
searchForm: [
{
type: 'row',
- items: [{ label: '用户名称', id: 'customerName', type: 'input' }],
+ items: [
+ { label: '用户名称', id: 'customerName', type: 'input' },
+ { label: '联系方式', id: 'customerTel', type: 'input' },
+ ],
},
],
extraDialogs: [
--
Gitblit v1.9.3