diff --git a/admin/css/admin.css b/admin/css/admin.css index 234f8d8e2e24cdbe7e7f1ff6a68698d23b2ecceb..b81ffbf269bb284fcbd93542f2fde7d1f3b84879 100644 --- a/admin/css/admin.css +++ b/admin/css/admin.css @@ -489,4 +489,8 @@ body, text-align: center; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, .15); line-height: 30px; +} + +.message .layui-tab-title li:not(:last-child) { + border-right: 1px solid #eee; } \ No newline at end of file diff --git a/admin/data/menu.json b/admin/data/menu.json index d3d0a0e8e9da457bcbb08b656b6ee9ab2fd4cd17..b1973470186b28c799c182edc9ed9b640ec7caf6 100644 --- a/admin/data/menu.json +++ b/admin/data/menu.json @@ -50,7 +50,7 @@ "children": [{ "id": 201, "title": "基础组件", - "icon": "layui-icon layui-icon-console", + "icon": "layui-icon ", "type": 0, "children": [ { diff --git a/component/pear/css/module/menu.css b/component/pear/css/module/menu.css index d52aecd5ad3676e27afe96909af48c88237aa98a..e597914a365fa21683c2f0217fabd7bae55b7f94 100644 --- a/component/pear/css/module/menu.css +++ b/component/pear/css/module/menu.css @@ -51,6 +51,14 @@ margin-right: 12px; } +.pear-nav-tree .layui-nav-item dd a i { + margin-left: 26px; +} + +.pear-nav-tree .layui-nav-item dd dl dd a i{ + margin-left: 38px; +} + .pear-nav-tree .layui-nav-item a span { letter-spacing: 2px; font-size: 13.5px; @@ -153,11 +161,13 @@ .pear-nav-tree .layui-nav-hover a i { display: none; } +/* .pear-nav-tree .layui-nav-child dd a span { margin-left: 26px !important; -} +}*/ .pear-nav-tree .layui-nav-child dd a i { - display: none; + /*display: none;*/ + visibility: visible; } .pear-nav-tree .layui-nav-hover dd a span { margin-left: 0px !important; diff --git a/component/pear/module/theme.js b/component/pear/module/theme.js index b59ec9a9e8c80b3db3eebde9467753f5a38e9485..c020c011a7a5e6f23bbc5e28b015f624a5e6ee7c 100644 --- a/component/pear/module/theme.js +++ b/component/pear/module/theme.js @@ -73,6 +73,7 @@ layui.define(["jquery","layer"], function (exports) { style += '.pear-tab-menu .item:hover{background-color:'+color+'!important}' style += '.layui-form-danger:focus {border-color:#FF5722 !important}' style += '.pear-admin .user .layui-this a:hover{color:white!important}' + style += '.pear-admin .user a:hover{color:'+color+'!important}' style += '.pear-notice .layui-this{color:'+color+'!important}' style += '.layui-form-radio:hover *, .layui-form-radioed, .layui-form-radioed>i{color:' + color + ' !important}'; style += '.pear-btn:hover {color: '+color+';background-color: ' + second + ';}' diff --git a/component/pear/pear.js b/component/pear/pear.js index a3c064196aff7c515519dc04499969ea1f0905d1..6769551f0e1478752c1391b31f2c4262944a11db 100644 --- a/component/pear/pear.js +++ b/component/pear/pear.js @@ -1,43 +1,47 @@ -window.rootPath = (function(src) { - src = document.scripts[document.scripts.length - 1].src; - return src.substring(0, src.lastIndexOf("/") + 1); -})(); +//window.onload = (function(){ + window.rootPath = (function(src) { + src = document.currentScript.src || document.scripts[document.scripts.length - 1].src ; + console.log("src=",src,"sub=",src.substring(0, src.lastIndexOf("/") + 1)); + return src.substring(0, src.lastIndexOf("/") + 1); + })(); + console.log("rootPath=",rootPath); + layui.config({ + base: rootPath + "module/", + version: "3.9.6" + }).extend({ + admin: "admin", // 框架布局组件 + menu: "menu", // 数据菜单组件 + frame: "frame", // 内容页面组件 + tab: "tab", // 多选项卡组件 + echarts: "echarts", // 数据图表组件 + echartsTheme: "echartsTheme", // 数据图表主题 + hash: "hash", // 数据加密组件 + select: "select", // 下拉多选组件 + drawer: "drawer", // 抽屉弹层组件 + notice: "notice", // 消息提示组件 + step:"step", // 分布表单组件 + tag:"tag", // 多标签页组件 + popup:"popup", // 弹层封装 + treetable:"treetable", // 树状表格 + dtree:"dtree", // 树结构 + tinymce:"tinymce/tinymce", // 编辑器 + area:"area", // 省市级联 + count:"count", // 数字滚动组件 + topBar: "topBar", // 置顶组件 + button: "button", // 加载按钮 + design: "design", // 表单设计 + card: "card", // 数据卡片组件 + loading: "loading", // 加载组件 + cropper:"cropper", // 裁剪组件 + convert:"convert", // 数据转换 + yaml:"yaml", // yaml 解析组件 + context: "context", // 上下文组件 + http: "http", // ajax请求组件 + theme: "theme", // 主题转换 + message: "message", // 通知组件 + toast: "toast" // 消息通知 + }).use(['layer', 'theme'], function () { + layui.theme.changeTheme(window, false); + }); +//})(); -layui.config({ - base: rootPath + "module/", - version: "3.9.6" -}).extend({ - admin: "admin", // 框架布局组件 - menu: "menu", // 数据菜单组件 - frame: "frame", // 内容页面组件 - tab: "tab", // 多选项卡组件 - echarts: "echarts", // 数据图表组件 - echartsTheme: "echartsTheme", // 数据图表主题 - hash: "hash", // 数据加密组件 - select: "select", // 下拉多选组件 - drawer: "drawer", // 抽屉弹层组件 - notice: "notice", // 消息提示组件 - step:"step", // 分布表单组件 - tag:"tag", // 多标签页组件 - popup:"popup", // 弹层封装 - treetable:"treetable", // 树状表格 - dtree:"dtree", // 树结构 - tinymce:"tinymce/tinymce", // 编辑器 - area:"area", // 省市级联 - count:"count", // 数字滚动组件 - topBar: "topBar", // 置顶组件 - button: "button", // 加载按钮 - design: "design", // 表单设计 - card: "card", // 数据卡片组件 - loading: "loading", // 加载组件 - cropper:"cropper", // 裁剪组件 - convert:"convert", // 数据转换 - yaml:"yaml", // yaml 解析组件 - context: "context", // 上下文组件 - http: "http", // ajax请求组件 - theme: "theme", // 主题转换 - message: "message", // 通知组件 - toast: "toast" // 消息通知 -}).use(['layer', 'theme'], function () { - layui.theme.changeTheme(window, false); -}); \ No newline at end of file