From 174c9c111730e848ef1615114ac8ce4ebd946c8b Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 21 Mar 2024 11:25:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8A=A0=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E5=92=8C=E9=80=89=E6=8B=A9=E9=A1=B5=E6=95=B0=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                              | 9 ---------
 src/components/Modal/ActiveModal/ActiveModal.vue         | 1 -
 .../Modal/BargainGoodsModal/BargainGoodsModal.vue        | 1 -
 src/components/Modal/CouponModal/CouponModal.vue         | 1 -
 src/components/Modal/GoodsModal/GoodsModal.vue           | 1 -
 .../Modal/GrouponGoodsModal/GrouponGoodsModal.vue        | 1 -
 src/components/Modal/ServerModal/ServerModal.vue         | 1 -
 src/components/Modal/SharpGoodsModal/SharpGoodsModal.vue | 1 -
 src/components/Modal/ShopModal/ShopModal.vue             | 1 -
 src/components/Modal/UserModal/UserModal.vue             | 1 -
 src/components/Table/STable.js                           | 8 ++++----
 src/main.js                                              | 5 ++++-
 src/views/apps/bargain/active/Index.vue                  | 1 -
 src/views/apps/bargain/task/Index.vue                    | 1 -
 src/views/apps/bargain/task/modules/HelpModal.vue        | 1 -
 src/views/apps/collector/modules/CollectorList.vue       | 1 -
 src/views/apps/dealer/apply/Index.vue                    | 1 -
 src/views/apps/dealer/user/Index.vue                     | 2 +-
 src/views/apps/dealer/user/modules/FansModal.vue         | 1 -
 src/views/apps/dealer/withdraw/Index.vue                 | 1 -
 src/views/apps/eorder/template/Index.vue                 | 1 -
 src/views/apps/groupon/goods/Index.vue                   | 1 -
 src/views/apps/groupon/robot/Index.vue                   | 1 -
 src/views/apps/groupon/task/Index.vue                    | 1 -
 src/views/apps/groupon/task/modules/PeopleModal.vue      | 1 -
 src/views/apps/live/room/Index.vue                       | 1 -
 src/views/apps/sharp/active/Index.vue                    | 1 -
 src/views/apps/sharp/active/time/Index.vue               | 1 -
 src/views/apps/sharp/goods/Index.vue                     | 1 -
 src/views/content/article/Index.vue                      | 2 +-
 src/views/content/banner/Index.vue                       | 1 -
 src/views/content/files/Index.vue                        | 1 -
 src/views/content/help/Index.vue                         | 1 -
 src/views/content/maintenance/Index.vue                  | 1 -
 src/views/content/richText/Index.vue                     | 1 -
 src/views/goods/Index.vue                                | 1 -
 src/views/goods/comment/Index.vue                        | 1 -
 src/views/goods/import/List.vue                          | 1 -
 src/views/goods/service/Index.vue                        | 1 -
 src/views/goods/source/Index.vue                         | 1 -
 src/views/manage/role/Index.vue                          | 1 -
 src/views/manage/user/Index.vue                          | 1 -
 src/views/market/active/Index.vue                        | 1 -
 src/views/market/active/modules/ColList.vue              | 1 -
 src/views/market/coupon/Index.vue                        | 2 +-
 src/views/market/coupon/Receive.vue                      | 1 -
 src/views/market/points/Log.vue                          | 1 -
 src/views/market/presale/Index.vue                       | 1 -
 src/views/market/recharge/plan/Index.vue                 | 1 -
 src/views/market/settle/Index.vue                        | 1 -
 src/views/order/tools/modules/ExportList.vue             | 1 -
 src/views/page/Index.vue                                 | 1 -
 src/views/recovery/Index.vue                             | 1 -
 src/views/recovery/order/Index.vue                       | 1 -
 src/views/server/Index.vue                               | 1 -
 src/views/setting/delivery/express/Index.vue             | 1 -
 src/views/setting/delivery/template/Index.vue            | 1 -
 src/views/setting/payment/template/Index.vue             | 1 -
 src/views/setting/printer/Index.vue                      | 1 -
 src/views/store/address/Index.vue                        | 1 -
 src/views/store/shop/Index.vue                           | 1 -
 src/views/store/shop/clerk/Index.vue                     | 1 -
 src/views/store/shop/comment/List.vue                    | 1 -
 src/views/store/shop/order/Index.vue                     | 1 -
 src/views/user/Index.vue                                 | 2 +-
 src/views/user/balance/Index.vue                         | 1 -
 src/views/user/grade/Index.vue                           | 1 -
 src/views/user/recharge/Index.vue                        | 1 -
 68 files changed, 12 insertions(+), 79 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 75f0abe..4e49ada 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,13 +26,4 @@ export default {
   }
 }
 </script>
