From 91cf4ce7ff32663fa8af7aa3a139afdb75457b77 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 21:37:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index dcff9c6..b74872a 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -92,6 +92,11 @@
maxmin: true,
});
}
+ if (layEvent === 'moneyFlow') {
+ febs.modal.open( '用户资金流水', 'modules/mallMember/moneyFlow/' + data.id, {
+ maxmin: true,
+ });
+ }
});
function closeAccount(id) {
febs.get(ctx + 'admin/mallMember/closeAccount/' + id, null, function () {
@@ -126,8 +131,9 @@
id: 'userTable',
url: ctx + 'admin/mallMember/getMallMemberList',
cols: [[
- {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
- {field: 'email', title: '邮箱', minWidth: 150,align:'left'},
+ {field: 'phone', title: '账号', minWidth: 150,align:'left'},
+ {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
+ // {field: 'email', title: '邮箱', minWidth: 150,align:'left'},
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'referrerId', title: '推荐人邀请码', minWidth: 100,align:'left'},
@@ -157,10 +163,12 @@
if (d.accountStatus === 1) {
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="see" shiro:hasPermission="user:update">详情</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="close" shiro:hasPermission="user:update">禁用</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
}else{
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="see" shiro:hasPermission="user:update">详情</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="open" shiro:hasPermission="user:update">启用</button>'
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
}
},minWidth: 300,align:'center'}
--
Gitblit v1.9.1