From ecf282fb285fbba74ff129a4be8a129aa0d8ceb1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 22 三月 2023 22:35:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUserException.js | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 2627ee3..b5c7014 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
@@ -18,10 +18,10 @@
{title: '用户ID', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '用户昵称', field: 'nickname', visible: true, align: 'center', valign: 'middle'},
{title: '手机号', field: 'phone', visible: true, align: 'center', valign: 'middle'},
- {title: '剩余优惠券', field: 'sex', visible: true, align: 'center', valign: 'middle'},
- {title: '优惠券总数', field: 'avatar', visible: true, align: 'center', valign: 'middle'},
- {title: '消费次数', field: 'openid', visible: true, align: 'center', valign: 'middle'},
- {title: '历史消费', field: 'unionid', visible: true, align: 'center', valign: 'middle'},
+ {title: '剩余优惠券', field: 'notUsedCount', visible: true, align: 'center', valign: 'middle'},
+ {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: '操作', visible: true, align: 'center', valign: 'middle',width:150,
@@ -249,6 +249,7 @@
});
ajax.setData({
userIds:$("#userIds").val(),
+ couponId:TCoupon.seItem.id,
couponName:TCoupon.seItem.couponName
})
ajax.start();
@@ -264,6 +265,7 @@
$("#createTime").val('');
$("#id").val('');
$("#status").val('');
+ this.search();
}
$(function () {
--
Gitblit v1.7.1