-<style>
-.container{
-  min-width: 1500px !important;
-}
-.ant-table-body {
-  overflow-x: scroll;
-  max-width: 1200px;
-}
-</style>
 
diff --git a/src/components/Modal/ActiveModal/ActiveModal.vue b/src/components/Modal/ActiveModal/ActiveModal.vue
index 64546b9..109f1ba 100644
--- a/src/components/Modal/ActiveModal/ActiveModal.vue
+++ b/src/components/Modal/ActiveModal/ActiveModal.vue
@@ -17,7 +17,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 活动入口图片 -->
diff --git a/src/components/Modal/BargainGoodsModal/BargainGoodsModal.vue b/src/components/Modal/BargainGoodsModal/BargainGoodsModal.vue
index 5b21f75..3cd8e9a 100644
--- a/src/components/Modal/BargainGoodsModal/BargainGoodsModal.vue
+++ b/src/components/Modal/BargainGoodsModal/BargainGoodsModal.vue
@@ -30,7 +30,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 商品信息 -->
diff --git a/src/components/Modal/CouponModal/CouponModal.vue b/src/components/Modal/CouponModal/CouponModal.vue
index bb219fb..73850a9 100644
--- a/src/components/Modal/CouponModal/CouponModal.vue
+++ b/src/components/Modal/CouponModal/CouponModal.vue
@@ -30,7 +30,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 优惠券名称 -->
diff --git a/src/components/Modal/GoodsModal/GoodsModal.vue b/src/components/Modal/GoodsModal/GoodsModal.vue
index 9e9b151..59ee4be 100644
--- a/src/components/Modal/GoodsModal/GoodsModal.vue
+++ b/src/components/Modal/GoodsModal/GoodsModal.vue
@@ -38,7 +38,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 商品信息 -->
diff --git a/src/components/Modal/GrouponGoodsModal/GrouponGoodsModal.vue b/src/components/Modal/GrouponGoodsModal/GrouponGoodsModal.vue
index 8376df9..4083d97 100644
--- a/src/components/Modal/GrouponGoodsModal/GrouponGoodsModal.vue
+++ b/src/components/Modal/GrouponGoodsModal/GrouponGoodsModal.vue
@@ -30,7 +30,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 商品信息 -->
diff --git a/src/components/Modal/ServerModal/ServerModal.vue b/src/components/Modal/ServerModal/ServerModal.vue
index 5423359..ba27ca8 100644
--- a/src/components/Modal/ServerModal/ServerModal.vue
+++ b/src/components/Modal/ServerModal/ServerModal.vue
@@ -38,7 +38,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 服务信息 -->
diff --git a/src/components/Modal/SharpGoodsModal/SharpGoodsModal.vue b/src/components/Modal/SharpGoodsModal/SharpGoodsModal.vue
index 1d60a3d..8c4fc28 100644
--- a/src/components/Modal/SharpGoodsModal/SharpGoodsModal.vue
+++ b/src/components/Modal/SharpGoodsModal/SharpGoodsModal.vue
@@ -30,7 +30,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 商品信息 -->
diff --git a/src/components/Modal/ShopModal/ShopModal.vue b/src/components/Modal/ShopModal/ShopModal.vue
index 2f66bdb..69ffd5f 100644
--- a/src/components/Modal/ShopModal/ShopModal.vue
+++ b/src/components/Modal/ShopModal/ShopModal.vue
@@ -39,7 +39,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 门店logo -->
diff --git a/src/components/Modal/UserModal/UserModal.vue b/src/components/Modal/UserModal/UserModal.vue
index db012bf..cc4e7d1 100644
--- a/src/components/Modal/UserModal/UserModal.vue
+++ b/src/components/Modal/UserModal/UserModal.vue
@@ -43,7 +43,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员头像 -->
diff --git a/src/components/Table/STable.js b/src/components/Table/STable.js
index e713ce8..6047ec5 100644
--- a/src/components/Table/STable.js
+++ b/src/components/Table/STable.js
@@ -33,7 +33,7 @@ export default {
     },
     showSizeChanger: {
       type: Boolean,
-      default: false
+      default: true
     },
     size: {
       type: String,
@@ -145,9 +145,9 @@ export default {
       this.localLoading = true
       const params = Object.assign({
         page: (pagination && pagination.current) ||
-          this.showPagination && this.localPagination.current || this.pageNum
-        // pageSize: (pagination && pagination.pageSize) ||
-        //   this.showPagination && this.localPagination.pageSize || this.pageSize
+          this.showPagination && this.localPagination.current || this.pageNum,
+        pageSize: (pagination && pagination.pageSize) ||
+          this.showPagination && this.localPagination.pageSize || this.pageSize
       },
         (sorter && sorter.field && {
           sortField: sorter.field
diff --git a/src/main.js b/src/main.js
index f48af1a..2317a5f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -22,9 +22,12 @@ import './global.less'
 Vue.config.productionTip = false
 Vue.prototype.pagination = {
   total: 0, // 数据总数
-  page: 1, // 当前页码
+  current: 1, // 当前页码
   pageSize: 15, // 每页显示条数
   showQuickJumper: true, // 显示跳转输入框
+  showSizeChanger: true,
+  pageSizeOptions: ['15', '30', '50'],
+  showTotal: total => `共 ${total} 条记录`,
 }
 // mount axios to `Vue.$http` and `this.$http`
 Vue.use(VueAxios)
diff --git a/src/views/apps/bargain/active/Index.vue b/src/views/apps/bargain/active/Index.vue
index b0ba7e1..2ed9712 100644
--- a/src/views/apps/bargain/active/Index.vue
+++ b/src/views/apps/bargain/active/Index.vue
@@ -27,7 +27,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1450 }"
     >
diff --git a/src/views/apps/bargain/task/Index.vue b/src/views/apps/bargain/task/Index.vue
index e5548d7..a4e9754 100644
--- a/src/views/apps/bargain/task/Index.vue
+++ b/src/views/apps/bargain/task/Index.vue
@@ -37,7 +37,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1400 }"
     >
diff --git a/src/views/apps/bargain/task/modules/HelpModal.vue b/src/views/apps/bargain/task/modules/HelpModal.vue
index 758ef31..d6444ea 100644
--- a/src/views/apps/bargain/task/modules/HelpModal.vue
+++ b/src/views/apps/bargain/task/modules/HelpModal.vue
@@ -16,7 +16,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->
diff --git a/src/views/apps/collector/modules/CollectorList.vue b/src/views/apps/collector/modules/CollectorList.vue
index b9784ad..b7ede88 100644
--- a/src/views/apps/collector/modules/CollectorList.vue
+++ b/src/views/apps/collector/modules/CollectorList.vue
@@ -6,7 +6,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 开始时间 -->
diff --git a/src/views/apps/dealer/apply/Index.vue b/src/views/apps/dealer/apply/Index.vue
index e99d4c4..386fc86 100644
--- a/src/views/apps/dealer/apply/Index.vue
+++ b/src/views/apps/dealer/apply/Index.vue
@@ -19,7 +19,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->
diff --git a/src/views/apps/dealer/user/Index.vue b/src/views/apps/dealer/user/Index.vue
index 4e8e933..2d12a38 100644
--- a/src/views/apps/dealer/user/Index.vue
+++ b/src/views/apps/dealer/user/Index.vue
@@ -13,7 +13,7 @@
         </a-col>
       </a-row>
     </div>
-    <s-table ref="table" rowKey="user_id" :columns="columns" :data="loadData" :pageSize="15"
+    <s-table ref="table" rowKey="user_id" :columns="columns" :data="loadData"
       :pagination="pagination">
       <!-- 会员信息 -->
       <template slot="user" slot-scope="text">
diff --git a/src/views/apps/dealer/user/modules/FansModal.vue b/src/views/apps/dealer/user/modules/FansModal.vue
index a76d890..bca6471 100644
--- a/src/views/apps/dealer/user/modules/FansModal.vue
+++ b/src/views/apps/dealer/user/modules/FansModal.vue
@@ -37,7 +37,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->
diff --git a/src/views/apps/dealer/withdraw/Index.vue b/src/views/apps/dealer/withdraw/Index.vue
index cae8de2..b2e9e55 100644
--- a/src/views/apps/dealer/withdraw/Index.vue
+++ b/src/views/apps/dealer/withdraw/Index.vue
@@ -43,7 +43,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->
diff --git a/src/views/apps/eorder/template/Index.vue b/src/views/apps/eorder/template/Index.vue
index 77541a7..844bdbb 100644
--- a/src/views/apps/eorder/template/Index.vue
+++ b/src/views/apps/eorder/template/Index.vue
@@ -27,7 +27,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- API网关 -->
diff --git a/src/views/apps/groupon/goods/Index.vue b/src/views/apps/groupon/goods/Index.vue
index b00c394..ac98c4e 100644
--- a/src/views/apps/groupon/goods/Index.vue
+++ b/src/views/apps/groupon/goods/Index.vue
@@ -85,7 +85,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1300 }"
     >
diff --git a/src/views/apps/groupon/robot/Index.vue b/src/views/apps/groupon/robot/Index.vue
index c05c961..5529582 100644
--- a/src/views/apps/groupon/robot/Index.vue
+++ b/src/views/apps/groupon/robot/Index.vue
@@ -11,7 +11,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 用户头像 -->
diff --git a/src/views/apps/groupon/task/Index.vue b/src/views/apps/groupon/task/Index.vue
index 058adc7..dfd6495 100644
--- a/src/views/apps/groupon/task/Index.vue
+++ b/src/views/apps/groupon/task/Index.vue
@@ -41,7 +41,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1450 }"
     >
diff --git a/src/views/apps/groupon/task/modules/PeopleModal.vue b/src/views/apps/groupon/task/modules/PeopleModal.vue
index 6f0f25e..28b3cea 100644
--- a/src/views/apps/groupon/task/modules/PeopleModal.vue
+++ b/src/views/apps/groupon/task/modules/PeopleModal.vue
@@ -18,7 +18,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 用户信息 -->
diff --git a/src/views/apps/live/room/Index.vue b/src/views/apps/live/room/Index.vue
index 7ea915f..97679fc 100644
--- a/src/views/apps/live/room/Index.vue
+++ b/src/views/apps/live/room/Index.vue
@@ -32,7 +32,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 直播时间 -->
diff --git a/src/views/apps/sharp/active/Index.vue b/src/views/apps/sharp/active/Index.vue
index cc1ad92..dbe11f0 100644
--- a/src/views/apps/sharp/active/Index.vue
+++ b/src/views/apps/sharp/active/Index.vue
@@ -19,7 +19,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 活动状态 -->
diff --git a/src/views/apps/sharp/active/time/Index.vue b/src/views/apps/sharp/active/time/Index.vue
index 8e8aacf..e843a00 100644
--- a/src/views/apps/sharp/active/time/Index.vue
+++ b/src/views/apps/sharp/active/time/Index.vue
@@ -19,7 +19,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 活动状态 -->
diff --git a/src/views/apps/sharp/goods/Index.vue b/src/views/apps/sharp/goods/Index.vue
index e1e3b47..6c39524 100644
--- a/src/views/apps/sharp/goods/Index.vue
+++ b/src/views/apps/sharp/goods/Index.vue
@@ -27,7 +27,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1450 }"
     >
