From 2c74d176be9d103bf47f69868ca7975a3a73256d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Sep 2021 12:34:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/resources/templates/febs/views/modules/mallMember/agentList.html |   66 ++++++++-------------------------
 1 files changed, 16 insertions(+), 50 deletions(-)

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 ae29c2c..02b7395 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
@@ -22,8 +22,12 @@
                                         <div class="layui-input-inline">
                                             <select name="level">
                                                 <option value="">请选择</option>
-                                                <option value="FIRST_LEVEL">FIRST_LEVEL</option>
-                                                <option value="SECOND_LEVEL">SECOND_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>
@@ -77,40 +81,12 @@
         table.on('tool(userAgentTable)', function (obj) {
             var data = obj.data,
                 layEvent = obj.event;
-            // if (layEvent === 'close') {
-            //     febs.modal.confirm('禁用', '确认禁用该账号?', function () {
-            //         closeAccount(data.id);
-            //     });
-            // }
-            // if (layEvent === 'open') {
-            //     febs.modal.confirm('开启', '确认开启该账号?', function () {
-            //         openAccount(data.id);
-            //     });
-            // }
-            // if (layEvent === 'see') {
-            //     febs.modal.open( '个人信息', 'modules/mallMember/detail/' + data.id, {
-            //         maxmin: true,
-            //     });
-            // }
-            // if (layEvent === 'moneyFlow') {
-            //     febs.modal.open( '用户资金流水', 'modules/mallMember/moneyFlow/' + data.id, {
-            //         maxmin: true,
-            //     });
-            // }
+            if (layEvent === 'agentAllMember') {
+                febs.modal.open( '全部成员', 'modules/mallMember/agentAllMember/' + data.id, {
+                    maxmin: true,
+                });
+            }
         });
-        // function closeAccount(id) {
-        //     febs.get(ctx + 'admin/mallMember/closeAccount/' + id, null, function () {
-        //         febs.alert.success('禁用成功');
-        //         $query.click();
-        //     });
-        // }
-        // function openAccount(id) {
-        //     febs.get(ctx + 'admin/mallMember/openAccount/' + id, null, function () {
-        //         febs.alert.success('开启成功');
-        //         $query.click();
-        //     });
-        // }
-
 
         // 查询按钮
         $query.on('click', function () {
@@ -134,23 +110,13 @@
                     {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
                     {field: 'name', title: '名称', minWidth: 100,align:'left'},
                     {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
-                    {field: 'level', title: '代理层级', minWidth: 100,align:'left'},
+                    {field: 'levelName', title: '代理层级', minWidth: 100,align:'left'},
                     {field: 'memberNum', title: '下级', minWidth: 100,align:'left'},
                     {field: 'allMemberNum', title: '我的团队总数', minWidth: 100,align:'left'},
-                    // {title: '操作',
-                    //     templet: function (d) {
-                    //         if (d.accountStatus === 1) {
-                    //             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="close" shiro:hasPermission="user:update">禁用</button>'
-                    //                 +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
-                    //
-                    //         }else{
-                    //             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="open" shiro:hasPermission="user:update">启用</button>'
-                    //                 +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
-                    //
-                    //         }
-                    //     },minWidth: 300,align:'center'}
+                    {title: '操作',
+                        templet: function (d) {
+                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agentAllMember" shiro:hasPermission="user:update">全部成员</button>'
+                        },minWidth: 300,align:'center'}
                 ]]
             });
         }

--
Gitblit v1.9.1