From 8bf923b44bbe9b45b73ddcc25df75c9c59f54e07 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:19:44 +0800
Subject: [PATCH] fix
---
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 105 ++++++++++++++++++++--------------------------------
1 files changed, 41 insertions(+), 64 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 6b99f98..4ef47be 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -3,7 +3,7 @@
<div class="layui-col-md12">
<div class="layui-card">
<div class="layui-card-body febs-table-full">
- <form class="layui-form layui-table-form" lay-filter="user-table-form">
+ <form class="layui-form layui-table-form" lay-filter="member-table-form">
<div class="layui-row">
<div class="layui-col-md10">
<div class="layui-form-item">
@@ -34,13 +34,13 @@
<div class="layui-input-inline">
<select name="level">
<option value="">请选择</option>
- <option value="ZERO_LEVEL">普通会员</option>
- <option value="SECOND_LEVEL">1星</option>
- <option value="THIRD_LEVEL">2星</option>
- <option value="FOUR_LEVEL">3星</option>
- <option value="FIFTH_LEVEL">4星</option>
- <option value="SIX_LEVEL">5星</option>
- <option value="SEVEN_LEVEL">6星</option>
+ <option value="ZERO_LEVEL">迷梦素人</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>
+ <option value="SIX_LEVEL">权倾圣主/权倾女帝</option>
</select>
</div>
</div>
@@ -56,7 +56,7 @@
</div>
</div>
</form>
- <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
+ <table lay-filter="memberTable" lay-data="{id: 'memberTable'}"></table>
</div>
</div>
</div>
@@ -68,6 +68,17 @@
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="moneyFlow:update" lay-event="moneyFlow">资金流水</button>
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="updateReferer:update" lay-event="updateReferer">修改推荐人</button>
</script>
+<script type="text/html" id="switchAccountLevel">
+ {{# if(d.accountLevel == 1) { }}
+ <span>会员</span>
+ {{# } else if(d.accountLevel == 2) { }}
+ <span>代理</span>
+ {{# } else if(d.accountLevel == 3) { }}
+ <span>股东</span>
+ {{# } else { }}
+ <span>未购买</span>
+ {{# } }}
+</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">
@@ -75,39 +86,12 @@
<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="switchCreate">
- {{# if(d.creater === 1) { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchCreate">
- {{# } else { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchCreate">
- {{# } }}
-</script>
-<script type="text/html" id="switchPartner">
- {{# if(d.partner === 1) { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchPartner">
- {{# } else { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchPartner">
- {{# } }}
-</script>
+
<script type="text/html" id="switchInsideWith">
{{# if(d.insideWith === 1) { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchInsideWith">
+ <input type="checkbox" value={{d.id}} lay-text="正常|禁用" checked lay-skin="switch" lay-filter="switchInsideWith">
{{# } else { }}
- <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchInsideWith">
+ <input type="checkbox" value={{d.id}} lay-text="正常|禁用" lay-skin="switch" lay-filter="switchInsideWith">
{{# } }}
</script>
<style>
@@ -119,12 +103,10 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="addMember:update" lay-event="registMember">添加会员</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="balance">拨付余额</button>
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="score">拨付赠送积分</button>-->
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="score">拨付赠送积分</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="mallSystemPay:update" lay-event="prizeScore">拨付现金积分</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="resetPwd:update" lay-event="resetPwd">重置登录密码</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="resetPwd:update" lay-event="resetPayPwd">重置支付密码</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="agentLevelSet:update" lay-event="agentLevel">设置代理等级</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="voucherUpdate:update" lay-event="voucherUpdate">拨付绿色凭证</button>
</div>
</script>
<!-- 表格操作栏 end -->
@@ -154,7 +136,7 @@
initTable();
// 初始化表格操作栏各个按钮功能
- table.on('tool(userTable)', function (obj) {
+ table.on('tool(memberTable)', function (obj) {
var data = obj.data,
layEvent = obj.event;
@@ -261,29 +243,23 @@
function initTable() {
tableIns = febs.table.init({
elem: $view.find('table'),
- id: 'userTable',
+ id: 'memberTable',
url: ctx + 'admin/mallMember/getMallMemberList',
toolbar:"#tableMemberBar",
defaultToolbar:[],
totalRow: true ,// 开启合计行
cols: [[
{type: 'checkbox'},
- {field: 'phone', title: '账号', minWidth: 150,align:'left',hide:toolbarMallmember},
+ {field: 'phone', title: '账号', minWidth: 150,align:'left'},
{field: 'name', title: '名称', minWidth: 100,align:'left', totalRowText: '合计：'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'balance', title: '余额', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.balance) }}'},
+ {field: 'score', title: '赠送积分', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.score) }}'},
{field: 'prizeScore', title: '现金积分', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.prizeScore) }}'},
- {field: 'star', title: '贡献点', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.star) }}'},
- {field: 'totalScore', title: '补贴额度', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.totalScore) }}'},
- {field: 'voucherCnt', title: '绿色凭证', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherCnt) }}'},
- {field: 'voucherAmount', title: '凭证现金', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.voucherAmount) }}'},
+ {field: 'childNodeCnt', title: '粉丝数量', minWidth: 100,align:'left'},
{field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
- {field: 'storeMaster', title: '线下服务中心', templet:'#switchStoreMaster', minWidth: 120,align:'left',hide:toolbarMallmember},
- {field: 'director', title: '代理商', templet:'#switchDirector', minWidth: 120,align:'left' ,hide:toolbarMallmember},
- {field: 'creater', title: '联创', templet:'#switchCreate', minWidth: 120,align:'left' ,hide:toolbarMallmember},
- {field: 'partner', title: '合伙人', templet:'#switchPartner', minWidth: 120,align:'left' ,hide:toolbarMallmember},
- {field: 'insideWith', title: '是否内转', templet:'#switchInsideWith', minWidth: 120,align:'left' ,hide:toolbarMallmember},
+ {field: 'insideWith', title: '账号级别', templet:'#switchAccountLevel', minWidth: 120,align:'left'},
{field: 'accountType', title: '账号类型',
templet: function (d) {
if (d.accountType === 2) {
@@ -294,7 +270,8 @@
return ''
}
}, minWidth: 100,align:'left'},
- {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'left',hide:toolbarMallmember},
+ {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'left'},
+ {field: 'insideWith', title: '余额转增', templet: '#switchInsideWith', minWidth: 100,align:'left'},
{field: 'createdTime', title: '注册时间', minWidth: 180,align:'left'},
// {title: '操作',
// templet: function (d) {
@@ -309,7 +286,7 @@
});
}
- table.on('toolbar(userTable)', function(obj){
+ table.on('toolbar(memberTable)', function(obj){
var data = obj.data,
layEvent = obj.event;
@@ -327,14 +304,14 @@
return;
}
- // var checkData = table.checkStatus('userTable').data;
+ // var checkData = table.checkStatus('memberTable').data;
// if (checkData.length <= 0) {
// febs.alert.warn('请选择需要的用户');
// return;
// }
if (layEvent === 'resetPwd') {
- var checkData = table.checkStatus('userTable').data;
+ var checkData = table.checkStatus('memberTable').data;
if (checkData.length <= 0) {
febs.alert.warn('请选择需要的用户');
return;
@@ -349,7 +326,7 @@
}
if (layEvent === 'resetPayPwd') {
- var checkData = table.checkStatus('userTable').data;
+ var checkData = table.checkStatus('memberTable').data;
if (checkData.length <= 0) {
febs.alert.warn('请选择需要的用户');
return;
@@ -365,7 +342,7 @@
}
if (layEvent === 'balance') {
- var checkData = table.checkStatus('userTable').data;
+ var checkData = table.checkStatus('memberTable').data;
if (checkData.length <= 0) {
febs.alert.warn('请选择需要的用户');
return;
@@ -378,7 +355,7 @@
}
if (layEvent === 'voucherUpdate') {
- var checkData = table.checkStatus('userTable').data;
+ var checkData = table.checkStatus('memberTable').data;
if (checkData.length <= 0) {
febs.alert.warn('请选择需要的用户');
return;
@@ -391,7 +368,7 @@
}
if (layEvent === 'score') {
- var checkData = table.checkStatus('userTable').data;
+ var checkData = table.checkStatus('memberTable').data;
if (checkData.length <= 0) {
febs.alert.warn('请选择需要的用户');
return;
@@ -404,7 +381,7 @@
}
if (layEvent === 'prizeScore') {
- var checkData = table.checkStatus('userTable').data;
+ var checkData = table.checkStatus('memberTable').data;
if (checkData.length <= 0) {
febs.alert.warn('请选择需要的用户');
return;
@@ -417,7 +394,7 @@
}
if (layEvent === 'agentLevel') {
- var checkData = table.checkStatus('userTable').data;
+ var checkData = table.checkStatus('memberTable').data;
if (checkData.length <= 0) {
febs.alert.warn('请选择需要的用户');
return;
--
Gitblit v1.9.1