From 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 四月 2023 17:40:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
index b5c7014..2083ba3 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js
@@ -22,8 +22,18 @@
{title: '优惠券总数', field: 'couponSum', visible: true, align: 'center', valign: 'middle'},
{title: '消费次数', field: 'consumeSum', visible: true, align: 'center', valign: 'middle'},
{title: '历史消费', field: 'consumePrice', visible: true, align: 'center', valign: 'middle'},
- {title: '最后一次消费时间', field: 'emergencyContact', visible: true, align: 'center', valign: 'middle'},
- {title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle'},
+ {title: '最后一次消费时间', field: 'lastConsumptionTime', visible: true, align: 'center', valign: 'middle'},
+ {title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ if (row.status === 1){
+ return '<span>正常</span>'
+ }else if (row.status === 2){
+ return '<span>冻结</span>'
+ }else if (row.status === 3){
+ return '<span>已删除</span>'
+ }
+ }
+ },
{title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
formatter: function (value, row) {
if (row.status === 1){
--
Gitblit v1.7.1