From 908ce43ff21c2068ef5148b0a417423c8ed9eae5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 16:37:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 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..91af47d 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: -18px;
+  padding: 16px 0px 16px 25px;
+  text-align: left;
+  display: block;
+  z-index: 100;
+  width: -webkit-fill-available;
+  /* width: 80%; */
+  position: fixed;
+  bottom: 25px;
+  background-color: white;
+  margin-right: 50px;
+}
+</style>

--
Gitblit v1.9.3