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(); });