From 23767f8dbd12eb95d2121c8d3cd451e5a999b5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 17 Feb 2017 17:19:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=85=88=E5=8A=A0=E8=BD=BDlayui?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/extra/view/admin.main.html | 1 +
 public/static/admin/app.js             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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 @@
         <link rel="shortcut icon" href="{:sysconf('app_logo')}" />
         <title>{block name="title"}{$title|default=''}&nbsp;{if !empty($title)}-{/if}&nbsp;{:sysconf('app_name')}&nbsp;|&nbsp;{:sysconf('app_version')}{/block}</title>
         <link rel="stylesheet" href="__STATIC__/plugs/bootstrap/css/bootstrap.min.css"/>
+        <link rel="stylesheet" href="__STATIC__/plugs/layui/css/layui.css"/>
         <link rel="stylesheet" href="__STATIC__/theme/default/css/console.css">
         <link rel="stylesheet" href="__STATIC__/theme/default/css/animate.css">
         {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";