Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

2025-09-17 72bb57e08bb5ac3b7fd724bed3995a518d889221

 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>