Merge branch 'feature/merchant-managemet'

src/pages/Groupmeal/merchantManagement/index.vue

@@ -29,7 +29,7 @@
                     background
                     layout="prev, pager, next"
                     :total="pageCount"
-                    :page-size="10"
+                    :page-size="20"
                     v-model:currentPage="currentPage"
                     @current-change="handleCurrentChange"
                 ></el-pagination>
@@ -135,7 +135,7 @@
                 this.merchantAdd = true;
             },
             async getOtaList() {
-                const { result, code, reason } = await otaList();
+                const { result, code, reason } = await otaList({ limit: this.pageSize, offset: (this.currentPage - 1) * this.pageSize });
                 if (code !== 0) return this.$message.error(reason);
                 this.merchantList = result.list;
                 this.pageCount = result.total;