From 53edc0eee839ebc3a3294cf6e85cdb795835c5b3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 17 Jan 2025 13:53:02 +0800
Subject: [PATCH] refactor(mall): 注释掉支付密码验证后的余额不足检查 - 在 ApiMallOrderInfoServiceImpl 类中的 payPassword 验证逻辑之后,注释掉了原本用于检查余额不足的代码段 -此修改可能旨在暂时跳过余额检查逻辑,以便进行其他功能的测试或开发

---
 src/main/resources/templates/febs/views/modules/mallMember/mallSalesManList.html |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallSalesManList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallSalesManList.html
index 8016d66..93de3c1 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallSalesManList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallSalesManList.html
@@ -30,6 +30,10 @@
                         .layui-table img{
                             max-width:100px
                         }
+                        ::-webkit-scrollbar {
+                            height: 20px !important;
+                            background-color: #f4f4f4;
+                        }
                     </style>
                 </div>
             </div>
@@ -76,8 +80,14 @@
                 layEvent = obj.event;
 
             if (layEvent === 'salesmanDel') {
-                febs.modal.confirm('删除', '确认删除['+data.name+']推荐员?', function () {
+                febs.modal.confirm('设置', '确认禁用['+data.name+']推荐员?', function () {
                     salesmanDel(data.id);
+                });
+            }
+
+            if (layEvent === 'salesmanUse') {
+                febs.modal.confirm('设置', '确认启用['+data.name+']推荐员?', function () {
+                    salesmanUse(data.id);
                 });
             }
             if (layEvent === 'salesmanUpdate') {
@@ -96,7 +106,13 @@
         });
         function salesmanDel(id) {
             febs.get(ctx + 'admin/mallMember/salesmanDel/' + id, null, function () {
-                febs.alert.success('删除成功');
+                febs.alert.success('操作成功');
+                $query.click();
+            });
+        }
+        function salesmanUse(id) {
+            febs.get(ctx + 'admin/mallMember/salesmanUse/' + id, null, function () {
+                febs.alert.success('操作成功');
                 $query.click();
             });
         }
@@ -134,12 +150,26 @@
                 cols: [[
                     {field: 'id', title: '序号', minWidth: 100,align:'left'},
                     {field: 'name', title: '姓名', minWidth: 100,align:'left'},
+                    {field: 'province', title: '省', minWidth: 100,align:'left'},
+                    {field: 'city', title: '市', minWidth: 100,align:'left'},
                     {field: 'remark', title: '备注', minWidth: 140,align:'left'},
+                    {field: 'state', title: '状态',
+                        templet: function (d) {
+                            if (d.state === 2) {
+                                return '<span style="color:red;">禁用</span>'
+                            } else{
+                                return '<span style="color:green;">启用</span>'
+                            }
+                        }, minWidth: 100,align:'center'},
                     {title: '操作',
                         templet: function (d) {
+                            if(d.state === 2){
                                 return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="salesmanUpdate" shiro:hasPermission="user:update">编辑</button>'
-                                    + '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="salesmanDel" shiro:hasPermission="user:update">删除</button>'
-
+                                    + '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-green" lay-event="salesmanUse" shiro:hasPermission="user:update">启用</button>'
+                            }else{
+                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="salesmanUpdate" shiro:hasPermission="user:update">编辑</button>'
+                                    + '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="salesmanDel" shiro:hasPermission="user:update">禁用</button>'
+                            }
                         },minWidth: 160,align:'center'}
                 ]]
             });

--
Gitblit v1.9.1