From 107c4d630c5b5c1b04f0d63a147e363b68dd1e8c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 27 Oct 2023 17:57:53 +0800
Subject: [PATCH] 版本管理

---
 src/main/resources/templates/febs/views/modules/chat/userPerkList.html |   91 +++++++++++++++++++++++++++------------------
 1 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/chat/userPerkList.html b/src/main/resources/templates/febs/views/modules/chat/userPerkList.html
index 41082c2..eeac505 100644
--- a/src/main/resources/templates/febs/views/modules/chat/userPerkList.html
+++ b/src/main/resources/templates/febs/views/modules/chat/userPerkList.html
@@ -8,24 +8,30 @@
                             <div class="layui-col-md10">
                                 <div class="layui-form-item">
                                     <div class="layui-inline">
-                                        <label class="layui-form-label">昵称:</label>
+                                        <label class="layui-form-label">电话号码:</label>
                                         <div class="layui-input-inline">
-                                            <input type="text" placeholder="昵称" name="nickName" autocomplete="off" class="layui-input">
+                                            <input type="text" placeholder="电话号码" name="phone" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
+<!--                                    <div class="layui-inline">-->
+<!--                                        <label class="layui-form-label">昵称:</label>-->
+<!--                                        <div class="layui-input-inline">-->
+<!--                                            <input type="text" placeholder="昵称" name="nickName" autocomplete="off" class="layui-input">-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                     <div class="layui-inline">
                                         <label class="layui-form-label">邀请码:</label>
                                         <div class="layui-input-inline">
-                                            <input type="text" placeholder="邀请码" name="inviteId" autocomplete="off" class="layui-input">
+                                            <input type="text" placeholder="邀请码(获取团队下的所有成员)" name="inviteId" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label">账号状态:</label>
+                                        <label class="layui-form-label">用户类型:</label>
                                         <div class="layui-input-inline">
-                                            <select name="status">
+                                            <select name="isRobot">
                                                 <option value="">请选择</option>
-                                                <option value="Y">正常</option>
-                                                <option value="N">禁用</option>
+                                                <option value="0">用户</option>
+                                                <option value="1">机器人</option>
                                             </select>
                                         </div>
                                     </div>
@@ -55,11 +61,18 @@
     <a lay-event="edit" shiro:hasPermission="user:update"><i
             class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
 </script>
