From 7ba7366a8c6ce8019339e433b218386645cb5312 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Dec 2020 17:38:53 +0800
Subject: [PATCH] Merge branch 'piot' of https://gitee.com/chonggaoxiao/new_excoin_manage into piot
---
src/main/resources/templates/febs/views/modules/member/member.html | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/member/member.html b/src/main/resources/templates/febs/views/modules/member/member.html
index e729afa..f340fd7 100644
--- a/src/main/resources/templates/febs/views/modules/member/member.html
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -43,11 +43,11 @@
</div>
<!-- 表格操作栏 start -->
<script type="text/html" id="user-option">
-<!-- <span shiro:lacksPermission="user:view,user:update,user:delete">-->
-<!-- <span class="layui-badge-dot febs-bg-orange"></span> 无权限-->
-<!-- </span>-->
- <a lay-event="edit" shiro:hasPermission="user:update">审核认证</a>
- <a lay-event="see"><i class="layui-icon febs-edit-area febs-blue"></i></a>
+ {{# if(d.certifyStatus == 1) { }}
+ <a lay-event="edit" shiro:hasPermission="member:update"><i class="layui-icon febs-edit-area febs-blue"></i></a>
+ {{# } else { }}
+ <a lay-event="see"><i class="layui-icon febs-edit-area febs-blue"></i></a>
+ {{# } }}
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
@@ -90,17 +90,6 @@
maxmin: true,
});
}
- if (layEvent === 'addCoin') {
- febs.modal.open( '拨币', 'modules/member/addCoin/' + data.id, {
- btn: ['提交', '取消'],
- yes: function (index, layero) {
- $('#user-update').find('#submit').trigger('click');
- },
- btn2: function () {
- layer.closeAll();
- }
- });
- }
if (layEvent === 'examine') {
febs.modal.open( '个人数据详情', 'modules/member/memberDetailInfo/' + data.inviteId, {
maxmin: true,
@@ -127,6 +116,7 @@
elem: $view.find('table'),
id: 'userTable',
url: ctx + 'member/getList',
+ totalRow : true,
cols: [[
{field: 'phone', title: '手机号', minWidth: 150,align:'left'},
{field: 'email', title: '邮箱', minWidth: 100,align:'left'},
@@ -136,6 +126,8 @@
return '<a lay-event="examine" shiro:hasPermission="user:update">'+d.inviteId+'</a>'
}, minWidth: 80,align:'center'},
{field: 'refererId', title: '上级邀请码UID', minWidth: 80,align:'center'},
+ {field: 'usdtAmount', title: 'USDT', minWidth: 80,align:'center', totalRow: true},
+ {field: 'rfncAmount', title: 'RFNC', minWidth: 80,align:'center', totalRow: true},
// {field: 'accountType', title: '账号类型',
// templet: function (d) {
// if (d.accountType === 2) {
@@ -181,16 +173,17 @@
}
}, minWidth: 80,align:'center'},
{field: 'createTime', title: '注册时间', minWidth: 180,align:'center'},
- {title: '操作', toolbar: '#user-option'
+ {title: '操作',
// templet: function (d) {
// if (d.certifyStatus === 1) {
- // return ''
+ // return '<a lay-event="edit" shiro:hasPermission="user:update">审核认证</a>'
// +'<i class="layui-icon febs-edit-area febs-blue"></i>'
// }else {
// return '<a lay-event="see" shiro:hasPermission="user:update">'
// +'<i class="layui-icon febs-edit-area febs-blue"></i></a>'
// }
- // },
+ // }
+ toolbar: '#user-option'
,minWidth: 200,align:'center'}
]]
});
--
Gitblit v1.9.1