diff --git a/public/assets/js/backend/index.js b/public/assets/js/backend/index.js index 74f2abcd..90ca20bc 100755 --- a/public/assets/js/backend/index.js +++ b/public/assets/js/backend/index.js @@ -284,13 +284,9 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi }); // 切换子菜单显示和菜单小图标的显示 - $("[data-menu]").on('click', function () { - if ($(this).data("menu") == 'show-submenu') { - createCookie('show_submenu', $(this).prop("checked") ? 1 : 0); - location.reload(); - } else { - nav.toggleClass("disable-top-badge"); - } + $("[data-menu='show-submenu']").on('click', function () { + createCookie('show_submenu', $(this).prop("checked") ? 1 : 0); + location.reload(); }); // 右侧控制栏切换 @@ -369,9 +365,6 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi if ($('ul.sidebar-menu').hasClass('show-submenu')) { $("[data-menu='show-submenu']").attr('checked', 'checked'); } - if (nav.hasClass('disable-top-badge')) { - $("[data-menu='disable-top-badge']").attr('checked', 'checked'); - } var sidebarExpandOnHover = localStorage.getItem('sidebarExpandOnHover'); if (sidebarExpandOnHover == '1') { diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js index 8d9ab869..baa2d2a5 100755 --- a/public/assets/js/require-form.js +++ b/public/assets/js/require-form.js @@ -216,7 +216,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio $(this).on('cancel.daterangepicker', function (ev, picker) { $(this).val('').trigger('blur'); }); - $(this).daterangepicker($.extend(true, options, $(this).data() || {}, $(this).data("daterangepicker-options") || {}), callback); + $(this).daterangepicker($.extend(true, options, $(this).data() || {}, $(this).data("daterangepicker-options") || {})); }); }); }