From e4ad10e6054534786163ef1985cd68127610fcd5 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 11 Apr 2022 11:42:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Menu.php  |  1 -
 app/admin/view/menu/index.html | 16 +++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php
index 908b3f86b..c4ac799e6 100644
--- a/app/admin/controller/Menu.php
+++ b/app/admin/controller/Menu.php
@@ -18,7 +18,6 @@ namespace app\admin\controller;
 
 use think\admin\Controller;
 use think\admin\extend\DataExtend;
-use think\admin\helper\QueryHelper;
 use think\admin\model\SystemMenu;
 use think\admin\service\AdminService;
 use think\admin\service\MenuService;
diff --git a/app/admin/view/menu/index.html b/app/admin/view/menu/index.html
index 64f7cb76c..30836e7f7 100644
--- a/app/admin/view/menu/index.html
+++ b/app/admin/view/menu/index.html
@@ -2,15 +2,15 @@
 
 {block name="button"}
 <!--{if $type eq 'index' and auth("add")}-->
-<button data-modal='{:url("add")}' class='layui-btn layui-btn-sm layui-btn-primary'>添加菜单</button>
+<button data-modal='{:url("add")}' data-table-id="MenuTable" class='layui-btn layui-btn-sm layui-btn-primary'>添加菜单</button>
 <!--{/if}-->
 
 <!--{if $type eq 'index' and auth("state")}-->
-<button data-action='{:url("state")}' data-rule="id#{key};status#0" class='layui-btn layui-btn-sm layui-btn-primary'>禁用菜单</button>
+<button data-action='{:url("state")}' data-table-id="MenuTable" data-rule="id#{sps};status#0" class='layui-btn layui-btn-sm layui-btn-primary'>禁用菜单</button>
 <!--{/if}-->
 
 <!--{if $type eq 'recycle' and auth("state")}-->
-<button data-action='{:url("state")}' data-rule="id#{key};status#1" class='layui-btn layui-btn-sm layui-btn-primary'>激活菜单</button>
+<button data-action='{:url("state")}' data-table-id="MenuTable" data-rule="id#{spp};status#1" class='layui-btn layui-btn-sm layui-btn-primary'>激活菜单</button>
 <!--{/if}-->
 {/block}
 
@@ -63,12 +63,14 @@
 
         // 数据状态切换操作
         layui.form.on('switch(StatusSwitch)', function (obj) {
-            var data = {id: obj.value, status: obj.elem.checked > 0 ? 1 : 0};
-            if (data.status > 0) data.id += obj.elem.dataset.path.replace(/-/g, ',');
+            var data = {status: obj.elem.checked > 0 ? 1 : 0};
+            data.id = data.status > 0 ? obj.elem.dataset.spp : obj.elem.dataset.sps;
             $.form.load("{:url('state')}", data, 'post', function (ret) {
                 if (ret.code < 1) $.msg.error(ret.info, 3, function () {
                     $('#MenuTable').trigger('reload');
-                }); else $('#MenuTable').trigger('reload');
+                }); else {
+                    $('#MenuTable').trigger('reload');
+                }
                 return false;
             }, false);
         });
@@ -79,7 +81,7 @@
 <script type="text/html" id="StatusSwitchTpl">
     <!--{if auth("state")}-->
     {{# if( "{$type|default='index'}"==='index' || (d.spc<1 || d.status<1)){ }}
-    <input type="checkbox" value="{{d.sps}}" data-path="{{d.path}}" lay-skin="switch" lay-text="已激活|已禁用" lay-filter="StatusSwitch" {{d.status>0?'checked':''}}>
+    <input type="checkbox" value="{{d.sps}}" data-sps="{{d.sps}}" data-spp="{{d.spp}}" lay-skin="switch" lay-text="已激活|已禁用" lay-filter="StatusSwitch" {{d.status>0?'checked':''}}>
     {{# }else{ }}
     {{d.status ? '<b class="color-green">已激活</b>' : '<b class="color-red">已禁用</b>'}}
     {{# } }}