From d4488a987cccd3ddd51a202a9f8aa71d3cdcbced Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Apr 2021 17:12:16 +0800
Subject: [PATCH] 20210423
---
src/main/resources/templates/febs/views/modules/agent/agent.html | 124 ++++++++++++++++++++--------------------
1 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/agent/agent.html b/src/main/resources/templates/febs/views/modules/agent/agent.html
index db21149..dc1c200 100644
--- a/src/main/resources/templates/febs/views/modules/agent/agent.html
+++ b/src/main/resources/templates/febs/views/modules/agent/agent.html
@@ -23,8 +23,8 @@
<div class="layui-input-inline">
<select name="accountType">
<option value=""></option>
- <option value="1">测试账号</option>
- <option value="2">正常账号</option>
+ <option value="2">测试账号</option>
+ <option value="1">正常账号</option>
</select>
</div>
</div>
@@ -42,11 +42,10 @@
<label class="layui-form-label layui-form-label-sm">实名状态</label>
<div class="layui-input-inline">
<select name="certifyStatus">
- <option value=""></option>
- <option value="0">未通过</option>
- <option value="1">审核中</option>
+ <option value="">请选择</option>
+ <option value="1">待审核</option>
<option value="2">审核通过</option>
- <option value="2">未实名</option>
+ <option value="3">未实名</option>
</select>
</div>
</div>
@@ -59,10 +58,13 @@
<div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
<i class="layui-icon"></i>
</div>
- <div class="layui-btn layui-btn-sm layui-btn-primary table-action action-more"
- shiro:hasAnyPermissions="user:add,user:update,user:password:reset,user:export">
- <i class="layui-icon"></i>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-cyan-plain table-action" id="add" shiro:hasPermission="agent:add">
+ <i class="layui-icon"></i>
</div>
+<!-- <div class="layui-btn layui-btn-sm layui-btn-primary table-action action-more"-->
+<!-- shiro:hasAnyPermissions="agent:add,agent:edit">-->
+<!-- <i class="layui-icon"></i>-->
+<!-- </div>-->
</div>
</div>
</form>
@@ -76,10 +78,9 @@
<script type="text/html" id="certify-status">
{{#
var certifyStatus = {
- 0: {title: '未通过', color: 'red'},
- 1: {title: '审核中', color: 'blue'},
+ 1: {title: '待审核', color: 'blue'},
2: {title: '审核通过', color: 'green'},
- 3: {title: '未实名', color: 'cyan'}
+ 3: {title: '未实名', color: 'blue'}
}[d.certifyStatus];
}}
<span class="layui-badge febs-tag-{{certifyStatus.color}}">{{ certifyStatus.title }}</span>
@@ -89,7 +90,7 @@
var accountStatus = {
1: {title: '正常', color : 'blue'},
0: {title: '禁用', color : 'red'}
- }[d.status];
+ }[d.accountStatus];
}}
<span class="layui-badge febs-bg-{{accountStatus.color}}">{{ accountStatus.title }}</span>
</script>
@@ -97,14 +98,12 @@
<!-- 表格操作栏 start -->
<script type="text/html" id="user-option">
- <span shiro:lacksPermission="agent:view,agent:edit,agent:del">
+ <span shiro:lacksPermission="agent:edit,agent:del">
<span class="layui-badge-dot febs-bg-orange"></span> 无权限
</span>
- <a lay-event="detail" shiro:hasPermission="agent:view"><i
- class="layui-icon febs-edit-area febs-green"></i></a>
- <a lay-event="edit" shiro:hasPermission="agent:edit"><i
- class="layui-icon febs-edit-area febs-blue"></i></a>
- <a lay-event="del" shiro:hasPermission="agent:del"><i class="layui-icon febs-edit-area febs-red"></i></a>
+ <a lay-event="reset" title="重置密码" shiro:hasPermission="agent:password:reset"><i class="layui-icon febs-edit-area febs-blue"></i></a>
+ <a lay-event="edit" title="编辑" shiro:hasPermission="agent:edit"><i class="layui-icon febs-edit-area febs-blue"></i></a>
+<!-- <a lay-event="del" title="删除" shiro:hasPermission="agent:del"><i class="layui-icon febs-edit-area febs-red"></i></a>-->
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
@@ -115,11 +114,11 @@
febs = layui.febs,
form = layui.form,
table = layui.table,
- treeSelect = layui.treeSelect,
dropdown = layui.dropdown,
$view = $('#febs-user'),
$query = $view.find('#query'),
$reset = $view.find('#reset'),
+ $add = $view.find('#add'),
$searchForm = $view.find('form'),
sortObject = {field: 'createTime', type: null},
tableIns,
@@ -170,60 +169,45 @@
});
}
}
- if (name === 'reset') {
- if (!checkStatus.data.length) {
- febs.alert.warn('请选择需要重置密码的用户');
- } else {
- var usernames = [];
- layui.each(checkStatus.data, function (key, item) {
- usernames.push(item.username)
- });
- febs.post(ctx + 'user/password/reset/' + usernames.join(','), null, function () {
- febs.alert.success('所选用户密码已重置为1234qwer');
- });
- }
- }
+ // if (name === 'reset') {
+ // if (!checkStatus.data.length) {
+ // febs.alert.warn('请选择需要重置密码的用户');
+ // } else {
+ // var usernames = [];
+ // layui.each(checkStatus.data, function (key, item) {
+ // usernames.push(item.username)
+ // });
+ // febs.post(ctx + 'user/password/reset/' + usernames.join(','), null, function () {
+ // febs.alert.success('所选用户密码已重置为1234qwer');
+ // });
+ // }
+ // }
},
options: [{
name: 'add',
title: '新增代理商',
perms: 'agent:add'
- }, {
- name: 'delete',
- title: '删除代理商',
- perms: 'agent:del'
- }, {
- name: 'reset',
- title: '密码重置',
- perms: 'agent:password:reset'
}]
- });
-
- // 下拉框选择器
- treeSelect.render({
- elem: $view.find('#dept'),
- type: 'get',
- data: ctx + 'dept/select/tree',
- placeholder: '请选择',
- search: false
});
// 初始化表格操作栏各个按钮功能
table.on('tool(userTable)', function (obj) {
var data = obj.data,
layEvent = obj.event;
- if (layEvent === 'detail') {
- febs.modal.view('用户信息', 'system/user/detail/' + data.username, {
- area: $(window).width() <= 750 ? '95%' : '660px'
+ if (layEvent === 'reset') {
+ febs.modal.confirm('重置密码', '确定重置该用户密码？', function () {
+ febs.post(ctx + 'agent/reset/' + data.id, null, function () {
+ febs.alert.success('所选用户密码已重置为1234qwer');
+ });
});
}
if (layEvent === 'del') {
febs.modal.confirm('删除用户', '确定删除该用户？', function () {
- deleteUsers(data.userId);
+ deleteUsers(data.id);
});
}
if (layEvent === 'edit') {
- febs.modal.open('修改用户', 'system/user/update/' + data.username, {
+ febs.modal.open('修改用户', '/agent/agentEdit/' + data.id, {
area: $(window).width() <= 750 ? '90%' : '50%',
offset: '30px',
btn: ['提交', '取消'],
@@ -246,11 +230,25 @@
// 刷新按钮
$reset.on('click', function () {
$searchForm[0].reset();
- treeSelect.revokeNode('dept');
- sortObject.type = 'null';
createTimeTo = null;
createTimeFrom = null;
- tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ tableIns.reload({where: $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type}), page: {curr: 1}});
+ });
+
+ $add.on('click', function() {
+ febs.modal.open('新增用户', 'agent/agentAdd', {
+ btn: ['提交', '重置'],
+ area: $(window).width() <= 750 ? '95%' : '50%',
+ offset: '30px',
+ yes: function (index, layero) {
+ $('#user-add').find('#submit').trigger('click');
+ tableIns.reload({where: params, page: {curr: 1}});
+ },
+ btn2: function () {
+ $('#user-add').find('#reset').trigger('click');
+ return false;
+ }
+ });
});
function initTable() {
@@ -263,9 +261,9 @@
{field: 'name', title: '代理姓名', minWidth: 100, align: 'center'},
{field: 'account', title: '代理账号', minWidth: 100, align: 'center'},
{field: 'inviteId', title: '代理UID', minWidth: 100, align: 'center'},
- {field: 'phone', title: '手机号', minWidth: 100, align: 'center'},
- {field: 'email', title: '邮箱', minWidth: 100, align: 'center'},
- {field: 'referId', title: '上级UID', minWidth: 100, align: 'center'},
+ {field: 'telphone', title: '联系方式', minWidth: 130, align: 'center'},
+ // {field: 'email', title: '邮箱', minWidth: 180, align: 'center'},
+ {field: 'refererId', title: '上级UID', minWidth: 100, align: 'center'},
{title: '是否实名', templet: '#certify-status', minWidth: 100, align: 'center'},
{field: 'childCnt', title: '发展代理数', minWidth: 100, align: 'center'},
{field: 'chargeTotal', title: '充值总额', minWidth: 100, align: 'center'},
@@ -286,6 +284,8 @@
createTimeFrom = createTime.split(' - ')[0];
createTimeTo = createTime.split(' - ')[1];
}
+ var accountStatus = $searchForm.find("select[name='accountStatus']").val();
+ console.log(accountStatus);
return {
startTime: createTimeFrom,
endTime: createTimeTo,
@@ -303,7 +303,7 @@
febs.alert.warn('所选用户包含当前登录用户，无法删除');
return;
}
- febs.get(ctx + 'user/delete/' + userIds, null, function () {
+ febs.get(ctx + 'agent/del/' + userIds, null, function () {
febs.alert.success('删除用户成功');
$query.click();
});
--
Gitblit v1.9.1