From dacdca90b0faed8a38d56b2bab0df3ad3b9982b1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 31 Jan 2024 10:38:14 +0800
Subject: [PATCH] 会员列表增加波卷功能

---
 src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html |  150 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 114 insertions(+), 36 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 b4e86de..1252424 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -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>
@@ -81,13 +102,14 @@
 </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="registMember">添加会员</button>
+<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="registMember">添加会员</button>-->
         <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</button>
         <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">拨付赠送积分</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">拨付竞猜积分</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">重置登录密码</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPayPwd">重置支付密码</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="agentLevel">设置代理等级</button>
+<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">拨付竞猜积分</button>-->
+<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">重置登录密码</button>-->
+<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPayPwd">重置支付密码</button>-->
+<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="agentLevel">设置代理等级</button>-->
+        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="rollPerk">拨卷</button>
     </div>
 </script>
 <!-- 表格操作栏 end -->
@@ -137,6 +159,31 @@
                     }
                 });
             }
+
+            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,
@@ -212,35 +259,49 @@
                 defaultToolbar:[],
                 cols: [[
                     {type: 'checkbox'},
-                    {field: 'phone', title: '账号', minWidth: 150,align:'left'},
-                    {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
-                    {field: 'name', title: '名称', minWidth: 100,align:'left'},
+                    {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: 'inviteId', 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},
-                    {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: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'center'},
+                    // {field: 'salesmansName', title: '推销员', minWidth: 100,align:'left'},
+                    // {field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
+                    // {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) {
-                        // '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="see" shiro:hasPermission="user:update">详情</button>'
-                            return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
-                             + '<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" lay-event="updateReferer">修改推荐人</button>'
-                        },minWidth: 200,align:'center', fixed:"right"}
+                    // {title: '操作',
+                    //     templet: function (d) {
+                    //         return  '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agentSelect" shiro:hasPermission="user:update">推销员设置</button>'
+                    //             // '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
+                    //             // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" shiro:hasPermission="user:update">设置为团长</button>'
+                    //
+                    //     },minWidth: 200,align:'center', fixed:"right"}
                 ]]
             });
         }
@@ -322,6 +383,22 @@
                     }
                 });
             }
+
+            if (layEvent === 'rollPerk') {
+                if (checkData.length > 1) {
+                    febs.alert.warn('请选择一个用户');
+                    return;
+                }
+                febs.modal.open('拨卷', 'modules/mallMember/rollPerkSet/' + checkData[0].id, {
+                    btn: ['确认', '取消'],
+                    yes: function (index, layero) {
+                        $('#roll_perk-set').find('#submit').trigger('click');
+                    },
+                    btn2: function () {
+                        layer.closeAll();
+                    }
+                });
+            }
         });
 
         function systemPay(text, id, type) {
@@ -341,7 +418,8 @@
             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(),
             };
         }
 

--
Gitblit v1.9.1