diff --git a/src/views/content/article/Index.vue b/src/views/content/article/Index.vue
index ccbfea6..917ede9 100644
--- a/src/views/content/article/Index.vue
+++ b/src/views/content/article/Index.vue
@@ -41,7 +41,7 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
+      :pagination="pagination"
       :scroll="{ x: 1400 }"
     >
       <!-- 文章封面图 -->
diff --git a/src/views/content/banner/Index.vue b/src/views/content/banner/Index.vue
index c816227..ece5d62 100644
--- a/src/views/content/banner/Index.vue
+++ b/src/views/content/banner/Index.vue
@@ -10,7 +10,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- Banner图 -->
diff --git a/src/views/content/files/Index.vue b/src/views/content/files/Index.vue
index 8c6352c..45d2e2a 100644
--- a/src/views/content/files/Index.vue
+++ b/src/views/content/files/Index.vue
@@ -73,7 +73,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1300 }"
     >
diff --git a/src/views/content/help/Index.vue b/src/views/content/help/Index.vue
index dcae440..97021ee 100644
--- a/src/views/content/help/Index.vue
+++ b/src/views/content/help/Index.vue
@@ -10,7 +10,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 内容 -->
diff --git a/src/views/content/maintenance/Index.vue b/src/views/content/maintenance/Index.vue
index 644b48e..2b7545c 100644
--- a/src/views/content/maintenance/Index.vue
+++ b/src/views/content/maintenance/Index.vue
@@ -35,7 +35,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1400 }"
     >
