From 362dcfa151a27b72d9340ce0174abdc6e7199cb7 Mon Sep 17 00:00:00 2001 From: Anyon Date: Tue, 25 Apr 2017 14:48:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=9B=BE=E6=96=87=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/view/auth.index.html | 2 +- static/admin/app.js | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/application/admin/view/auth.index.html b/application/admin/view/auth.index.html index 57a4b5699..1e83eb9d7 100644 --- a/application/admin/view/auth.index.html +++ b/application/admin/view/auth.index.html @@ -50,7 +50,7 @@ {/if} {if auth("$classuri/apply")} | - 授权 + 授权 {/if} {if $vo.status eq 1 and auth("$classuri/forbid")} | diff --git a/static/admin/app.js b/static/admin/app.js index e8018e71c..e7b59c55e 100644 --- a/static/admin/app.js +++ b/static/admin/app.js @@ -24,7 +24,15 @@ require.config({ waitSeconds: 0, map: {'*': {css: baseUrl + '../plugs/require/require.css.js'}}, paths: { - // 开源插件 CDN + // 自定义插件(源码自创建或已修改源码) + 'admin.plugs': ['plugs'], + 'admin.listen': ['listen'], + 'layui': ['../plugs/layui/layui'], + 'ueditor': ['../plugs/ueditor/ueditor'], + 'template': ['../plugs/template/template'], + 'pcasunzips': ['../plugs/jquery/pcasunzips'], + 'laydate': ['../plugs/layui/laydate/laydate'], + // 开源插件(未修改源码) 'pace': ['../plugs/jquery/pace.min'], 'json': ['../plugs/jquery/json2.min'], 'print': ['../plugs/jquery/jquery.PrintArea'], @@ -36,14 +44,6 @@ require.config({ 'zeroclipboard': ['../plugs/ueditor/third-party/zeroclipboard/ZeroClipboard.min'], 'jquery.cookies': ['../plugs/jquery/jquery.cookie'], 'jquery.masonry': ['../plugs/jquery/masonry.min'], - // 自定义插件 - 'admin.plugs': ['plugs'], - 'admin.listen': ['listen'], - 'layui': ['../plugs/layui/layui'], - 'ueditor': ['../plugs/ueditor/ueditor'], - 'template': ['../plugs/template/template'], - 'pcasunzips': ['../plugs/jquery/pcasunzips'], - 'laydate': ['../plugs/layui/laydate/laydate'], }, shim: { 'layui': {deps: ['jquery']}, @@ -53,9 +53,9 @@ require.config({ 'jquery.cookies': {deps: ['jquery']}, 'jquery.masonry': {deps: ['jquery']}, 'admin.plugs': {deps: ['jquery', 'layui']}, - 'admin.listen': {deps: ['jquery', 'jquery.cookies', 'admin.plugs']}, - 'jquery.ztree': {deps: ['jquery', 'css!' + baseUrl + '../plugs/zTreeStyle/zTreeStyle.min.css']}, 'websocket': {deps: [baseUrl + '../plugs/socket/swfobject.min.js']}, + 'admin.listen': {deps: ['jquery', 'jquery.cookies', 'admin.plugs']}, + 'jquery.ztree': {deps: ['jquery', 'css!' + baseUrl + '../plugs/ztree/zTreeStyle/zTreeStyle.css']}, }, deps: ['css!' + baseUrl + '../plugs/awesome/css/font-awesome.min.css'], // 开启debug模式,不缓存资源