From 06b2f5be922e87d086d1d4e6cdcc2119e7d3a1a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 09 七月 2025 14:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/Pagination.vue | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/admin/src/components/common/Pagination.vue b/admin/src/components/common/Pagination.vue
index 86ea4d2..d4a6f28 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"
@@ -38,3 +38,18 @@
}
}
</script>
+<style lang="scss" scoped>
+.table-pagination {
+ margin-left: 0px;
+ padding: 16px 0px;
+ text-align: left;
+ display: block;
+ z-index: 100;
+ width: -webkit-fill-available;
+ /* width: 80%; */
+ position: fixed;
+ bottom: 0px;
+ background-color: white;
+ margin-right: 50px;
+}
+</style>
--
Gitblit v1.9.3