diff --git a/css/okadmin.theme.css b/css/okadmin.theme.css index 5cd0562..0c35720 100644 --- a/css/okadmin.theme.css +++ b/css/okadmin.theme.css @@ -24,15 +24,20 @@ /**============================导航菜单的箭头 start============================*/ #navBar.ok-arrow2 .layui-nav-item a span, -#navBar.ok-arrow2 .layui-nav-item.layui-nav-itemed dd a span{ +#navBar.ok-arrow3 .layui-nav-item a span, +#navBar.ok-arrow2 .layui-nav-item.layui-nav-itemed dd a span, +#navBar.ok-arrow3 .layui-nav-item.layui-nav-itemed dd a span{ top: 14px!important; } #navBar.ok-arrow2 .layui-nav-item.layui-nav-itemed a span, -#navBar.ok-arrow2 .layui-nav-item dd.layui-nav-itemed a span { +#navBar.ok-arrow2 .layui-nav-item dd.layui-nav-itemed a span, +#navBar.ok-arrow3 .layui-nav-item.layui-nav-itemed a span, +#navBar.ok-arrow3 .layui-nav-item dd.layui-nav-itemed a span { top: 20px!important; } -#navBar.ok-arrow2 .layui-nav-item a span.layui-nav-more { +#navBar.ok-arrow2 .layui-nav-item a span.layui-nav-more, +#navBar.ok-arrow3 .layui-nav-item a span.layui-nav-more { font-family: ok-icon !important; font-size: 12px; font-weight: 600; @@ -45,8 +50,8 @@ border: 0; display: block; } -#navBar.ok-arrow2 .layui-nav-item a span.layui-nav-more:before { - content: "\e661"; +#navBar.ok-arrow2 .layui-nav-item a span.layui-nav-more:before, +#navBar.ok-arrow3 .layui-nav-item a span.layui-nav-more:before{ display: block; position: absolute; top: 0; @@ -56,8 +61,21 @@ width: 100%; font-size: 12px; color: #FFFFFF; + transition: all .2s ease-in-out; +} +#navBar.ok-arrow2 .layui-nav-item a span.layui-nav-more:before { + content: "\e661"; } #navBar.ok-arrow2 .layui-nav-itemed > a > span.layui-nav-more:before{ - content: "\e6de"; + /*content: "\e6de";*/ + transform: rotate(180deg); } + +#navBar.ok-arrow3 .layui-nav-item a span.layui-nav-more:before{ + content: "\e767"; +} +#navBar.ok-arrow3 .layui-nav-itemed > a > span.layui-nav-more:before{ + content: "\e768"; +} + /**============================导航菜单的箭头 end============================*/ \ No newline at end of file diff --git a/js/okconfig.js b/js/okconfig.js index 81b58cd..e6aca66 100644 --- a/js/okconfig.js +++ b/js/okconfig.js @@ -1,6 +1,6 @@ var okConfig = { theme: "blue_theme", //主题色orange_theme|blue_theme - menuArrow: "ok-arrow2", //导航箭头ok-arrow2:箭头,不填为默认样式 + menuArrow: "ok-arrow3", //导航箭头ok-arrow2|ok-arrow3,不填为默认样式 isTabMenu: true, //刷新后是否记住上次打开tab菜单 isTabRefresh: false, //是否开启切换刷新 }; \ No newline at end of file diff --git a/lib/layui/lay/okmodules/okTab.js b/lib/layui/lay/okmodules/okTab.js index 1328541..629ad45 100644 --- a/lib/layui/lay/okmodules/okTab.js +++ b/lib/layui/lay/okmodules/okTab.js @@ -64,7 +64,7 @@ layui.define(["element", "jquery", "okUtils"], function (exports) { $ = layui.jquery; var element = layui.element, layer = layui.layer; - config = okUtils.local("okConfig") || okConfig || {}; + config = okUtils.local("okConfig") || window.okConfig || {}; if(!config.isTabMenu){ okUtils.session("tabMenu", null); diff --git a/pages/system/setting.html b/pages/system/setting.html index 77a4baa..3e33b44 100644 --- a/pages/system/setting.html +++ b/pages/system/setting.html @@ -40,6 +40,7 @@