From 8b304deab47f12c2aed1f717298b4b0074835ce4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 17 Aug 2022 15:30:29 +0800
Subject: [PATCH] 20220810

---
 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html  |   84 ++++++++++++++--------------
 src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html |   46 +++++++-------
 2 files changed, 65 insertions(+), 65 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 2dad877..7583fa5 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -92,17 +92,17 @@
         background-color: #5FB878 !important;
     }
 </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="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>
-    </div>
-</script>
+<!--<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="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>-->
+<!--    </div>-->
+<!--</script>-->
 <!-- 表格操作栏 end -->
 <script data-th-inline="none" type="text/javascript">
     // 引入组件并初始化
@@ -221,21 +221,21 @@
                 elem: $view.find('table'),
                 id: 'userTable',
                 url: ctx + 'admin/mallMember/getMallMemberList',
-                toolbar:"#toolbar",
+                // toolbar:"#toolbar",
                 defaultToolbar:[],
                 cols: [[
-                    {type: 'checkbox'},
+                    // {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: '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: '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: '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) {
@@ -246,13 +246,13 @@
                                 return ''
                             }
                         }, minWidth: 100,align:'center'},
-                    {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', 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>'
+                             // + '<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" lay-event="updateReferer">修改推荐人</button>'
                         },minWidth: 200,align:'center', fixed:"right"}
                 ]]
             });
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 67a8c38..9021e12 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -22,38 +22,38 @@
                                         <div class="layui-input-inline">
                                             <select name="type">
                                                 <option value="">请选择</option>
-                                                <option value="1">静态收益</option>
-                                                <option value="2">直推奖</option>
-                                                <option value="3">代理收益</option>
-                                                <option value="4">排名收益</option>
-                                                <option value="5">总监收益</option>
-                                                <option value="6">社区店补</option>
-                                                <option value="7">一代收益</option>
-                                                <option value="8">提现</option>
-                                                <option value="9">转账</option>
+<!--                                                <option value="1">静态收益</option>-->
+<!--                                                <option value="2">直推奖</option>-->
+<!--                                                <option value="3">代理收益</option>-->
+<!--                                                <option value="4">排名收益</option>-->
+<!--                                                <option value="5">总监收益</option>-->
+<!--                                                <option value="6">社区店补</option>-->
+<!--                                                <option value="7">一代收益</option>-->
+<!--                                                <option value="8">提现</option>-->
+<!--                                                <option value="9">转账</option>-->
                                                 <option value="10">支付</option>
                                                 <option value="11">退款</option>
-                                                <option value="12">佣金转竞猜积分</option>
-                                                <option value="13">佣金转余额</option>
-                                                <option value="14">竞猜积分签到</option>
-                                                <option value="15">感恩奖</option>
-                                                <option value="16">系统拨付</option>
-                                                <option value="17">抽奖</option>
+<!--                                                <option value="12">佣金转竞猜积分</option>-->
+<!--                                                <option value="13">佣金转余额</option>-->
+<!--                                                <option value="14">竞猜积分签到</option>-->
+<!--                                                <option value="15">感恩奖</option>-->
+<!--                                                <option value="16">系统拨付</option>-->
+<!--                                                <option value="17">抽奖</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="flowType">
-                                                <option value="">请选择</option>
-                                                <option value="1">余额</option>
-                                                <option value="2">赠送积分</option>
-                                                <option value="3">竞猜积分</option>
-                                                <option value="4">佣金</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="flowType">-->
+<!--                                                <option value="">请选择</option>-->
+<!--                                                <option value="1">余额</option>-->
+<!--                                                <option value="2">赠送积分</option>-->
+<!--                                                <option value="3">竞猜积分</option>-->
+<!--                                                <option value="4">佣金</option>-->
+<!--                                            </select>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                 </div>
                             </div>
                             <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -160,20 +160,20 @@
                                 return ''
                             }
                         }, minWidth: 80,align:'center'},
-                    {field: 'flowType', title: '资金类型',
-                        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 '佣金'
-                            } else {
-                                return '-';
-                            }
-                        }, minWidth: 80,align:'center'},
+                    // {field: 'flowType', title: '资金类型',
+                    //     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 '佣金'
+                    //         } else {
+                    //             return '-';
+                    //         }
+                    //     }, minWidth: 80,align:'center'},
                     {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
                     {field: 'createdTime', title: '创建时间', minWidth: 180,align:'center'}
                 ]]
@@ -186,7 +186,7 @@
                 name: $searchForm.find('input[name="name"]').val().trim(),
                 phone: $searchForm.find('input[name="phone"]').val().trim(),
                 type: $searchForm.find("select[name='type']").val(),
-                flowType: $searchForm.find("select[name='flowType']").val(),
+                // flowType: $searchForm.find("select[name='flowType']").val(),
             };
         }
 

--
Gitblit v1.9.1