From 63fe5106b4dd1ac523aa5fd830f51d0c7e246601 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Mar 2023 11:13:29 +0800
Subject: [PATCH] 后端页面
---
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 30 ++++---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsCategoryController.java | 4
src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html | 35 +++++---
src/main/resources/templates/febs/views/modules/product/categoryList.html | 27 +++---
src/main/resources/templates/febs/views/modules/goods/goodsList.html | 3
src/main/resources/templates/febs/views/modules/mallMember/agentList.html | 22 +++--
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 75 ++++++++++++++----
7 files changed, 121 insertions(+), 75 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsCategoryController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsCategoryController.java
index 1ea688b..dadce37 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsCategoryController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsCategoryController.java
@@ -39,7 +39,7 @@
* @return
*/
@GetMapping("categoryAdd")
- @RequiresPermissions("categoryAdd:add")
+ @RequiresPermissions("categoryBar:add")
public String helpCenterAdd() {
return FebsUtil.view("modules/product/categoryAdd");
}
@@ -51,7 +51,7 @@
* @return
*/
@GetMapping("categoryUpdate/{id}")
- @RequiresPermissions("categoryUpdate:update")
+ @RequiresPermissions("categoryBar:update")
public String detail(@PathVariable long id, Model model) {
AdminMallGoodsCategoryVo data = mallGoodsCategoryService.getMallGoodsCategoryInfoById(id);
model.addAttribute("goodsCategoryVo", data);
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsList.html b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
index a058469..e5e0519 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsList.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
@@ -8,8 +8,9 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">商品名称：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="名称" name="goodsName" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="商品名称" name="goodsName" autocomplete="off" class="layui-input">
</div>
</div>
</div>
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
index d91fb68..1c38972 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
@@ -8,25 +8,29 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">名称：</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">账号：</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">代理层级：</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>
+ <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>
</select>
</div>
</div>
@@ -129,7 +133,7 @@
id: 'userAgentTable',
url: ctx + 'admin/mallMember/getAgentList',
cols: [[
- {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
+ // {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
{field: 'phone', title: '账号', minWidth: 150,align:'left'},
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
index 03d6a16..5a5bd07 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
@@ -8,17 +8,19 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">名称：</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">账号：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="手机号" name="phone" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="账号" name="phone" 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">会员类型：</label>
<div class="layui-input-inline">
<select name="status">
<option value="">请选择</option>
@@ -46,6 +48,15 @@
</div>
</div>
</div>
+<script type="text/html" id="charge-flow-list-option">
+ {{# if(d.status === 1) { }}
+ <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="chargeAgree:update" lay-event="chargeAgree">同意</button>
+ <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="chargeDisagree:update" lay-event="chargeDisagree" >拒绝</button>
+ <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="paymentInfo:update" lay-event="paymentInfo">查看收款方式</button>
+ {{# } else { }}
+ <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="paymentInfo:update" lay-event="paymentInfo">查看收款方式</button>
+ {{# } }}
+</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
@@ -62,6 +73,9 @@
tableIns;
form.render();
+ let currPageGoods = 1;//首先默认值为1，防止出错
+ //获取当前页
+ currPageGoods = $view.find(".layui-laypage-em").next().html();
// 表格初始化
initTable();
@@ -103,14 +117,14 @@
// 查询按钮
$query.on('click', function () {
var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
- tableIns.reload({where: params, page: {curr: 1}});
+ tableIns.reload({where: params, page: {curr: currPageGoods}});
});
// 刷新按钮
$reset.on('click', function () {
$searchForm[0].reset();
sortObject.type = 'null';
- tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ tableIns.reload({where: getQueryParams(), page: {curr: currPageGoods}, initSort: sortObject});
});
function initTable() {
@@ -139,16 +153,7 @@
}
}, minWidth: 80,align:'center'},
{field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'},
- {title: '操作',
- templet: function (d) {
- if (d.status === 1) {
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeAgree" shiro:hasPermission="user:update">同意</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="chargeDisagree" shiro:hasPermission="user:update">拒绝</button>'
- +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
- }else{
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">查看收款方式</button>'
- }
- },minWidth: 300,align:'center'}
+ {title: '操作', minWidth: 250 ,toolbar: '#charge-flow-list-option'}
]]
});
}
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 3bd7a11..34f6f8e 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -8,19 +8,19 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">名称：</label>
+ <label class="layui-form-label">名称：</label>
<div class="layui-input-inline">
<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>
+ <label class="layui-form-label">账号：</label>
<div class="layui-input-inline">
<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">账户状态：</label>
<div class="layui-input-inline">
<select name="accountStatus">
<option value="">请选择</option>
@@ -30,7 +30,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">会员类型</label>
+ <label class="layui-form-label">会员类型：</label>
<div class="layui-input-inline">
<select name="level">
<option value="">请选择</option>
@@ -65,11 +65,8 @@
<!-- 表格操作栏 start -->
<script type="text/html" id="mallmember-option">
-<!-- <span shiro:lacksPermission="moneyFlow:update">-->
-<!-- <span class="layui-badge-dot febs-bg-orange"></span>-->
-<!-- </span>-->
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="moneyFlow">资金流水</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="updateReferer:update" lay-event="updateReferer">修改推荐人</button>
+ <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="switchStatus">
{{# if(d.accountStatus === 1) { }}
@@ -123,6 +120,9 @@
sortObject = {field: 'phone', type: null},
tableIns;
+ //结合表格操作栏是否有内容，来控制数据列是否显示
+ let toolbarMallmember = $.trim($("#mallmember-option").html())==="" ? true : false;
+ // alert($.trim($("#mallmember-option").html()));
form.render();
let currPageGoods = 1;//首先默认值为1，防止出错
//获取当前页
@@ -230,10 +230,10 @@
id: 'userTable',
url: ctx + 'admin/mallMember/getMallMemberList',
toolbar:"#tableMemberBar",
- // defaultToolbar:[],
+ defaultToolbar:[],
cols: [[
{type: 'checkbox'},
- {field: 'phone', title: '账号', minWidth: 150,align:'left'},
+ {field: 'phone', title: '账号', minWidth: 150,align:'left',hide:toolbarMallmember},
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'balance', title: '余额', minWidth: 100,align:'left'},
@@ -242,8 +242,8 @@
// {field: 'commission', 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: 100},
- {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100 ,hide:true},
+ // {field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
+ // {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100 },
{field: 'accountType', title: '账号类型',
templet: function (d) {
if (d.accountType === 2) {
@@ -264,7 +264,7 @@
// // '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="moneyFlow:update">资金流水</button>'
// // + '<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" lay-event="updateReferer" shiro:hasPermission="user:update">修改推荐人</button>'
// },minWidth: 200,align:'center', fixed:"right"}
- {title: '操作', minWidth: 200 ,toolbar: '#mallmember-option'}
+ {title: '操作', minWidth: 200 ,toolbar: '#mallmember-option',hide:toolbarMallmember}
]]
});
}
@@ -287,13 +287,18 @@
return;
}
- var checkData = table.checkStatus('userTable').data;
- if (checkData.length <= 0) {
- febs.alert.warn('请选择需要的用户');
- return;
- }
+ // var checkData = table.checkStatus('userTable').data;
+ // if (checkData.length <= 0) {
+ // febs.alert.warn('请选择需要的用户');
+ // return;
+ // }
if (layEvent === 'resetPwd') {
+ var checkData = table.checkStatus('userTable').data;
+ if (checkData.length <= 0) {
+ febs.alert.warn('请选择需要的用户');
+ return;
+ }
febs.modal.confirm('重置登录密码', '是否重置选中账号登录密码？', function () {
var ids = [];
layui.each(checkData, function (key, item) {
@@ -304,6 +309,11 @@
}
if (layEvent === 'resetPayPwd') {
+ var checkData = table.checkStatus('userTable').data;
+ if (checkData.length <= 0) {
+ febs.alert.warn('请选择需要的用户');
+ return;
+ }
febs.modal.confirm('重置交易密码', '是否重置选中账号交易密码？', function () {
var ids = [];
layui.each(checkData, function (key, item) {
@@ -315,27 +325,54 @@
}
if (layEvent === 'balance') {
+ var checkData = table.checkStatus('userTable').data;
+ if (checkData.length <= 0) {
+ febs.alert.warn('请选择需要的用户');
+ return;
+ }
if (checkData.length > 1) {
febs.alert.warn('请选择一个用户');
+ return;
}
systemPay("修改余额", checkData[0].id, 1);
}
if (layEvent === 'score') {
+ var checkData = table.checkStatus('userTable').data;
+ if (checkData.length <= 0) {
+ febs.alert.warn('请选择需要的用户');
+ return;
+ }
if (checkData.length > 1) {
febs.alert.warn('请选择一个用户');
+ return;
}
systemPay("修改赠送积分", checkData[0].id, 2);
}
if (layEvent === 'prizeScore') {
+ var checkData = table.checkStatus('userTable').data;
+ if (checkData.length <= 0) {
+ febs.alert.warn('请选择需要的用户');
+ return;
+ }
if (checkData.length > 1) {
febs.alert.warn('请选择一个用户');
+ return;
}
systemPay("修改竞猜积分", checkData[0].id, 3);
}
if (layEvent === 'agentLevel') {
+ var checkData = table.checkStatus('userTable').data;
+ if (checkData.length <= 0) {
+ febs.alert.warn('请选择需要的用户');
+ return;
+ }
+ if (checkData.length > 1) {
+ febs.alert.warn('请选择一个用户');
+ return;
+ }
febs.modal.open('设置代理级别', 'modules/mallMember/agentLevelSet/' + checkData[0].id, {
btn: ['确认', '取消'],
yes: function (index, layero) {
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
index 7db8243..8aed294 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -8,17 +8,19 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">名称：</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">账号：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="手机号" name="phone" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="账号" name="phone" 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">流水类型：</label>
<div class="layui-input-inline">
<select name="type">
<option value="">请选择</option>
@@ -35,7 +37,7 @@
<option value="11">退款</option>
<option value="12">佣金转竞猜积分</option>
<option value="13">佣金转余额</option>
- <option value="14">竞猜积分签到</option>
+ <option value="14">签到</option>
<option value="15">感恩奖</option>
<option value="16">系统拨付</option>
<option value="17">抽奖</option>
@@ -44,14 +46,16 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">资金类型</label>
+ <label class="layui-form-label">资金类型：</label>
<div class="layui-input-inline">
<select name="flowType">
<option value="">请选择</option>
<option value="1">余额</option>
- <option value="2">赠送积分</option>
- <option value="3">竞猜积分</option>
- <option value="4">佣金</option>
+<!-- <option value="2">赠送积分</option>-->
+ <option value="3">现金积分</option>
+ <option value="5">贡献点</option>
+<!-- <option value="6">补贴额度</option>-->
+<!-- <option value="4">佣金</option>-->
</select>
</div>
</div>
@@ -150,7 +154,7 @@
}else if (d.type === 13) {
return '<span>佣金转余额</span>'
}else if (d.type === 14) {
- return '<span>竞猜积分签到</span>'
+ return '<span>签到</span>'
}else if (d.type === 15) {
return '<span>感恩奖</span>'
}else if (d.type === 16) {
@@ -191,12 +195,10 @@
templet: function (d) {
if (d.flowType === 1) {
return '余额';
- } else if(d.flowType === 2) {
- return '赠送积分'
} else if(d.flowType === 3) {
- return '竞猜积分'
- } else if(d.flowType === 4) {
- return '佣金'
+ return '现金积分'
+ } else if(d.flowType === 5) {
+ return '贡献点'
} else {
return '-';
}
diff --git a/src/main/resources/templates/febs/views/modules/product/categoryList.html b/src/main/resources/templates/febs/views/modules/product/categoryList.html
index 3bb27d3..5172cd5 100644
--- a/src/main/resources/templates/febs/views/modules/product/categoryList.html
+++ b/src/main/resources/templates/febs/views/modules/product/categoryList.html
@@ -8,6 +8,7 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">名称：</label>
<div class="layui-input-inline">
<input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
</div>
@@ -27,7 +28,7 @@
</div>
</div>
</form>
- <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
+ <table lay-filter="categoryTable" lay-data="{id: 'categoryTable'}"></table>
<style type="text/css">
.layui-table-cell{
text-align:center;
@@ -44,12 +45,11 @@
</div>
</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"><i
- class="layui-icon febs-edit-area febs-blue"></i></a>
+<script type="text/html" id="tableCategoryBar-option">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="categoryBar:update" lay-event="see">编辑</button>
+ <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="categoryBar:delete" lay-event="delCategary">删除</button>
+ </div>
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
@@ -66,14 +66,15 @@
$searchForm = $view.find('form'),
sortObject = {field: 'phone', type: null},
tableIns;
-
+ //结合表格操作栏是否有内容，来控制数据列是否显示
+ let tableCategoryBarOption = $.trim($("#tableCategoryBar-option").html())==="" ? true : false;
form.render();
// 表格初始化
initTable();
// 初始化表格操作栏各个按钮功能
- table.on('tool(userTable)', function (obj) {
+ table.on('tool(categoryTable)', function (obj) {
var data = obj.data,
layEvent = obj.event;
@@ -145,7 +146,7 @@
function initTable() {
tableIns = febs.table.init({
elem: $view.find('table'),
- id: 'userTable',
+ id: 'categoryTable',
url: ctx + 'admin/goodsCategory/categoryList',
cols: [[
{field: 'name', title: '名称', minWidth: 150,align:'left'},
@@ -154,11 +155,7 @@
templet: function (d) {
return '<a lay-event="seeImges"><img id="seeImges'+d.id+'" src="'+d.image+'" alt=""></a>';
}, minWidth: 100,align:'center'},
- {title: '操作',
- templet: function (d) {
- 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="delCategary" shiro:hasPermission="user:update">删除</button>'
- },minWidth: 300,align:'center'}
+ {title: '操作', minWidth: 200 ,toolbar: '#tableCategoryBar-option',hide:tableCategoryBarOption}
]]
});
}
--
Gitblit v1.9.1