-<script type="text/html" id="switchIsRobot">
-    {{# if(d.isRobot === 1) { }}
-    <input type="checkbox" value={{d.userId}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchIsRobot">
+<script type="text/html" id="switchGetBoom">
+    {{# if(d.getBoom === 1) { }}
+    <input type="checkbox" value={{d.userId}} lay-text="是|否" checked lay-skin="switch" lay-filter="switchGetBoom">
     {{# } else { }}
-    <input type="checkbox" value={{d.userId}} lay-text="是|否" lay-skin="switch" lay-filter="switchIsRobot">
+    <input type="checkbox" value={{d.userId}} lay-text="是|否" lay-skin="switch" lay-filter="switchGetBoom">
+    {{# } }}
+</script>
+<script type="text/html" id="isRobot-type">
+    {{# if(d.isRobot == 1) { }}
+    <span class="layui-badge febs-bg-green">机器人</span>
+    {{# } else { }}
+    <span class="layui-badge febs-bg-blue">用户</span>
     {{# } }}
 </script>
 <style>
@@ -67,12 +80,12 @@
         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="registerMember">添加会员</button>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</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="registerMember">添加会员</button>-->
+<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</button>-->
+<!--    </div>-->
+<!--</script>-->
 <!-- 表格操作栏 end -->
 <script data-th-inline="none" type="text/javascript">
     // 引入组件并初始化
@@ -112,9 +125,10 @@
         // 获取查询参数
         function getQueryParams() {
             return {
-                nickName: $searchForm.find('input[name="nickName"]').val().trim(),
+                phone: $searchForm.find('input[name="phone"]').val().trim(),
+                // nickName: $searchForm.find('input[name="nickName"]').val().trim(),
                 inviteId: $searchForm.find('input[name="inviteId"]').val().trim(),
-                status: $searchForm.find("select[name='status']").val()
+                isRobot: $searchForm.find("select[name='isRobot']").val()
             };
         }
 
@@ -128,17 +142,20 @@
                 totalRow: true ,// 开启合计行
                 cols: [[
                     {type: 'checkbox'},
-                    {field: 'userId', title: '标识', minWidth: 150,align:'left'},
-                    {field: 'nickName', title: '昵称', minWidth: 100,align:'left', totalRowText: '合计:',align:'center'},
-                    {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left',align:'center'},
-                    {field: 'phone', title: '注册号码', minWidth: 150,align:'left',align:'center'},
-                    {field: 'totalAmount', title: '账户总额', minWidth: 80,align:'left',totalRow: '{{= parseInt(d.totalAmount) }}',align:'center'},
-                    {field: 'avaAmount', title: '账户余额', minWidth: 80,align:'left',totalRow: '{{= parseInt(d.avaAmount) }}',align:'center'},
-                    {field: 'groupRedBagNum', title: '群红包数', minWidth: 80,align:'left'},
-                    {field: 'redBagTotalAmount', title: '红包总额', minWidth: 80,align:'left'},
-                    {field: 'redBagAvaAmount', title: '未领取', minWidth: 80,align:'left'},
-                    // {field: 'isRobot', title: '机器人', templet: '#switchIsRobot', minWidth: 80,align:'center'},
-                    {field: 'createTime', title: '注册时间', minWidth: 180,align:'center'},
+                    {field: 'userId', title: '标识', minWidth: 40,align:'center'},
+                    {field: 'phone', title: '电话号码', minWidth: 120,align:'center', totalRowText: '合计:'},
+                    {field: 'inviteId', title: '邀请码', minWidth: 100,align:'center',},
+                    {title: '用户类型', minWidth: 100,templet: '#isRobot-type',align:'center'},
+                    {field: 'totalAmount', title: '账户总额', minWidth: 80,align:'center',totalRow: '{{= parseInt(d.totalAmount) }}'},
+                    {field: 'avaAmount', title: '账户余额', minWidth: 80,align:'center',totalRow: '{{= parseInt(d.avaAmount) }}'},
+                    {field: 'groupRedBagNum', title: '群红包数', minWidth: 80,align:'center'},
+                    {field: 'redBagTotalAmount', title: '发红包总额', minWidth: 100,align:'center'},
+                    {field: 'redBagAvaAmount', title: '未被领取总额', minWidth: 120,align:'center'},
+                    {field: 'getRedbagAmount', title: '领取红包总额', minWidth: 120,align:'center'},
+                    {field: 'boomToAmount', title: '中雷扣除', minWidth: 120,align:'center'},
+                    {field: 'teamPerkAmount', title: '中雷补偿团队奖励', minWidth: 160,align:'center'},
+                    {field: 'getBoom', title: '中雷', templet: '#switchGetBoom', minWidth: 80,align:'center'},
+                    {field: 'createTime', title: '注册时间', minWidth: 160,align:'center'},
                 ]]
             });
         }
@@ -205,21 +222,21 @@
             });
         }
 
-        form.on('switch(switchIsRobot)', function (data) {
+        form.on('switch(switchGetBoom)', function (data) {
             if (data.elem.checked) {
-                openSwitchIsRobot(data.value);
+                openSwitchGetBoom(data.value);
             } else {
-                closeSwitchIsRobot(data.value);
+                closeSwitchGetBoom(data.value);
             }
         })
-        function openSwitchIsRobot(userId) {
-            febs.get(ctx + 'admin/chat/openSwitchIsRobot/' + userId, null, function () {
+        function openSwitchGetBoom(userId) {
+            febs.get(ctx + 'admin/chat/openSwitchGetBoom/' + userId, null, function () {
                 febs.alert.success('操作成功');
                 $reset.click();
             });
         }
-        function closeSwitchIsRobot(userId) {
-            febs.get(ctx + 'admin/chat/closeSwitchIsRobot/' + userId, null, function () {
+        function closeSwitchGetBoom(userId) {
+            febs.get(ctx + 'admin/chat/closeSwitchGetBoom/' + userId, null, function () {
                 febs.alert.success('操作成功');
                 $reset.click();
             });

--
Gitblit v1.9.1