diff --git a/component/pear/css/pear-module/layout.css b/component/pear/css/pear-module/layout.css index 3a9ed38..58fc877 100644 --- a/component/pear/css/pear-module/layout.css +++ b/component/pear/css/pear-module/layout.css @@ -29,4 +29,65 @@ body::-webkit-scrollbar-thumb:hover { body::-webkit-scrollbar-corner { background: #f6f6f6; -} \ No newline at end of file +} + +.mainBox::-webkit-scrollbar { + width: 0px; + height: 0px; +} + +.mainBox::-webkit-scrollbar { + width: 6px; + height: 6px; +} + +.mainBox::-webkit-scrollbar-track { + background: white; + border-radius: 2px; +} + +.mainBox::-webkit-scrollbar-thumb { + background: #E6E6E6; + border-radius: 2px; +} + +.mainBox::-webkit-scrollbar-thumb:hover { + background: #E6E6E6; +} +.mainBox::-webkit-scrollbar-corner { + background: #f6f6f6; +} + +.mainBox { + width: 100%; + position: absolute; + top: 0px; + left: 0px; + bottom: 50px; + overflow: auto; +} + +.bottom { + width: 100%; + position: absolute; + bottom: 0px; + left: 0px; + height: 45px; + line-height: 45px; + background-color: #F8F8F8; + border-top: 1px solid #eee; +} + +.button-container { + position: absolute; + right: 15px; +} + +.main-container { + margin: 15px; +} + +.main-container .layui-form-item { + margin-bottom: 15px !important; + margin-top: 10px !important; +} diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js index 2ed67c6..ce315fb 100644 --- a/component/pear/module/admin.js +++ b/component/pear/module/admin.js @@ -368,11 +368,10 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'], }); }) - function getData() { $.ajaxSettings.async = false; var data = null; - $.getJSON("setting.json", function(result) { + $.getJSON("pear.config.json", function(result) { data = result; }); $.ajaxSettings.async = true; diff --git a/component/pear/module/tab.js b/component/pear/module/tab.js index 7a59a22..fe95b6f 100644 --- a/component/pear/module/tab.js +++ b/component/pear/module/tab.js @@ -372,8 +372,11 @@ layui.define(['jquery', 'element'], function(exports) { var nextNode = removeTab.next("li"); if(!removeTab.hasClass("layui-this")){ + + alert(id); removeTab.remove(); var tabContent = $(".layui-tab[lay-filter='" + elem + "']").find("iframe[id='" + id + "']").parent(); + return false; } diff --git a/setting.json b/pear.config.json similarity index 100% rename from setting.json rename to pear.config.json