diff --git a/application/extra/view/admin.main.html b/application/extra/view/admin.main.html index 5277f27a7..90853b820 100644 --- a/application/extra/view/admin.main.html +++ b/application/extra/view/admin.main.html @@ -7,6 +7,7 @@ {block name="title"}{$title|default=''} {if !empty($title)}-{/if} {:sysconf('app_name')} | {:sysconf('app_version')}{/block} + {block name="style"}{/block} diff --git a/public/static/admin/app.js b/public/static/admin/app.js index 902b2671f..61a34c0c3 100644 --- a/public/static/admin/app.js +++ b/public/static/admin/app.js @@ -29,7 +29,7 @@ require.config({ }, shim: { 'laydate': {deps: ['jquery']}, - 'layui': {deps: ['jquery', 'css!' + baseUrl + '../plugs/layui/css/layui.css']}, + 'layui': {deps: ['jquery']}, 'socket': {deps: ['//cdn.bootcss.com/swfobject/2.2/swfobject.min.js']}, 'bootstrap': {deps: ['jquery']}, 'bootstrap.multiselect': {deps: ['jquery', 'bootstrap', 'css!//cdn.bootcss.com/bootstrap-multiselect/0.9.13/css/bootstrap-multiselect.css']}, @@ -39,7 +39,7 @@ require.config({ 'admin.listen': {deps: ['jquery', 'jquery.cookies', 'admin.plugs']}, }, deps: ['css!//cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css'], - urlArgs: "t=" + (new Date()).getTime() +// urlArgs: "t=" + (new Date()).getTime() }); window.WEB_SOCKET_SWF_LOCATION = "//cdn.bootcss.com/web-socket-js/1.0.0/WebSocketMain.swf";