diff --git a/public/assets/js/fast.js b/public/assets/js/fast.js index 18d0ea51..22f12f5f 100644 --- a/public/assets/js/fast.js +++ b/public/assets/js/fast.js @@ -303,12 +303,13 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang', 'slimscroll'], functio //公共代码 $(function ($) { if (self === top) { - $('#main').slimScroll({height: $(window).height() + 'px'}); + $('div[role="main"]').slimScroll({height: $(window).height() + 'px'}); } else { var ScrollHeight = $('iframe', parent.document).height(); - if (ScrollHeight) { - $('#main').slimScroll({height: ScrollHeight + 'px'}); + if (!ScrollHeight || ScrollHeight === 100) { + ScrollHeight = $('.content-wrapper', parent.document).height(); } + $('div[role="main"]').slimScroll({height: ScrollHeight + 'px'}); } }); //配置Toastr的参数