From a5a4e287359179e74358b76f75140c3c898f2b1d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 12 Jan 2019 12:08:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E5=B1=82=E6=98=BE=E7=A4=BA=E5=9C=A8=E9=A1=B6=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/banner.txt           |  2 +-
 .../src/main/resources/static/ruoyi/js/ry-ui.js     | 13 +++++--------
 ruoyi-admin/src/main/resources/templates/index.html |  1 +
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt
index ce5af6a8..94662592 100644
--- a/ruoyi-admin/src/main/resources/banner.txt
+++ b/ruoyi-admin/src/main/resources/banner.txt
@@ -20,5 +20,5 @@ Spring Boot Version: ${spring-boot.version}
 //      ========`-.____`-.___\_____/___.-`____.-'========         //
 //                           `=---='                              //
 //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
-//             佛祖保佑       永不宕机      永无BUG                 //
+//             佛祖保佑       永不宕机      永无BUG               //
 ////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 05ddd5d3..65bc8fa8 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -515,7 +515,7 @@
             	    _width = 'auto';
             	    _height = 'auto';
             	}
-            	layer.open({
+            	top.layer.open({
             		type: 2,
             		area: [_width + 'px', _height + 'px'],
             		fix: false,
@@ -524,15 +524,12 @@
             		shade: 0.3,
             		title: $.table._option.modalName + "详细",
             		content: _url,
-            		btn: '关闭',
+            		btn: ['关闭'],
             	    // 弹层外区域关闭
             		shadeClose: true,
-            		success: function(layer) {
-            			layer[0].childNodes[3].childNodes[0].attributes[0].value='layui-layer-btn1';
-            		},
-            		btn1: function(index) {
-            			layer.close(index);
-            	    }
+            		cancel: function(index){
+            			return true;
+         	        }
             	});
             },
             // 删除信息
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index fa4cd80e..14f67403 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -135,6 +135,7 @@
 <script th:src="@{/js/plugins/metisMenu/jquery.metisMenu.js}"></script>
 <script th:src="@{/js/plugins/slimscroll/jquery.slimscroll.min.js}"></script>
 <script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
+<script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
 <script src="http://tajs.qq.com/stats?sId=62048022"></script>
 <script th:src="@{/ruoyi/js/ry-ui.js?v=3.1.0}"></script>
 <script th:src="@{/ruoyi/index.js}"></script>