From 7ec415605cbc1a65f254188579f37333a4fc0c70 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 11 Mar 2023 00:28:10 +0800
Subject: [PATCH] 后端页面

---
 src/main/resources/templates/index.html                                        |    7 +++++++
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java     |    1 +
 src/main/resources/mapper/modules/MallMemberMapper.xml                         |    2 +-
 src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html |   26 +++++++++++++-------------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
index aa8055e..b0e2688 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -298,6 +298,7 @@
     }
 
     @GetMapping("addMember")
+    @RequiresPermissions("addMember:update")
     public String addMember() {
         return FebsUtil.view("modules/mallMember/addMember");
     }
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 7727293..655f2e6 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -8,7 +8,7 @@
         FROM mall_member m
         left join mall_member a on m.referrer_id = a.invite_id
         LEFT JOIN mall_member_wallet c on c.member_id = m.id
-        LEFT JOIN data_dictionary_custom d on d.code = m.level and type='AGENT_LEVEL'
+        LEFT JOIN data_dictionary_custom d on d.code = m.level and type='AGENT_LEVEL_REQUIRE'
         <where>
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
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 bb88e32..3bd7a11 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -97,15 +97,15 @@
         background-color: #5FB878 !important;
     }
 </style>
-<script type="text/html" id="toolbar">
+<script type="text/html" id="tableMemberBar">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="registMember">添加会员</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="balance">拨付余额</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="score">拨付赠送积分</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="prizeScore">拨付折扣积分</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="resetPwd">重置登录密码</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="resetPayPwd">重置支付密码</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="moneyFlow:update" lay-event="agentLevel">设置代理等级</button>
+        <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="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>
     </div>
 </script>
 <!-- 表格操作栏 end -->
@@ -229,17 +229,17 @@
                 elem: $view.find('table'),
                 id: 'userTable',
                 url: ctx + 'admin/mallMember/getMallMemberList',
-                toolbar:"#toolbar",
-                defaultToolbar:[],
+                toolbar:"#tableMemberBar",
+                // defaultToolbar:[],
                 cols: [[
                     {type: 'checkbox'},
                     {field: 'phone', title: '账号', minWidth: 150,align:'left'},
                     {field: 'name', title: '名称', minWidth: 100,align:'left'},
                     {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
                     {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: '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: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index bff22d7..2a51744 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -22,6 +22,13 @@
 </head>
 <body>
 <div id="febs"></div>
+
+<style type="text/css">
+    ::-webkit-scrollbar {
+        height: 20px !important;
+        background-color: #f4f4f4;
+    }
+</style>
 <script th:src="@{layui/layui.js}"></script>
 <script th:inline="javascript">
     var ctx = [[@{/}]];

--
Gitblit v1.9.1