diff --git a/src/views/content/richText/Index.vue b/src/views/content/richText/Index.vue
index 3e19e25..a2ce5b7 100644
--- a/src/views/content/richText/Index.vue
+++ b/src/views/content/richText/Index.vue
@@ -10,7 +10,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 内容 -->
diff --git a/src/views/goods/Index.vue b/src/views/goods/Index.vue
index 642d57a..6be4b82 100644
--- a/src/views/goods/Index.vue
+++ b/src/views/goods/Index.vue
@@ -70,7 +70,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1450 }"
     >
diff --git a/src/views/goods/comment/Index.vue b/src/views/goods/comment/Index.vue
index ee69517..e330316 100644
--- a/src/views/goods/comment/Index.vue
+++ b/src/views/goods/comment/Index.vue
@@ -44,7 +44,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1450 }"
     >
diff --git a/src/views/goods/import/List.vue b/src/views/goods/import/List.vue
index 4c6af0a..793bd61 100644
--- a/src/views/goods/import/List.vue
+++ b/src/views/goods/import/List.vue
@@ -37,7 +37,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 开始时间 -->
diff --git a/src/views/goods/service/Index.vue b/src/views/goods/service/Index.vue
index 3e59da5..0575cac 100644
--- a/src/views/goods/service/Index.vue
+++ b/src/views/goods/service/Index.vue
@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1300 }"
     >
