From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 14:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/Pagination.vue | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/admin/src/components/common/Pagination.vue b/admin/src/components/common/Pagination.vue
index 975a875..d4a6f28 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"
@@ -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