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 { } } - 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" > 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 @@ -