From 2377b0ca8cd1839c80c6271a7067ea43a0b78aa7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:49:54 +0800
Subject: [PATCH] fix(order): 修复订单列表中提货方式的显示逻辑

---
 src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 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 8b1b6e3..458e70f 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -1,4 +1,4 @@
-<div class="layui-fluid layui-anim febs-anim" id="febs-member-list" lay-title="会员列表">
+<div class="layui-fluid layui-anim febs-anim" id="febs-member-list" lay-title="用户列表">
     <div class="layui-row febs-container">
         <div class="layui-col-md12">
             <div class="layui-card">
@@ -124,6 +124,14 @@
     <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="checkOrderSwitch">
     {{# } else { }}
     <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="checkOrderSwitch">
+    {{# } }}
+</script>
+
+<script type="text/html" id="checkLeaderSwitch">
+    {{# if(d.checkLeader === 1) { }}
+    <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="checkLeaderSwitch">
+    {{# } else { }}
+    <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="checkLeaderSwitch">
     {{# } }}
 </script>
 
@@ -318,6 +326,14 @@
             }
         })
 
+        form.on('switch(checkLeaderSwitch)', function (data) {
+            if (data.elem.checked) {
+                checkLeader(data.value);
+            } else {
+                checkLeader(data.value);
+            }
+        })
+
         form.on('switch(isSalesmanSwitch)', function (data) {
             if (data.elem.checked) {
                 upSale(data.value);
@@ -343,6 +359,13 @@
 
         function checkOrder(id) {
             febs.get(ctx + 'admin/mallMember/checkOrder/' + id, null, function () {
+                febs.alert.success('操作成功');
+                $query.click();
+            });
+        }
+
+        function checkLeader(id) {
+            febs.get(ctx + 'admin/mallMember/checkLeader/' + id, null, function () {
                 febs.alert.success('操作成功');
                 $query.click();
             });
@@ -385,7 +408,9 @@
                     {type: 'checkbox'},
                     {type: 'numbers', title: '', width: 80},
                     {field: 'checkOrder', title: '状态', templet: '#accountStatusSwitch', minWidth: 100,align:'center'},
-                    {field: 'checkOrder', title: '核销员', templet: '#checkOrderSwitch', minWidth: 100,align:'center'},
+                    {field: 'checkOrder', title: '活动核销', templet: '#checkOrderSwitch', minWidth: 100,align:'center'},
+                    {field: 'checkLeader', title: '自提核销', templet: '#checkLeaderSwitch', minWidth: 100,align:'center'},
+                    {field: 'isSalesman', title: '推销员设置', templet: '#isSalesmanSwitch', minWidth: 100,align:'center'},
                     // {title: '操作', toolbar: '#memberOption', minWidth: 200, align: 'center'},
                     {field: 'name', title: '用户名', minWidth: 100,align:'center'},
                     {field: 'realName', title: '真实姓名', minWidth: 100,align:'center'},
@@ -397,7 +422,6 @@
                     {field: 'totalScore', title: '总佣金', minWidth: 150,align:'center'},
                     {field: 'directorName', title: '会员等级', minWidth: 150,align:'center'},
                     {field: 'storeMasterName', title: '分销等级', minWidth: 150,align:'center'},
-                    {field: 'isSalesman', title: '推销员设置', templet: '#isSalesmanSwitch', minWidth: 100,align:'center'},
                     {field: 'inviteId', title: '邀请码', minWidth: 100,align:'center'},
                     {field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
                 ]]

--
Gitblit v1.9.1