From fd4b065fc5a3f73dbe6ceb8f2ed66612b10a3c00 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 17:15:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/Pagination.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/src/components/common/Pagination.vue b/admin/src/components/common/Pagination.vue
index 975a875..61d5103 100644
--- a/admin/src/components/common/Pagination.vue
+++ b/admin/src/components/common/Pagination.vue
@@ -1,8 +1,8 @@
<template>
<div class="table-pagination">
<el-pagination
- :current-page="pagination.pageIndex"
- :page-sizes="[10, 20, 30, 40]"
+ :current-page="pagination.pageIndex || pagination.page"
+ :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