From 3334acd494bbcf076298fbcac14db8037e7f3d13 Mon Sep 17 00:00:00 2001
From: Ricky <11748854@qq.com>
Date: Mon, 29 Jun 2020 16:37:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E6=BB=9A=E5=8A=A8=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E6=9D=A1=E5=A4=B1=E6=95=88=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=EF=BC=9A=E9=87=8D=E6=96=B0=E7=BB=91=E5=AE=9A=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=9B=B4=E5=A5=BD=E7=9A=84=E5=8A=9E=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/ruoyi/js/common.js       |  8 ++++++++
 .../src/main/resources/templates/system/user/user.html | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

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 68a43ba8a..e6b1fb97b 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -193,6 +193,14 @@ $(function() {
         var elem = this;
         var win = $(window);
         var doc = $('html, body');
+        if(typeof(opt) != "undefined"){
+        	if(opt.win != null){
+        		win = opt.win;
+        	}
+        	if(opt.doc != null){
+        		doc = opt.doc;
+        	}
+        }
         var options = $.extend({
             autohide: true,
             offset: 50,
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html
index 29b0442b1..3184eac02 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html
@@ -100,7 +100,15 @@
 		    if ($(this).width() < 769) {
 		        panehHidden = true;
 		    }
-		    $('body').layout({ initClosed: panehHidden, west__size: 185 });
+		    $('body').layout({ initClosed: panehHidden, west__size: 185});
+	     	// 回到顶部绑定
+	    	if ($.fn.toTop !== undefined) {
+	    		var opt = {
+	    			win:$('.ui-layout-center'),
+	    			doc:$('.ui-layout-center')
+	    		};
+	    		$('#scroll-up').toTop(opt);
+	    	}
 		    queryUserList();
 		    queryDeptTree();
 		});