From 702f3f613612cd6ba50f2638ee45c1dd37f88a9a Mon Sep 17 00:00:00 2001
From: ZHAOTONGHUA <2066753415@qq.com>
Date: Mon, 25 Nov 2019 17:00:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=A1=A8=E5=A4=B4=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=9C=A8js=E9=87=8C?=
 =?UTF-8?q?=E9=9D=A2=E8=AE=BE=E7=BD=AE=E4=B8=80=E5=AE=9A=E7=9A=84=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/views/menu/index.php | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/frontend/views/menu/index.php b/frontend/views/menu/index.php
index 344081e..6e4c8cd 100644
--- a/frontend/views/menu/index.php
+++ b/frontend/views/menu/index.php
@@ -102,21 +102,24 @@ use \common\libs\MyLib;
 
     //使得table有一定的高度，出现滚动条
     function table(){
-             //获取body高度
-             var a=$(".gray-bg").height();
-             //获取标题高度
-             var c=$('.ibox-title').height();
-             //获取table高度
-             var e=$("row").height();
-             var d=a-c-100;
-             if(e>d){
-                 $('.fixed-table-body').css({'height':d});
-                 console.log("滚动条");
-             }else{
-                $('.fixed-table-body').css({'height':e});
-                console.log("没有滚动条");
-             }
-        }
+         //获取body高度
+         var a=$(".gray-bg").height();
+         //获取条件选择高度
+         var b=$('#searchFrm').height();
+         //获取标题高度
+         var c=$('.ibox-title').height();
+         //获取table高度
+                  var e=$("row").height();
+                  var d=a-c-b-100;
+         if(e>d){
+                     $('.fixed-table-body').css({'height':d});
+                     console.log("滚动条");
+                  }else{
+                     $('.fixed-table-body').css({'height':e});
+                     console.log("没有滚动条");
+                   }
+
+    }
     $(function() {
         search();
         table();