diff --git a/src/views/goods/source/Index.vue b/src/views/goods/source/Index.vue
index 2b326ae..66c6bf9 100644
--- a/src/views/goods/source/Index.vue
+++ b/src/views/goods/source/Index.vue
@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1300 }"
     >
diff --git a/src/views/manage/role/Index.vue b/src/views/manage/role/Index.vue
index bc5ca3e..5fc638b 100644
--- a/src/views/manage/role/Index.vue
+++ b/src/views/manage/role/Index.vue
@@ -11,7 +11,6 @@
       :dataSource="roleList"
       :defaultExpandAllRows="false"
       :expandIconColumnIndex="1"
-      :pageSize="15"
       :pagination="pagination"
       :loading="isLoading"
     >
diff --git a/src/views/manage/user/Index.vue b/src/views/manage/user/Index.vue
index 5a579d0..2782188 100644
--- a/src/views/manage/user/Index.vue
+++ b/src/views/manage/user/Index.vue
@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <div slot="user_name" slot-scope="text, item">
diff --git a/src/views/market/active/Index.vue b/src/views/market/active/Index.vue
index 807b1b4..628c566 100644
--- a/src/views/market/active/Index.vue
+++ b/src/views/market/active/Index.vue
@@ -10,7 +10,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 活动入口图片 -->
diff --git a/src/views/market/active/modules/ColList.vue b/src/views/market/active/modules/ColList.vue
index a4d571b..6e49af1 100644
--- a/src/views/market/active/modules/ColList.vue
+++ b/src/views/market/active/modules/ColList.vue
@@ -18,7 +18,6 @@
         :loading="isLoading"
         :columns="columns"
         :data="loadData"
