From 7d8b7ba2d5eb2a0ce8a40ca8244006c9585d9292 Mon Sep 17 00:00:00 2001
From: Ricky <hk_ricky@163.com>
Date: Mon, 12 Oct 2020 11:47:15 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 fc8c9b16..a4555406 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -191,8 +191,8 @@ $(function() {
     'use strict';
     $.fn.toTop = function(opt) {
         var elem = this;
-        var win = $(window);
-        var doc = $('html, body');
+        var win = (opt && opt.hasOwnProperty('win')) ? opt.win : $(window);
+        var doc = (opt && opt.hasOwnProperty('doc')) ? opt.doc : $('html, body');
         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 29b0442b..21d506c3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html
@@ -101,6 +101,14 @@
 		        panehHidden = true;
 		    }
 		    $('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();
 		});