diff --git a/config/view.php b/config/view.php index 9307b1e..8936617 100644 --- a/config/view.php +++ b/config/view.php @@ -28,7 +28,7 @@ return [ // 模板缓存 'display_cache' => false, // 模板编译缓存 - 'tpl_cache' => true, + 'tpl_cache' => false, // 字符替换 'tpl_replace_string' => [ '__STATIC__' => Env::get('adminsystem.static_path', '/static'), diff --git a/extend/base/admin/service/adminInitData/SystemMenu.php b/extend/base/admin/service/adminInitData/SystemMenu.php index 44ea1a7..2ccf7e9 100644 --- a/extend/base/admin/service/adminInitData/SystemMenu.php +++ b/extend/base/admin/service/adminInitData/SystemMenu.php @@ -3,7 +3,7 @@ $ul_system_menu = array( array( "id" => 227, "pid" => 99999999, - "title" => "后台首页", + "title" => "欢迎页", "icon" => "fa fa-home", "href" => "index/welcome", "params" => "", diff --git a/extend/base/admin/view/common/_require.html b/extend/base/admin/view/common/_require.html index 698b04c..c837607 100644 --- a/extend/base/admin/view/common/_require.html +++ b/extend/base/admin/view/common/_require.html @@ -5,6 +5,7 @@ {:event_view_content('AdminLayoutRequireBefore')} + diff --git a/extend/base/admin/view/index/index.html b/extend/base/admin/view/index/index.html index d1ed6e1..06cd5ef 100644 --- a/extend/base/admin/view/index/index.html +++ b/extend/base/admin/view/index/index.html @@ -10,7 +10,7 @@
- +
@@ -21,9 +21,7 @@ @@ -49,10 +47,12 @@
- 基本资料 + 基本资料
- 修改密码 + 修改密码
@@ -87,7 +87,12 @@
    + {if $Request.isMobile } +
  • +
  • + {else /}
  • + {/if} {:event_view_content('AdminMenuTab')}
@@ -107,9 +112,14 @@
+ {if $Request.isMobile } +
+
+ {else /}
+ {/if}
- + \ No newline at end of file diff --git a/extend/base/admin/view/index/index.js b/extend/base/admin/view/index/index.js index 22a744b..a9a02c0 100644 --- a/extend/base/admin/view/index/index.js +++ b/extend/base/admin/view/index/index.js @@ -4,7 +4,6 @@ $(function () { clearUrl: ua.url("ajax/clearCache"), // 缓存清理接口 urlHashLocation: true, // 是否打开hash定位 bgColorDefault: false, // 主题默认配置 - multiModule: true, // 是否开启多模块 menuChildOpen: false, // 是否默认展开菜单 loadingTime: 0, // 初始化加载时间 pageAnim: true, // iframe窗口动画 diff --git a/extend/base/admin/view/index/mobile.html b/extend/base/admin/view/index/mobile.html index 05a891b..c1250a9 100644 --- a/extend/base/admin/view/index/mobile.html +++ b/extend/base/admin/view/index/mobile.html @@ -3,7 +3,7 @@
基本
- +
@@ -18,7 +18,7 @@
{$vo.title}
{volist name='vo.children' id='vovo'} - +
diff --git a/extend/base/admin/view/index/mobile.js b/extend/base/admin/view/index/mobile.js index e69de29..4d2e0be 100644 --- a/extend/base/admin/view/index/mobile.js +++ b/extend/base/admin/view/index/mobile.js @@ -0,0 +1,3 @@ +$(function () { + ua.listen(); +}); \ No newline at end of file diff --git a/extend/base/admin/view/layout/default.html b/extend/base/admin/view/layout/default.html index 9ddf187..ec62d67 100644 --- a/extend/base/admin/view/layout/default.html +++ b/extend/base/admin/view/layout/default.html @@ -30,38 +30,6 @@ - {if $Request.isMobile } - -
-
-
-
- - - -
- {notempty name='session_admin'} -
-
-
-
- -
-
- {/notempty} -
-
-
- {/if} - {__CONTENT__} diff --git a/extend/base/common/service/MenuServiceBase.php b/extend/base/common/service/MenuServiceBase.php index efc6aca..a93636e 100644 --- a/extend/base/common/service/MenuServiceBase.php +++ b/extend/base/common/service/MenuServiceBase.php @@ -37,6 +37,9 @@ class MenuServiceBase ->find(); !empty($data) && $data['href'] = __url($data['href']); + $data['mb_title'] = '菜单'; + $data['mb_href'] = (string)url('admin/Index/mobile'); + return $data; } diff --git a/public/static/common/css/theme/_sicfi.scss b/public/static/common/css/theme/_sicfi.scss index ed87c40..ce6e81d 100644 --- a/public/static/common/css/theme/_sicfi.scss +++ b/public/static/common/css/theme/_sicfi.scss @@ -250,8 +250,7 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%, } -.layui-layout-admin .layui-header .layuimini-header-content>ul>.layui-nav-item.layui-this, -.layuimini-tool i:hover { +.layui-layout-admin .layui-header .layuimini-header-content>ul>.layui-nav-item.layui-this { background-color: $main-color !important; } @@ -496,10 +495,6 @@ $box-shape: polygon(0 0, 100% 0, 100% calc(100% - 10px), calc(100% - 10px) 100%, color: $black-color; } -.layui-layout-admin .layui-header .layuimini-tool i { - color: $main-color; -} - .color-red { color: $red-color !important; } diff --git a/public/static/common/css/theme/index.css b/public/static/common/css/theme/index.css index c2f9ed7..a04da56 100644 --- a/public/static/common/css/theme/index.css +++ b/public/static/common/css/theme/index.css @@ -332,8 +332,7 @@ .elem-style-sicfi .layui-layout-admin .layui-header .layui-nav .layui-nav-item { background-color: rgba(62, 251, 251, 0.5); } -.elem-style-sicfi .layui-layout-admin .layui-header .layuimini-header-content > ul > .layui-nav-item.layui-this, -.elem-style-sicfi .layuimini-tool i:hover { +.elem-style-sicfi .layui-layout-admin .layui-header .layuimini-header-content > ul > .layui-nav-item.layui-this { background-color: rgb(126, 252, 246) !important; } .elem-style-sicfi .layuimini-tab .layui-tab-control > li { diff --git a/public/static/plugs/lay-module/layuimini/miniAdmin.js b/public/static/plugs/lay-module/layuimini/miniAdmin.js index 2f8f67f..3d5b8e5 100644 --- a/public/static/plugs/lay-module/layuimini/miniAdmin.js +++ b/public/static/plugs/lay-module/layuimini/miniAdmin.js @@ -21,7 +21,6 @@ * @param options.clearUrl 后台清理缓存接口 * @param options.urlHashLocation URL地址hash定位 * @param options.bgColorDefault 默认皮肤 - * @param options.multiModule 是否开启多模块 * @param options.menuChildOpen 是否展开子菜单 * @param options.loadingTime 初始化加载时间 * @param options.pageAnim iframe窗口动画 @@ -32,7 +31,6 @@ options.clearUrl = options.clearUrl || null; options.urlHashLocation = options.urlHashLocation || false; options.bgColorDefault = options.bgColorDefault || 0; - options.multiModule = options.multiModule || false; options.menuChildOpen = options.menuChildOpen || false; options.loadingTime = options.loadingTime || 1; options.pageAnim = options.pageAnim || false; @@ -48,13 +46,11 @@ miniAdmin.listen(); miniMenu.render({ menuList: data.menuInfo, - multiModule: options.multiModule, menuChildOpen: options.menuChildOpen }); miniTab.render({ filter: 'layuiminiTab', urlHashLocation: options.urlHashLocation, - multiModule: options.multiModule, menuChildOpen: options.menuChildOpen, maxTabNum: options.maxTabNum, menuList: data.menuInfo, @@ -92,10 +88,18 @@ * @param data */ renderHome: function (data) { + // 初始化欢迎页面 sessionStorage.setItem('layuiminiHomeHref', data.href); $('#layuiminiHomeTabId').html('' + data.title + 'ဆ'); $('#layuiminiHomeTabId').attr('lay-id', data.href); $('#layuiminiHomeTabIframe').html(''); + + if($('#layuiminiHomeTabIdMobile').length == 1){ + $('#layuiminiHomeTabIdMobile').html('' + data.mb_title + 'ဆ'); + $('#layuiminiHomeTabIdMobile').attr('lay-id', data.mb_href); + $('#layuiminiHomeTabIframeMobile').html(''); + + } }, /** diff --git a/public/static/plugs/lay-module/layuimini/miniMenu.js b/public/static/plugs/lay-module/layuimini/miniMenu.js index 6e6ea9b..37d77f9 100644 --- a/public/static/plugs/lay-module/layuimini/miniMenu.js +++ b/public/static/plugs/lay-module/layuimini/miniMenu.js @@ -8,14 +8,13 @@ /** * 菜单初始化 * @param options.menuList 菜单数据信息 - * @param options.multiModule 是否开启多模块 * @param options.menuChildOpen 是否展开子菜单 */ render: function (options) { options.menuList = options.menuList || []; - options.multiModule = options.multiModule || false; options.menuChildOpen = options.menuChildOpen || false; - if (options.multiModule) { + + if (!ua.checkMobile()) { miniMenu.renderMultiModule(options.menuList, options.menuChildOpen); } else { miniMenu.renderSingleModule(options.menuList, options.menuChildOpen); @@ -37,7 +36,6 @@ if (menuChildOpen) childOpenClass = ' layui-nav-itemed'; leftMenuHtml = this.renderLeftMenu(menuList, { childOpenClass: childOpenClass }); $('.layui-layout-body').addClass('layuimini-single-module'); //单模块标识 - $('.layuimini-header-menu').remove(); $('.layuimini-menu-left').html(leftMenuHtml); element.init(); @@ -113,7 +111,7 @@ menuList = menuList || []; var me = this; var headerMenuHtml = '', - headerMobileMenuHtml = '', + leftMenuHtml = '', leftMenuCheckDefault = 'layui-this', childOpenClass = '', @@ -138,7 +136,7 @@ childOpenClass: childOpenClass, leftMenuCheckDefault: leftMenuCheckDefault }); - headerMobileMenuHtml += me.compileMenu({ id: id, menu: menu, id: id, icon: val.icon, title: val.title, }, true); + headerMenuCheckDefault = ""; leftMenuCheckDefault = "layui-hide"; return topMenuItemHtml; @@ -146,7 +144,7 @@ $('.layui-layout-body').addClass('layuimini-multi-module'); //多模块标识 $('.layuimini-menu-header-pc').html(headerMenuHtml); //电脑 $('.layuimini-menu-left').html(leftMenuHtml); - $('.layuimini-menu-header-mobile').html(headerMobileMenuHtml); //手机 + element.init(); }, @@ -221,19 +219,6 @@ element.init(); layer.close(loading); }); - - /** - * 手机端点开模块 - */ - $('body').on('click', '.layuimini-header-menu.layuimini-mobile-show dd', function () { - var loading = layer.load(0, { shade: false, time: 2 * 1000 }); - var check = $('.layuimini-tool [data-side-fold]').attr('data-side-fold'); - if (check === "1") { - $('.layuimini-site-mobile').trigger("click"); - element.init(); - } - layer.close(loading); - }); }, }; diff --git a/public/static/plugs/lay-module/layuimini/miniTab.js b/public/static/plugs/lay-module/layuimini/miniTab.js index 8ca540d..167ddf4 100644 --- a/public/static/plugs/lay-module/layuimini/miniTab.js +++ b/public/static/plugs/lay-module/layuimini/miniTab.js @@ -9,7 +9,6 @@ */ render: function (options) { options.filter = options.filter || null; - options.multiModule = options.multiModule || false; options.urlHashLocation = options.urlHashLocation || false; options.maxTabNum = options.maxTabNum || 20; options.menuList = options.menuList || []; // todo 后期菜单想改为不操作dom, 而是直接操作初始化传过来的数据 @@ -290,7 +289,7 @@ var tabId = $(this).attr('lay-id'); var id = $(this).attr('id'); var isCurrent = $(this).hasClass('layui-this'); - if (id !== 'layuiminiHomeTabId') { + if (id !== 'layuiminiHomeTabId' && id !== 'layuiminiHomeTabIdMobile') { if (closeType === 'all') { miniTab.delete(tabId); } else { @@ -343,7 +342,7 @@ $('.layuimini-tab .layui-tab-title li').each(function () { var tabId = $(this).attr('lay-id'); var id = $(this).attr('id'); - if (id !== 'layuiminiHomeTabId') { + if (id !== 'layuiminiHomeTabId' && id !== 'layuiminiHomeTabIdMobile') { if (closeType === 'all') { miniTab.delete(tabId); } else { @@ -366,7 +365,6 @@ */ listenSwitch: function (options) { options.filter = options.filter || null; - options.multiModule = options.multiModule || false; options.urlHashLocation = options.urlHashLocation || false; options.listenSwichCallback = options.listenSwichCallback || function () { }; element.on('tab(' + options.filter + ')', function (data) { @@ -382,7 +380,7 @@ $('.layuimini-menu-left').attr('layuimini-tab-tag', 'no'); } else { $('[layuimini-href]').parent().removeClass('layui-this'); - if (options.multiModule) { + if (!ua.checkMobile()) { miniTab.listenSwitchMultiModule(tabId); } else { miniTab.listenSwitchSingleModule(tabId); @@ -402,12 +400,13 @@ options.maxTabNum = options.maxTabNum || 20; options.homeInfo = options.homeInfo || {}; options.menuList = options.menuList || []; + if (!options.urlHashLocation) return false; var tabId = location.hash.replace(/^#/, ''); if (tabId === null || tabId === undefined || tabId === '') return false; // 判断是否为首页 - if (tabId === options.homeInfo.href) return false; + if (tabId === options.homeInfo.href || tabId === options.homeInfo.mb_href) return false; // 判断是否为右侧菜单 var menu = miniTab.searchMenu(tabId, options.menuList);