From 6bae45dfd31d647e4abc4e0246f495a29cc6896f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 11:20:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/Pagination.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/admin/src/components/common/Pagination.vue b/admin/src/components/common/Pagination.vue
index 975a875..86ea4d2 100644
--- a/admin/src/components/common/Pagination.vue
+++ b/admin/src/components/common/Pagination.vue
@@ -2,7 +2,7 @@
<div class="table-pagination">
<el-pagination
:current-page="pagination.pageIndex"
- :page-sizes="[10, 20, 30, 40]"
+ :page-sizes="pagination.pageSizes||[10, 20, 30, 40]"
:page-size="pagination.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="pagination.total"
--
Gitblit v1.9.3