From 6c98fa6643e00e6a31b87d58184b6470f990e76f Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 25 Apr 2023 23:08:17 +0800
Subject: [PATCH] fix

---
 src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html |  115 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 78 insertions(+), 37 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 5334e89..0698b6a 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -29,21 +29,6 @@
                                             </select>
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <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>
-                                            </select>
-                                        </div>
-                                    </div>
                                 </div>
                             </div>
                             <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -66,27 +51,24 @@
 <!-- 表格操作栏 start -->
 <script type="text/html" id="mallmember-option">
     <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>
+<!--    <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) { }}
     <input type="checkbox" value={{d.id}} lay-text="正常|禁用" checked lay-skin="switch" lay-filter="switchStatus">
     {{# } else { }}
     <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">
-    {{# } 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">
     {{# } }}
 </script>
 <style>
@@ -98,11 +80,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 -->
@@ -177,6 +158,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('禁用成功');
@@ -234,17 +227,16 @@
                 totalRow: true ,// 开启合计行
                 cols: [[
                     {type: 'checkbox'},
-                    {field: 'phone', title: '账号', minWidth: 150,align:'left',hide:toolbarMallmember},
+                    {field: 'phone', title: '账号', minWidth: 150,align:'left'},
                     {field: 'name', title: '名称', minWidth: 100,align:'left', totalRowText: '合计:'},
                     {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
                     {field: 'balance', title: '余额', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.balance) }}'},
                     {field: 'prizeScore', title: '现金积分', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.prizeScore) }}'},
-                    {field: 'star', title: '贡献点', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.star) }}'},
-                    {field: 'totalScore', title: '补贴额度', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.totalScore) }}'},
+                    {field: 'commission', title: '佣金', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.commission) }}'},
+                    {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: 120,align:'left'},
-                    {field: 'director', title: '代理商', templet:'#switchDirector', minWidth: 120,align:'left' },
+                    {field: 'insideWith', title: '账号级别', templet:'#switchAccountLevel', minWidth: 120,align:'left'},
                     {field: 'accountType', title: '账号类型',
                         templet: function (d) {
                             if (d.accountType === 2) {
@@ -338,6 +330,19 @@
                 systemPay("修改余额", checkData[0].id, 1);
             }
 
+            if (layEvent === 'voucherUpdate') {
+                var checkData = table.checkStatus('userTable').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('userTable').data;
                 if (checkData.length <= 0) {
@@ -386,6 +391,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, {
                 btn: ['提交', '取消'],
@@ -408,6 +425,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);
@@ -431,5 +456,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