-        :pageSize="15"
         :pagination="pagination"
       >
         <!-- 活动入口图片 -->
diff --git a/src/views/market/coupon/Index.vue b/src/views/market/coupon/Index.vue
index 65faa54..ef560b8 100644
--- a/src/views/market/coupon/Index.vue
+++ b/src/views/market/coupon/Index.vue
@@ -17,7 +17,7 @@
         </a-col>
       </a-row>
     </div>
-    <s-table ref="table" rowKey="coupon_id" :loading="isLoading" :columns="columns" :data="loadData" :pageSize="15"
+    <s-table ref="table" rowKey="coupon_id" :loading="isLoading" :columns="columns" :data="loadData"
       :pagination="pagination">
       <!-- 优惠券类型 -->
       <template slot="coupon_type" slot-scope="text">
diff --git a/src/views/market/coupon/Receive.vue b/src/views/market/coupon/Receive.vue
index a43bd56..504411b 100644
--- a/src/views/market/coupon/Receive.vue
+++ b/src/views/market/coupon/Receive.vue
@@ -26,7 +26,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->
diff --git a/src/views/market/points/Log.vue b/src/views/market/points/Log.vue
index 600359d..0e76d25 100644
--- a/src/views/market/points/Log.vue
+++ b/src/views/market/points/Log.vue
@@ -23,7 +23,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->
diff --git a/src/views/market/presale/Index.vue b/src/views/market/presale/Index.vue
index 9ecfaba..f4415be 100644
--- a/src/views/market/presale/Index.vue
+++ b/src/views/market/presale/Index.vue
@@ -10,7 +10,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 状态 -->
diff --git a/src/views/market/recharge/plan/Index.vue b/src/views/market/recharge/plan/Index.vue
index 956dc4b..3ce4fea 100644
--- a/src/views/market/recharge/plan/Index.vue
+++ b/src/views/market/recharge/plan/Index.vue
@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 充值金额 -->
diff --git a/src/views/market/settle/Index.vue b/src/views/market/settle/Index.vue
index ac44e64..931dd52 100644
--- a/src/views/market/settle/Index.vue
+++ b/src/views/market/settle/Index.vue
@@ -7,7 +7,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       style="width: 100%;overflow-y: auto;"
     >
diff --git a/src/views/order/tools/modules/ExportList.vue b/src/views/order/tools/modules/ExportList.vue
index bd60660..5334be0 100644
--- a/src/views/order/tools/modules/ExportList.vue
+++ b/src/views/order/tools/modules/ExportList.vue
@@ -5,7 +5,6 @@
     :loading="isLoading"
     :columns="columns"
     :data="loadData"
-    :pageSize="15"
     :pagination="pagination"
   >
     <!-- 下单时间 -->
