From 9b0211dcf5bf657307b72f7fb1e9c2e607ecc35c Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 26 Feb 2024 10:27:26 +0800
Subject: [PATCH] Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka
---
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 425 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 358 insertions(+), 67 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 1be149c..f2b2154 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -1,4 +1,4 @@
-<div class="layui-fluid layui-anim febs-anim" id="febs-user" lay-title="会员列表">
+<div class="layui-fluid layui-anim febs-anim" id="febs-member-list" lay-title="会员列表">
<div class="layui-row febs-container">
<div class="layui-col-md12">
<div class="layui-card">
@@ -8,25 +8,40 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">用户昵称</label>
<div class="layui-input-inline">
- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="用户昵称" name="name" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">手机号码</label>
<div class="layui-input-inline">
- <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="手机号码" name="account" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">账户状态</label>
+ <label class="layui-form-label layui-form-label-sm">会员类型</label>
<div class="layui-input-inline">
- <select name="accountStatus">
+ <select name="level">
<option value="">请选择</option>
- <option value="1">正常</option>
- <option value="2">禁用</option>
+ <option value="ZERO_LEVEL">普通用户</option>
+ <option value="FIRST_LEVEL">城市合伙人</option>
</select>
</div>
</div>
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label layui-form-label-sm">会员类型</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="level">-->
+<!-- <option value="">请选择</option>-->
+<!-- <option value="FIRST_LEVEL">普通会员</option>-->
+<!-- <option value="SECOND_LEVEL">一星</option>-->
+<!-- <option value="THIRD_LEVEL">二星</option>-->
+<!-- <option value="FOUR_LEVEL">三星</option>-->
+<!-- <option value="FIFTH_LEVEL">四星</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -40,6 +55,12 @@
</div>
</form>
<table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
+ <style type="text/css">
+ ::-webkit-scrollbar {
+ height: 20px !important;
+ background-color: #f4f4f4;
+ }
+ </style>
</div>
</div>
</div>
@@ -53,6 +74,47 @@
<a lay-event="edit" shiro:hasPermission="user:update"><i
class="layui-icon febs-edit-area febs-blue"></i></a>
</script>
+<script type="text/html" id="switchStatus">
+ {{# if(d.accountStatus === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="正常|禁用" checked lay-skin="switch" lay-filter="switchStatus">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="正常|禁用" lay-skin="switch" lay-filter="switchStatus">
+ {{# } }}
+</script>
+<script type="text/html" id="switchStoreMaster">
+ {{# if(d.storeMaster === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchStoreMaster">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchStoreMaster">
+ {{# } }}
+</script>
+<script type="text/html" id="switchDirector">
+ {{# if(d.director === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchDirector">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchDirector">
+ {{# } }}
+</script>
+
+<script type="text/html" id="isSalesmanSwitch">
+ {{# if(d.isSale === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="isSalesmanSwitch">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="isSalesmanSwitch">
+ {{# } }}
+</script>
+<style>
+ .layui-form-onswitch {
+ background-color: #5FB878 !important;
+ }
+</style>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateReferer">修改推荐人</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateVipLevel">修改会员等级</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="addCoupon">优惠券派送</button>
+ </div>
+</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
@@ -61,7 +123,7 @@
febs = layui.febs,
form = layui.form,
table = layui.table,
- $view = $('#febs-user'),
+ $view = $('#febs-member-list'),
$query = $view.find('#query'),
$reset = $view.find('#reset'),
$searchForm = $view.find('form'),
@@ -77,6 +139,13 @@
table.on('tool(userTable)', function (obj) {
var data = obj.data,
layEvent = obj.event;
+
+ if (layEvent === 'memberOut') {
+ febs.modal.confirm('注销', '确认注销该账号？', function () {
+ memberOut(data.id);
+ });
+ }
+
if (layEvent === 'close') {
febs.modal.confirm('禁用', '确认禁用该账号？', function () {
closeAccount(data.id);
@@ -88,34 +157,57 @@
});
}
- if (layEvent === 'reset') {
- febs.modal.confirm('重置密码', '是否重置该账号密码？', function () {
- resetPwd(data.id);
- });
- }
-
if (layEvent === 'see') {
febs.modal.open( '个人信息', 'modules/mallMember/detail/' + data.id, {
- maxmin: true,
- });
- }
- if (layEvent === 'moneyFlow') {
- febs.modal.open( '用户资金流水', 'modules/mallMember/moneyFlow/' + data.id, {
- maxmin: true,
- });
- }
- if (layEvent === 'systemPay') {
- febs.modal.open('系统拨付', 'modules/mallMember/mallSystemPay/' + data.id, {
btn: ['提交', '取消'],
yes: function (index, layero) {
- $('#systemPay-update').find('#submit').trigger('click');
+ $('#user-update').find('#submit').trigger('click');
},
btn2: function () {
layer.closeAll();
}
});
}
+
+ if (layEvent === 'addLeader') {
+ febs.modal.open( '团长新增', 'modules/leader/addLeader/' + data.id, {
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#user-addLeader').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+
+ if (layEvent === 'agentSelect') {
+ febs.modal.open('推销员设置', 'modules/mallMember/agentSelect/' + data.id, {
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#agent-select').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+
+ if (layEvent === 'moneyFlow') {
+ febs.modal.open( '用户资金流水', 'modules/mallMember/moneyFlow/' + data.id, {
+ maxmin: true,
+ });
+ }
+
+
+
});
+ function memberOut(id) {
+ febs.get(ctx + 'admin/mallMember/memberOut/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
function closeAccount(id) {
febs.get(ctx + 'admin/mallMember/closeAccount/' + id, null, function () {
febs.alert.success('禁用成功');
@@ -129,13 +221,46 @@
});
}
- function resetPwd(id) {
- febs.post(ctx + 'admin/mallMember/resetPwd/' + id, null, function () {
+ function changeIdentityYes(type, id) {
+ febs.get(ctx + 'admin/mallMember/changeIdentityYes/' + type + "/" + id, null, function () {
+ febs.alert.success('设置成功');
+ $query.click();
+ });
+ }
+ function changeIdentityNo(type, id) {
+ febs.get(ctx + 'admin/mallMember/changeIdentityNo/' + type + "/" + id, null, function () {
+ febs.alert.success('设置成功');
+ $query.click();
+ });
+ }
+
+ function resetPwd(id, type) {
+ febs.post(ctx + 'admin/mallMember/resetPwdNew/' + type + "/"+ id, null, function () {
febs.alert.success('重置成功');
$query.click();
});
}
+ form.on('switch(isSalesmanSwitch)', function (data) {
+ if (data.elem.checked) {
+ upSale(data.value);
+ } else {
+ downSale(data.value);
+ }
+ })
+
+ function upSale(id) {
+ febs.get(ctx + 'admin/mallMember/upSale/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
+ function downSale(id) {
+ febs.get(ctx + 'admin/mallMember/downSale/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
// 查询按钮
$query.on('click', function () {
@@ -155,52 +280,194 @@
elem: $view.find('table'),
id: 'userTable',
url: ctx + 'admin/mallMember/getMallMemberList',
+ toolbar:"#toolbar",
+ defaultToolbar:[],
cols: [[
- {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'},
+ {type: 'checkbox'},
+ {field: 'phone', 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'},
- {field: 'accountType', title: '账号类型',
- templet: function (d) {
- if (d.accountType === 2) {
- return '<span style="color:red;">测试账号</span>'
- } else if (d.accountType === 1) {
- return '<span style="color:green;">正常账号</span>'
- }else{
- return ''
- }
- }, minWidth: 80,align:'center'},
- {field: 'accountStatus', title: '账号状态',
- templet: function (d) {
- if (d.accountStatus === 1) {
- return '<span style="color:green;">正常</span>'
- } else if (d.accountStatus === 2) {
- return '<span style="color:red;">禁用</span>'
- }else{
- return ''
- }
- }, minWidth: 80,align:'center'},
+ {field: 'balance', title: '余额', minWidth: 100,align:'left'},
+ // {field: 'score', title: '赠送积分', minWidth: 100,align:'left'},
+ {field: 'prizeScore', title: '积分', minWidth: 100,align:'left'},
+ // {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
+ {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
+ {field: 'levelName', title: '会员等级', minWidth: 100,align:'left'},
+ // {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
+ {field: 'isSalesman', title: '推销员设置', templet: '#isSalesmanSwitch', minWidth: 100,align:'center'},
+ // {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
+ // {field: 'accountType', title: '账号类型',
+ // templet: function (d) {
+ // if (d.accountType === 2) {
+ // return '<span style="color:red;">测试账号</span>'
+ // } else if (d.accountType === 1) {
+ // return '<span style="color:green;">正常账号</span>'
+ // }else{
+ // return ''
+ // }
+ // }, minWidth: 100,align:'center'},
+ // {field: 'leaderState', title: '是否是团长',
+ // templet: function (d) {
+ // if (d.leaderState === 1) {
+ // return '<span style="color:green;">团长</span>'
+ // }else if (d.leaderState === 3) {
+ // return '<span">申请中</span>'
+ // }else if (d.leaderState === 4) {
+ // return '<span">普通用户(取消团长资格)</span>'
+ // }else{
+ // return '<span">普通用户</span>'
+ // }
+ // }, minWidth: 100,align:'center'},
+ // {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'center'},
{field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
{title: '操作',
templet: function (d) {
- 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="reset" shiro:hasPermission="user:update">重置密码</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="systemPay" shiro:hasPermission="user:update">积分拨付</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
+ return ''
+ +'<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="memberOut" shiro:hasPermission="user:update">注销</button>'
+ // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" 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="reset" 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'}
+ },minWidth: 200,align:'center'}
]]
+ });
+ }
+
+ table.on('toolbar(userTable)', function(obj){
+ var data = obj.data,
+ layEvent = obj.event;
+
+ if (layEvent === 'registMember') {
+ febs.modal.open( '添加会员', 'modules/mallMember/addMember', {
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#member-add').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+
+ return;
+ }
+
+ var checkData = table.checkStatus('userTable').data;
+ if (checkData.length <= 0) {
+ febs.alert.warn('请选择需要的用户');
+ return;
+ }
+
+ if (layEvent == 'updateReferer') {
+ if (checkData.length > 1) {
+ febs.alert.warn('每次只能修改一个用户');
+ return;
+ }
+ febs.modal.open( '修改推荐人', 'modules/mallMember/updateReferer/' + checkData[0].id, {
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#referer-update').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+
+ if (layEvent === 'updateVipLevel') {
+ var checkData = table.checkStatus('userTable').data;
+ if (checkData.length > 1) {
+ febs.alert.warn('每次只能修改一个用户');
+ return;
+ }
+ // var idList = [];
+ // for (var i = 0; i < checkData.length; i++) {
+ // idList.push(checkData[i].id);
+ // }
+ febs.modal.open('设置会员等级', 'modules/mallMember/vipLevelSetting/' + checkData[0].id, {
+ btn: ['确认', '取消'],
+ yes: function (index, layero) {
+ $('#vip-level-set').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+
+ if (layEvent === 'resetPwd') {
+ febs.modal.confirm('重置登录密码', '是否重置选中账号登录密码？', function () {
+ var ids = [];
+ layui.each(checkData, function (key, item) {
+ ids.push(item.id)
+ });
+ resetPwd(ids.join(','), 2);
+ });
+ }
+
+ if (layEvent === 'resetPayPwd') {
+ febs.modal.confirm('重置交易密码', '是否重置选中账号交易密码？', function () {
+ var ids = [];
+ layui.each(checkData, function (key, item) {
+ ids.push(item.id)
+ });
+
+ resetPwd(ids.join(','), 1);
+ });
+ }
+
+ if (layEvent === 'balance') {
+ if (checkData.length > 1) {
+ febs.alert.warn('请选择一个用户');
+ }
+ systemPay("修改余额", checkData[0].id, 1);
+ }
+
+ if (layEvent === 'score') {
+ if (checkData.length > 1) {
+ febs.alert.warn('请选择一个用户');
+ }
+ systemPay("修改赠送积分", checkData[0].id, 2);
+ }
+
+ if (layEvent === 'prizeScore') {
+ if (checkData.length > 1) {
+ febs.alert.warn('请选择一个用户');
+ }
+ systemPay("修改竞猜积分", checkData[0].id, 3);
+ }
+
+ if (layEvent === 'agentLevel') {
+ febs.modal.open('设置代理级别', 'modules/mallMember/agentLevelSet/' + checkData[0].id, {
+ btn: ['确认', '取消'],
+ yes: function (index, layero) {
+ $('#agent-level-set').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+
+ if (layEvent === 'addCoupon') {
+ febs.modal.open('添加优惠券', 'modules/mallMember/addCoupon/' + checkData[0].id, {
+ btn: ['确认', '取消'],
+ yes: function (index, layero) {
+ $('#member-coupon-select').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+ });
+
+ function systemPay(text, id, type) {
+ febs.modal.open('text', 'modules/mallMember/mallSystemPay/' + type +'/'+ id, {
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#systemPay-update').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
});
}
@@ -209,9 +476,33 @@
return {
name: $searchForm.find('input[name="name"]').val().trim(),
account: $searchForm.find('input[name="account"]').val().trim(),
- accountStatus: $searchForm.find("select[name='accountStatus']").val(),
+ level: $searchForm.find("select[name='level']").val(),
+ // level: $searchForm.find("select[name='level']").val(),
};
}
+ form.on('switch(switchStatus)', function (data) {
+ if (data.elem.checked) {
+ openAccount(data.value);
+ } else {
+ closeAccount(data.value);
+ }
+ })
+
+ form.on('switch(switchStoreMaster)', function (data) {
+ if (data.elem.checked) {
+ changeIdentityYes(2, data.value);
+ } else {
+ changeIdentityNo(2, data.value);
+ }
+ })
+
+ form.on('switch(switchDirector)', function (data) {
+ if (data.elem.checked) {
+ changeIdentityYes(1, data.value);
+ } else {
+ changeIdentityNo(1, data.value);
+ }
+ })
})
</script>
\ No newline at end of file
--
Gitblit v1.9.1