分页加总数和选择页数大小

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>
 

src/components/Modal/ActiveModal/ActiveModal.vue

@@ -17,7 +17,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 活动入口图片 -->

src/components/Modal/BargainGoodsModal/BargainGoodsModal.vue

@@ -30,7 +30,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 商品信息 -->

src/components/Modal/CouponModal/CouponModal.vue

@@ -30,7 +30,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 优惠券名称 -->

src/components/Modal/GoodsModal/GoodsModal.vue

@@ -38,7 +38,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 商品信息 -->

src/components/Modal/GrouponGoodsModal/GrouponGoodsModal.vue

@@ -30,7 +30,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 商品信息 -->

src/components/Modal/ServerModal/ServerModal.vue

@@ -38,7 +38,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 服务信息 -->

src/components/Modal/SharpGoodsModal/SharpGoodsModal.vue

@@ -30,7 +30,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 商品信息 -->

src/components/Modal/ShopModal/ShopModal.vue

@@ -39,7 +39,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 门店logo -->

src/components/Modal/UserModal/UserModal.vue

@@ -43,7 +43,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员头像 -->

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
+          this.showPagination && this.localPagination.current || this.pageNum,
-        // pageSize: (pagination && pagination.pageSize) ||
+        pageSize: (pagination && pagination.pageSize) ||
-        //   this.showPagination && this.localPagination.pageSize || this.pageSize
+          this.showPagination && this.localPagination.pageSize || this.pageSize
       },
         (sorter && sorter.field && {
           sortField: sorter.field

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)

src/views/apps/bargain/active/Index.vue

@@ -27,7 +27,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1450 }"
     >

src/views/apps/bargain/task/Index.vue

@@ -37,7 +37,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1400 }"
     >

src/views/apps/bargain/task/modules/HelpModal.vue

@@ -16,7 +16,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->

src/views/apps/collector/modules/CollectorList.vue

@@ -6,7 +6,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 开始时间 -->

src/views/apps/dealer/apply/Index.vue

@@ -19,7 +19,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->

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">

src/views/apps/dealer/user/modules/FansModal.vue

@@ -37,7 +37,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->

src/views/apps/dealer/withdraw/Index.vue

@@ -43,7 +43,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->

src/views/apps/eorder/template/Index.vue

@@ -27,7 +27,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- API网关 -->

src/views/apps/groupon/goods/Index.vue

@@ -85,7 +85,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1300 }"
     >

src/views/apps/groupon/robot/Index.vue

@@ -11,7 +11,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 用户头像 -->

src/views/apps/groupon/task/Index.vue

@@ -41,7 +41,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1450 }"
     >

src/views/apps/groupon/task/modules/PeopleModal.vue

@@ -18,7 +18,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 用户信息 -->

src/views/apps/live/room/Index.vue

@@ -32,7 +32,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 直播时间 -->

src/views/apps/sharp/active/Index.vue

@@ -19,7 +19,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 活动状态 -->

src/views/apps/sharp/active/time/Index.vue

@@ -19,7 +19,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 活动状态 -->

src/views/apps/sharp/goods/Index.vue

@@ -27,7 +27,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1450 }"
     >

src/views/content/article/Index.vue

@@ -41,7 +41,7 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
+      :pagination="pagination"
       :scroll="{ x: 1400 }"
     >
       <!-- 文章封面图 -->

src/views/content/banner/Index.vue

@@ -10,7 +10,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- Banner图 -->

src/views/content/files/Index.vue

@@ -73,7 +73,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1300 }"
     >

src/views/content/help/Index.vue

@@ -10,7 +10,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 内容 -->

src/views/content/maintenance/Index.vue

@@ -35,7 +35,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1400 }"
     >

src/views/content/richText/Index.vue

@@ -10,7 +10,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 内容 -->

src/views/goods/Index.vue

@@ -70,7 +70,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1450 }"
     >

src/views/goods/comment/Index.vue

@@ -44,7 +44,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1450 }"
     >

src/views/goods/import/List.vue

@@ -37,7 +37,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 开始时间 -->

src/views/goods/service/Index.vue

@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1300 }"
     >

src/views/goods/source/Index.vue

@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
       :scroll="{ x: 1300 }"
     >

src/views/manage/role/Index.vue

@@ -11,7 +11,6 @@
       :dataSource="roleList"
       :defaultExpandAllRows="false"
       :expandIconColumnIndex="1"
-      :pageSize="15"
       :pagination="pagination"
       :loading="isLoading"
     >

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">

src/views/market/active/Index.vue

@@ -10,7 +10,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 活动入口图片 -->

src/views/market/active/modules/ColList.vue

@@ -18,7 +18,6 @@
         :loading="isLoading"
         :columns="columns"
         :data="loadData"
-        :pageSize="15"
         :pagination="pagination"
       >
         <!-- 活动入口图片 -->

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">

src/views/market/coupon/Receive.vue

@@ -26,7 +26,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->

src/views/market/points/Log.vue

@@ -23,7 +23,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->

src/views/market/presale/Index.vue

@@ -10,7 +10,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 状态 -->

src/views/market/recharge/plan/Index.vue

@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 充值金额 -->

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;"
     >

src/views/order/tools/modules/ExportList.vue

@@ -5,7 +5,6 @@
     :loading="isLoading"
     :columns="columns"
     :data="loadData"
-    :pageSize="15"
     :pagination="pagination"
   >
     <!-- 下单时间 -->

src/views/page/Index.vue

@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 页面类型 -->

src/views/recovery/Index.vue

@@ -59,7 +59,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 回收图片 -->

src/views/recovery/order/Index.vue

@@ -59,7 +59,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 回收图片 -->

src/views/server/Index.vue

@@ -59,7 +59,6 @@
       :columns="columns"
       :data="loadData"
       :rowSelection="rowSelection"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 服务图片 -->

src/views/setting/delivery/express/Index.vue

@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 操作 -->

src/views/setting/delivery/template/Index.vue

@@ -27,7 +27,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 计费方式 -->

src/views/setting/payment/template/Index.vue

@@ -19,7 +19,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 支付方式 -->

src/views/setting/printer/Index.vue

@@ -22,7 +22,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 打印机类型 -->

src/views/store/address/Index.vue

@@ -31,7 +31,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 详细地址 -->

src/views/store/shop/Index.vue

@@ -31,7 +31,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 门店logo -->

src/views/store/shop/clerk/Index.vue

@@ -34,7 +34,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->

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">

src/views/store/shop/order/Index.vue

@@ -31,7 +31,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 核销门店 -->

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">

src/views/user/balance/Index.vue

@@ -33,7 +33,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->

src/views/user/grade/Index.vue

@@ -10,7 +10,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 升级条件	 -->

src/views/user/recharge/Index.vue

@@ -40,7 +40,6 @@
       :loading="isLoading"
       :columns="columns"
       :data="loadData"
-      :pageSize="15"
       :pagination="pagination"
     >
       <!-- 会员信息 -->