diff --git a/admin/images/background.svg b/admin/images/background.svg index 89c2597..290afd7 100644 --- a/admin/images/background.svg +++ b/admin/images/background.svg @@ -1,69 +1,33 @@ - - - - Group 21 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/admin/images/background2.svg b/admin/images/background2.svg deleted file mode 100644 index 290afd7..0000000 --- a/admin/images/background2.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js index 74416cc..30c27ef 100644 --- a/component/pear/module/admin.js +++ b/component/pear/module/admin.js @@ -465,7 +465,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm colors += ""; }) - return "
主题色
" + + return "
主题配色
" + colors + "
" } diff --git a/component/pear/module/theme.js b/component/pear/module/theme.js index 15ee296..ae34071 100644 --- a/component/pear/module/theme.js +++ b/component/pear/module/theme.js @@ -68,6 +68,7 @@ layui.define(["jquery","layer"], function (exports) { style += '.layui-layer-btn a:first-child{border-color:'+color+';background-color:'+color+'!important}'; style += '.layui-form-checkbox[lay-skin=primary]:hover i{border-color:'+color+'!important}' style += '.pear-tab-menu .item:hover{background-color:'+color+'!important}' + style += '.layui-form-danger:focus {border-color:#FF5722 !important}' var colorPane = $("#pear-admin-color"); if(colorPane.length>0){ colorPane.html(style); diff --git a/component/pear/module/treetable.js b/component/pear/module/treetable.js index 6c48cc5..b5a0724 100644 --- a/component/pear/module/treetable.js +++ b/component/pear/module/treetable.js @@ -1,7 +1,3 @@ -/** - * 树形表格 1.x - * date:2018-07-22 License By https://easyweb.vip - */ layui.define(['layer', 'table'], function (exports) { var $ = layui.jquery; var layer = layui.layer; diff --git a/config/pear.config.yml b/config/pear.config.yml index aac323c..08b80e9 100644 --- a/config/pear.config.yml +++ b/config/pear.config.yml @@ -74,6 +74,7 @@ other: keepLoad: "1200" ## 布局顶部主题 autoHead: false +## 头部配置 header: ## 站内消息，数据来源，通过 false 设置关闭 message: "admin/data/message.json" \ No newline at end of file diff --git a/login.html b/login.html index fef7e6d..c9cfa36 100644 --- a/login.html +++ b/login.html @@ -8,7 +8,7 @@ - +
diff --git a/view/document/menu.html b/view/document/menu.html index b2006b1..3337979 100644 --- a/view/document/menu.html +++ b/view/document/menu.html @@ -11,7 +11,7 @@
开发环境
- Menu 数据菜单对侧边菜单的便捷封装 + Menu 数据菜单对普通菜单的深度封装
diff --git a/view/document/table.html b/view/document/table.html index 8d89ea2..710dea0 100644 --- a/view/document/table.html +++ b/view/document/table.html @@ -36,8 +36,8 @@
- - - - -

@@ -168,21 +160,7 @@ defaultToolbar: [{ layEvent: 'refresh', icon: 'layui-icon-refresh', - }, 'filter', 'print', 'exports'], - done: function(res) { - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].id == "5" || res.data[i].id == "8") { - $("#more" + res.data[i].id).hide(); - continue; - } - - dropdown.suite("#more" + res.data[i].id, { - align: 'left', - data: res.data[i], - templateMenu: "moreTool", - }); - } - } + }, 'filter', 'print', 'exports'] }); table.on('tool(user-table)', function(obj) {