From 9775d5ec1446c5599e20b5f4d2a94beadd3afd8b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 17 May 2019 20:41:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A6=E4=BE=A7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AAli=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/css/skins.css   |  2 +-
 .../main/resources/static/ruoyi/js/common.js  | 23 ++++++++-----------
 .../main/resources/static/ruoyi/js/ry-ui.js   |  8 +++----
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/css/skins.css b/ruoyi-admin/src/main/resources/static/css/skins.css
index 0b0fb804..1c62b0fe 100644
--- a/ruoyi-admin/src/main/resources/static/css/skins.css
+++ b/ruoyi-admin/src/main/resources/static/css/skins.css
@@ -93,7 +93,7 @@
 	border-left: 3px solid #3c8dbc;
 }
 
-.skin-blue .nav>li.active:last-child {
+.skin-blue .nav>li.active>ul li.active:last-child {
 	border-left: none;
 }
 
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
index e7994b50..307542f7 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -12,20 +12,17 @@ $(function() {
 			})
 		})
 	}
-	// checkbox 事件绑定
-	if ($(".check-box").length > 0) {
-	    $(".check-box").iCheck({
-	    	checkboxClass: 'icheckbox-blue',
-			radioClass: 'iradio-blue',
-	    })
-	}
-	// radio 事件绑定
-	if ($(".radio-box").length > 0) {
-	    $(".radio-box").iCheck({
-	    	checkboxClass: 'icheckbox-blue',
-			radioClass: 'iradio-blue',
-	    })
+	
+	// iCheck单选框及复选框事件绑定
+	if ($.fn.iCheck !== undefined) {
+		$(".check-box:not(.noicheck),.radio-box:not(.noicheck)").each(function() {
+            $(this).iCheck({
+                checkboxClass: 'icheckbox-blue',
+                radioClass: 'iradio-blue',
+            })
+        })
 	}
+	 
 	// laydate 时间控件绑定
 	if ($(".select-time").length > 0) {
 		layui.use('laydate', function() {
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 00067e05..ec98ff77 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
@@ -139,7 +139,7 @@
     			    	layer.open({
         			        title: false,
         			        type: 1,
-        			        closeBtn: false,
+        			        closeBtn: true,
         			        shadeClose: true,
         			        area: ['auto', 'auto'],
         			        content: "<img src='" + src + "' />"
@@ -542,8 +542,7 @@
             	layer.confirm(content, {
         	        icon: 3,
         	        title: "系统提示",
-        	        btn: ['确认', '取消'],
-        	        btnclass: ['btn btn-primary', 'btn btn-danger'],
+        	        btn: ['确认', '取消']
         	    }, function (index) {
         	    	layer.close(index);
         	        callBack(true);
@@ -598,6 +597,7 @@
             	var _title = $.common.isEmpty(options.title) ? "系统窗口" : options.title; 
                 var _width = $.common.isEmpty(options.width) ? "800" : options.width; 
                 var _height = $.common.isEmpty(options.height) ? ($(window).height() - 50) : options.height;
+                var _btn = ['<i class="fa fa-check"></i> 确认', '<i class="fa fa-close"></i> 关闭'];
                 layer.open({
                     type: 2,
             		maxmin: true,
@@ -607,7 +607,7 @@
                     area: [_width + 'px', _height + 'px'],
                     content: _url,
                     shadeClose: true,
-                    btn: ['<i class="fa fa-check"></i> 确认', '<i class="fa fa-close"></i> 关闭'],
+                    btn: $.common.isEmpty(options.btn) ? _btn : options.btn,
                     yes: function (index, layero) {
                         options.callBack(index, layero)
                     }, cancel: function () {