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 |  211 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 157 insertions(+), 54 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 3bd7a11..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,24 +3,24 @@
         <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">
                                     <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,17 +30,17 @@
                                         </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="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>
@@ -65,11 +65,19 @@
 
 <!-- 表格操作栏 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="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) { }}
@@ -78,18 +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">
+
+<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">
     {{# } 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">
+    <input type="checkbox" value={{d.id}} lay-text="正常|禁用" lay-skin="switch" lay-filter="switchInsideWith">
     {{# } }}
 </script>
 <style>
@@ -101,11 +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>
     </div>
 </script>
 <!-- 表格操作栏 end -->
@@ -123,6 +124,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,防止出错
         //获取当前页
@@ -132,7 +136,7 @@
         initTable();
 
         // 初始化表格操作栏各个按钮功能
-        table.on('tool(userTable)', function (obj) {
+        table.on('tool(memberTable)', function (obj) {
             var data = obj.data,
                 layEvent = obj.event;
 
@@ -177,6 +181,18 @@
             }
 
         });
+        function insideWithYes(id) {
+            febs.get(ctx + 'admin/mallMember/insideWithYes/' + id, null, function () {
+                febs.alert.success('操作成功');
+                $query.click();
+            });
+        }
+        function insideWithNo(id) {
+            febs.get(ctx + 'admin/mallMember/insideWithNo/' + id, null, function () {
+                febs.alert.success('操作成功');
+                $query.click();
+            });
+        }
         function closeAccount(id) {
             febs.get(ctx + 'admin/mallMember/closeAccount/' + id, null, function () {
                 febs.alert.success('禁用成功');
@@ -227,23 +243,23 @@
         function initTable() {
             tableIns = febs.table.init({
                 elem: $view.find('table'),
-                id: 'userTable',
+                id: 'memberTable',
                 url: ctx + 'admin/mallMember/getMallMemberList',
                 toolbar:"#tableMemberBar",
-                // defaultToolbar:[],
+                defaultToolbar:[],
+                totalRow: true ,// 开启合计行
                 cols: [[
                     {type: 'checkbox'},
                     {field: 'phone', title: '账号', minWidth: 150,align:'left'},
-                    {field: 'name', title: '名称', minWidth: 100,align:'left'},
+                    {field: 'name', title: '名称', minWidth: 100,align:'left', totalRowText: '合计:'},
                     {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: '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: '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: 100},
-                    {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100 ,hide:true},
+                    {field: 'insideWith', title: '账号级别', templet:'#switchAccountLevel', minWidth: 120,align:'left'},
                     {field: 'accountType', title: '账号类型',
                         templet: function (d) {
                             if (d.accountType === 2) {
@@ -253,9 +269,10 @@
                             }else{
                                 return ''
                             }
-                        }, minWidth: 100,align:'center'},
-                    {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'center'},
-                    {field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
+                        }, minWidth: 100,align:'left'},
+                    {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) {
                     //     // '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="see" shiro:hasPermission="user:update">详情</button>'
@@ -264,12 +281,12 @@
                     //         // '<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,align:'left', fixed:'right'}
                 ]]
             });
         }
 
-        table.on('toolbar(userTable)', function(obj){
+        table.on('toolbar(memberTable)', function(obj){
             var data = obj.data,
                 layEvent = obj.event;
 
@@ -287,14 +304,19 @@
                 return;
             }
 
-            var checkData = table.checkStatus('userTable').data;
-            if (checkData.length <= 0) {
-                febs.alert.warn('请选择需要的用户');
-                return;
-            }
+            // var checkData = table.checkStatus('memberTable').data;
+            // if (checkData.length <= 0) {
+            //     febs.alert.warn('请选择需要的用户');
+            //     return;
+            // }
 
             if (layEvent === 'resetPwd') {
-                febs.modal.confirm('重置登录密码', '是否重置选中账号登录密码?', function () {
+                var checkData = table.checkStatus('memberTable').data;
+                if (checkData.length <= 0) {
+                    febs.alert.warn('请选择需要的用户');
+                    return;
+                }
+                febs.modal.confirm('重置登录密码', '是否重置选中账号登录密码为【a123456】?', function () {
                     var ids = [];
                     layui.each(checkData, function (key, item) {
                         ids.push(item.id)
@@ -304,7 +326,12 @@
             }
 
             if (layEvent === 'resetPayPwd') {
-                febs.modal.confirm('重置交易密码', '是否重置选中账号交易密码?', function () {
+                var checkData = table.checkStatus('memberTable').data;
+                if (checkData.length <= 0) {
+                    febs.alert.warn('请选择需要的用户');
+                    return;
+                }
+                febs.modal.confirm('重置交易密码', '是否重置选中账号交易密码为【123456】?', function () {
                     var ids = [];
                     layui.each(checkData, function (key, item) {
                         ids.push(item.id)
@@ -315,27 +342,67 @@
             }
 
             if (layEvent === 'balance') {
+                var checkData = table.checkStatus('memberTable').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') {
+            if (layEvent === 'voucherUpdate') {
+                var checkData = table.checkStatus('memberTable').data;
+                if (checkData.length <= 0) {
+                    febs.alert.warn('请选择需要的用户');
+                    return;
+                }
                 if (checkData.length > 1) {
                     febs.alert.warn('请选择一个用户');
+                    return;
+                }
+                voucherUpdate("拨付绿色凭证", checkData[0].id, 1);
+            }
+
+            if (layEvent === 'score') {
+                var checkData = table.checkStatus('memberTable').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('memberTable').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('memberTable').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) {
@@ -347,6 +414,18 @@
                 });
             }
         });
+
+        function voucherUpdate(text, id, type) {
+            febs.modal.open(text, 'modules/mallMember/voucherUpdate/' + type +'/'+ id, {
+                btn: ['提交', '取消'],
+                yes: function (index, layero) {
+                    $('#voucher-update').find('#submit').trigger('click');
+                },
+                btn2: function () {
+                    layer.closeAll();
+                }
+            });
+        }
 
         function systemPay(text, id, type) {
             febs.modal.open('text', 'modules/mallMember/mallSystemPay/' + type +'/'+ id, {
@@ -370,6 +449,14 @@
             };
         }
 
+        form.on('switch(switchInsideWith)', function (data) {
+            if (data.elem.checked) {
+                insideWithYes(data.value);
+            } else {
+                insideWithNo(data.value);
+            }
+        })
+
         form.on('switch(switchStatus)', function (data) {
             if (data.elem.checked) {
                 openAccount(data.value);
@@ -393,5 +480,21 @@
                 changeIdentityNo(1, data.value);
             }
         })
+
+        form.on('switch(switchCreate)', function (data) {
+            if (data.elem.checked) {
+                changeIdentityYes(3, data.value);
+            } else {
+                changeIdentityNo(3, data.value);
+            }
+        })
+
+        form.on('switch(switchPartner)', function (data) {
+            if (data.elem.checked) {
+                changeIdentityYes(4, data.value);
+            } else {
+                changeIdentityNo(4, data.value);
+            }
+        })
     })
 </script>
\ No newline at end of file

--
Gitblit v1.9.1