diff --git a/src/views/page/Index.vue b/src/views/page/Index.vue
index be3b2ee..c093a72 100644
--- a/src/views/page/Index.vue
+++ b/src/views/page/Index.vue
@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 页面类型 -->
diff --git a/src/views/recovery/Index.vue b/src/views/recovery/Index.vue
index a576a32..d60f89c 100644
--- a/src/views/recovery/Index.vue
+++ b/src/views/recovery/Index.vue
@@ -59,7 +59,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 回收图片 -->
diff --git a/src/views/recovery/order/Index.vue b/src/views/recovery/order/Index.vue
index 855af4d..0672810 100644
--- a/src/views/recovery/order/Index.vue
+++ b/src/views/recovery/order/Index.vue
@@ -59,7 +59,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 回收图片 -->
diff --git a/src/views/server/Index.vue b/src/views/server/Index.vue
index 1551e30..d08992c 100644
--- a/src/views/server/Index.vue
+++ b/src/views/server/Index.vue
@@ -59,7 +59,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 服务图片 -->
diff --git a/src/views/setting/delivery/express/Index.vue b/src/views/setting/delivery/express/Index.vue
index 4f85e0f..3a24e0b 100644
--- a/src/views/setting/delivery/express/Index.vue
+++ b/src/views/setting/delivery/express/Index.vue
@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 操作 -->
diff --git a/src/views/setting/delivery/template/Index.vue b/src/views/setting/delivery/template/Index.vue
index 2c6f102..007ad86 100644
--- a/src/views/setting/delivery/template/Index.vue
+++ b/src/views/setting/delivery/template/Index.vue
@@ -27,7 +27,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 计费方式 -->
diff --git a/src/views/setting/payment/template/Index.vue b/src/views/setting/payment/template/Index.vue
index d5bdd7d..0543f97 100644
--- a/src/views/setting/payment/template/Index.vue
+++ b/src/views/setting/payment/template/Index.vue
@@ -19,7 +19,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 支付方式 -->
diff --git a/src/views/setting/printer/Index.vue b/src/views/setting/printer/Index.vue
index b4501c4..a290096 100644
--- a/src/views/setting/printer/Index.vue
+++ b/src/views/setting/printer/Index.vue
@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 打印机类型 -->
diff --git a/src/views/store/address/Index.vue b/src/views/store/address/Index.vue
index d165235..c889ed9 100644
--- a/src/views/store/address/Index.vue
+++ b/src/views/store/address/Index.vue
@@ -31,7 +31,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 详细地址 -->
diff --git a/src/views/store/shop/Index.vue b/src/views/store/shop/Index.vue
index 03ffd45..b283426 100644
--- a/src/views/store/shop/Index.vue
+++ b/src/views/store/shop/Index.vue
@@ -31,7 +31,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 门店logo -->
diff --git a/src/views/store/shop/clerk/Index.vue b/src/views/store/shop/clerk/Index.vue
index f9f2c52..1cc553e 100644
--- a/src/views/store/shop/clerk/Index.vue
+++ b/src/views/store/shop/clerk/Index.vue
@@ -34,7 +34,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->
diff --git a/src/views/store/shop/comment/List.vue b/src/views/store/shop/comment/List.vue
index ae69f49..6b42f84 100644
--- a/src/views/store/shop/comment/List.vue
+++ b/src/views/store/shop/comment/List.vue
@@ -18,7 +18,6 @@
         :loading="isLoading"
         :columns="columns"
         :data="loadData"
-        :pageSize="15"
         :pagination="pagination"
       >
         <span slot="image" slot-scope="text">
diff --git a/src/views/store/shop/order/Index.vue b/src/views/store/shop/order/Index.vue
index b1feb94..afad283 100644
--- a/src/views/store/shop/order/Index.vue
+++ b/src/views/store/shop/order/Index.vue
@@ -31,7 +31,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 核销门店 -->
diff --git a/src/views/user/Index.vue b/src/views/user/Index.vue
index cdfdd1d..b072a5c 100644
--- a/src/views/user/Index.vue
+++ b/src/views/user/Index.vue
@@ -25,7 +25,7 @@
         </a-form>
       </a-row>
     </div>
-    <s-table ref="table" rowKey="user_id" :loading="isLoading" :columns="columns" :data="loadData" :pageSize="15"
+    <s-table ref="table" rowKey="user_id" :loading="isLoading" :columns="columns" :data="loadData"
       :pagination="pagination">
       <!-- 会员头像 -->
       <span slot="avatar_url" slot-scope="text">
diff --git a/src/views/user/balance/Index.vue b/src/views/user/balance/Index.vue
index c66f913..dd2a1d5 100644
--- a/src/views/user/balance/Index.vue
+++ b/src/views/user/balance/Index.vue
@@ -33,7 +33,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->
diff --git a/src/views/user/grade/Index.vue b/src/views/user/grade/Index.vue
index 2fa3e55..f515cc4 100644
--- a/src/views/user/grade/Index.vue
+++ b/src/views/user/grade/Index.vue
@@ -10,7 +10,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 升级条件	 -->
diff --git a/src/views/user/recharge/Index.vue b/src/views/user/recharge/Index.vue
index a4a0bd1..5a86db0 100644
--- a/src/views/user/recharge/Index.vue
+++ b/src/views/user/recharge/Index.vue
@@ -40,7 +40,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->