From 091c42859a9c40850006004aa3abc75a44bf7036 Mon Sep 17 00:00:00 2001
From: ZHAOTONGHUA <2066753415@qq.com>
Date: Tue, 26 Nov 2019 17:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=99=A9=E6=8F=90=E6=88=90=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/views/finance/ticheng-jisuan.php |  2 +-
 frontend/views/menu/index.php             | 15 ---------------
 frontend/views/permissions/index.php      | 15 +--------------
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/frontend/views/finance/ticheng-jisuan.php b/frontend/views/finance/ticheng-jisuan.php
index bf1f76a..ecfdaa8 100644
--- a/frontend/views/finance/ticheng-jisuan.php
+++ b/frontend/views/finance/ticheng-jisuan.php
@@ -131,7 +131,7 @@ use \common\libs\MyLib;
             </form>
             <div class="row">
                 <div class="col-md-12">
-                    <table id="listTable" class="table" data-toggle="table" data-height="450">
+                    <table id="listTable" class="table" data-toggle="table" data-height="470">
                         <thead class="bg-warning">
                         <tr>
                             <th data-field="state" data-checkbox="true"></th>
diff --git a/frontend/views/menu/index.php b/frontend/views/menu/index.php
index 3f1ee45..9722965 100644
--- a/frontend/views/menu/index.php
+++ b/frontend/views/menu/index.php
@@ -41,7 +41,6 @@ use \common\libs\MyLib;
 
 
 <?php $this->beginBlock('footer_js'); ?>
-<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
 <script src="/assets/js/plugins/bootstrap-table/bootstrap-table.min.js"></script>
 <script src="/assets/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js"></script>
 <script src="/assets/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
@@ -100,22 +99,8 @@ use \common\libs\MyLib;
             }
         });
     }
-
-    //固定表头
-    function fix(){
-        //table设置一定的高度
-        var tab=$("#listTable").attr('data-height');
-        $('.fixed-table-body').css({'height':tab-40});
-        //当浏览器窗口变化时，表头与表格不对齐解决
-        $('.table').bootstrapTable();
-        $(window).resize(function () {
-               $('.table').bootstrapTable('resetView');
-        });
-    }
-
     $(function() {
         search();
-        fix();
     });
 </script>
 <?php $this->endBlock(); ?>
diff --git a/frontend/views/permissions/index.php b/frontend/views/permissions/index.php
index 40253b3..b2f0ffe 100644
--- a/frontend/views/permissions/index.php
+++ b/frontend/views/permissions/index.php
@@ -21,7 +21,7 @@ use \common\libs\MyLib;
         <div class="ibox-content">
             <div class="row">
                 <div class="col-md-12">
-                    <table id="listTable" class="table" data-toggle="table" data-height="708">
+                    <table id="listTable">
                         <thead class="bg-warning">
                         <tr>
                             <th data-field="id">ID</th>
@@ -38,7 +38,6 @@ use \common\libs\MyLib;
 
 
 <?php $this->beginBlock('footer_js'); ?>
-<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
 <script src="/assets/js/plugins/bootstrap-table/bootstrap-table.min.js"></script>
 <script src="/assets/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js"></script>
 <script src="/assets/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
@@ -97,21 +96,9 @@ use \common\libs\MyLib;
             }
         });
     }
-    //固定表头
-        function fix(){
-            //table设置一定的高度
-            var tab=$("#listTable").attr('data-height');
-            $('.fixed-table-body').css({'height':tab-40});
-            //当浏览器窗口变化时，表头与表格不对齐解决
-            $('.table').bootstrapTable();
-            $(window).resize(function () {
-                   $('.table').bootstrapTable('resetView');
-            });
-        }
 
     $(function() {
         search();
-        fix();
     });
 </script>
 <?php $this->endBlock(); ?>