From 381a62bd2c9f05b8f55cb7c703bf16ac5fc7a315 Mon Sep 17 00:00:00 2001
From: miss <994230062@qq.com>
Date: Fri, 25 Aug 2017 18:30:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=A5=97=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E5=99=A8=E8=B7=9D=E7=A6=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/subjects/_subject_list.html.erb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/subjects/_subject_list.html.erb b/app/views/subjects/_subject_list.html.erb
index 40fe62dd3..c12055791 100644
--- a/app/views/subjects/_subject_list.html.erb
+++ b/app/views/subjects/_subject_list.html.erb
@@ -63,12 +63,11 @@
 
 <script>
   //之下六行代码是为了解决实训套件的套件数目不到两排而造成的翻页器离底部距离太远的问题
-  var L = $(".sub-con").length;
-  if($(".newContainer").height()>849) {
+  var L = $(".pre_sub-con").length;
+  //console.log(L);
+  if($(".newContainer").height()>849&&L < 5) {
       var H = $(".newContainer").height() - 849;
-      if (L < 5) {
-          $("#new_expand").css("margin-top", H + "px");
-      }
+      $("#new_expand").css("margin-top", H + "px");
   }
     var timer="";
     $(".sub-con").hover(function(ev){