From e410d78236187d68860a2cdee2d1a01e126e5822 Mon Sep 17 00:00:00 2001 From: 15820893422 <1978476055@qq.com> Date: Mon, 29 Apr 2024 16:30:46 +0800 Subject: [PATCH] edit --- src/api/merchant.js | 12 +++++++++ src/views/merchant/application/index.vue | 31 +++++++++++++++++++++++- src/views/merchant/list/index.vue | 27 +++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/src/api/merchant.js b/src/api/merchant.js index 49fbfff..6410fc7 100644 --- a/src/api/merchant.js +++ b/src/api/merchant.js @@ -80,6 +80,18 @@ export function merchantDeleteForm(id) { export function merchantPayForm(id) { return request.get(`margin/offline_money/${id}/form`) } +/** + * @description 商户列表 -- 导出列表 + */ +export function exportMerchantApi(data) { + return request.get(`system/merchant/export`, data) +} +/** + * @description 商户入驻 -- 导出列表 + */ +export function exportIntentionApi(data) { + return request.get(`merchant/intention/export`, data) +} /** * @description 商户列表 -- 修改开启状态 */ diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue index 3f5a0de..71936b3 100644 --- a/src/views/merchant/application/index.vue +++ b/src/views/merchant/application/index.vue @@ -89,6 +89,9 @@ +
+ 导出列表 +
{ + exportIntentionApi(excelData).then((res) => { + return resolve(res.data) + }) + }) + }, /**重置 */ searchReset(){ this.timeVal = [] diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue index f82cf39..e3c680d 100644 --- a/src/views/merchant/list/index.vue +++ b/src/views/merchant/list/index.vue @@ -122,6 +122,7 @@ /> 添加商户 + 导出列表 { + exportMerchantApi(excelData).then((res) => { + return resolve(res.data) + }) + }) + }, /**重置 */ searchReset(){ this.timeVal = []