From 843d0abd014ec20424844546fc57a9f976f366ba Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 02 九月 2024 10:52:59 +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 86ea4d2..61d5103 100644
--- a/admin/src/components/common/Pagination.vue
+++ b/admin/src/components/common/Pagination.vue
@@ -1,7 +1,7 @@
<template>
<div class="table-pagination">
<el-pagination
- :current-page="pagination.pageIndex"
+ :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"
--
Gitblit v1.9.3