From 72bb57e08bb5ac3b7fd724bed3995a518d889221 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 17 九月 2025 14:15:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/salesManagement/paymentShipping/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/salesManagement/paymentShipping/index.vue b/src/views/salesManagement/paymentShipping/index.vue
index ae59d08..0bcfd87 100644
--- a/src/views/salesManagement/paymentShipping/index.vue
+++ b/src/views/salesManagement/paymentShipping/index.vue
@@ -91,8 +91,8 @@
<pagination
:total="total"
layout="total, sizes, prev, pager, next, jumper"
- :page="pagination.currentPage"
- :limit="pagination.pageSize"
+ :page="pagination.current"
+ :limit="pagination.size"
@pagination="handleCurrentChange"
/>
</el-card>
@@ -496,8 +496,8 @@
}
const handleCurrentChange = (val) => {
- pagination.currentPage = val.page
- pagination.pageSize = val.limit
+ pagination.current = val.page
+ pagination.size = val.limit
}
</script>
--
Gitblit v1.9.3