From df15102661bace142ef442765ffe7fd44d48e59b Mon Sep 17 00:00:00 2001 From: lzhizhao <790086754@qq.com> Date: Tue, 30 Sep 2025 23:35:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=92=8C=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config/index.js | 2 +- src/api/modules/mer_admin.js | 40 ++ .../operation-management/order/index.vue | 643 +++++++++++++----- 3 files changed, 507 insertions(+), 178 deletions(-) diff --git a/public/config/index.js b/public/config/index.js index b0aa92a..415da64 100644 --- a/public/config/index.js +++ b/public/config/index.js @@ -12,7 +12,7 @@ (function () { window.SITE_CONFIG = {}; // api接口请求地址 - window.SITE_CONFIG["baseUrl"] = "https://admin.damajishi.cn/"; + window.SITE_CONFIG["baseUrl"] = "https://admin-test.damajishi.cn/"; // 在线api接口请求地址 // window.SITE_CONFIG['baseUrl'] = 'http://119.29.103.250:8082/red-memory'; // 在线api接口请求地址 diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js index 5c97df2..bbeb2d4 100644 --- a/src/api/modules/mer_admin.js +++ b/src/api/modules/mer_admin.js @@ -352,5 +352,45 @@ export const mer_admin = { }, membershipEnableSaveSettings: data => { return $http.post(`/merchant-api/membershipEnable/saveSettings`, data); + }, + /** + * 订单分页查询 + * @param {object} data 查询参数 + * @param {number} data.pageNumber 页码 + * @param {number} data.pageSize 每页数量 + * @param {string} data.sortOrder 排序顺序 + * @param {string} data.sortName 排序字段 + * @param {string} data.receiverName 收货人姓名 + * @param {string} data.receiverPhone 收货人手机号 + * @param {string} data.statusList 订单业务状态列表 0: 待支付、1:待接单、2:待备货、3:待取货、4:已取货(待配送)、5: 配送中(待送达)、6: 已配送(待收货)、8:完成、-1:未支付订单取消、-2:用户申请退款中、-3:用户申请已退款:-4:商家取消订单、-5:平台取消订单 + * @param {string} data.unitOrderNo 结算订单号 + * @param {string} data.startTime 开始日期 + * @param {string} data.endTime 结束日期 + * @returns {Promise} + */ + orderV2Page: data => { + return $http.request({ + method: "get", + url: `/merchant-api/backend/order/v2/page`, + params: data + }); + }, + /** + * 订单概览 + * @param {object} data 查询参数 + * @param {string} data.receiverName 收货人姓名 + * @param {string} data.receiverPhone 收货人手机号 + * @param {string} data.statusList 订单业务状态 0: 待支付、1:待接单、2:待备货、3:待取货、4:已取货(待配送)、5: 配送中(待送达)、6: 已配送(待收货)、8:完成、-1:未支付订单取消、-2:用户申请退款中、-3:用户申请已退款:-4:商家取消订单、-5:平台取消订单 + * @param {string} data.unitOrderNo 结算订单号 + * @param {string} data.startTime 开始日期 + * @param {string} data.endTime 结束日期 + * @returns {Promise} + */ + orderV2Overview: data => { + return $http.request({ + method: "get", + url: `/merchant-api/backend/order/v2/overview`, + params: data + }); } }; diff --git a/src/views/modules/operation-management/order/index.vue b/src/views/modules/operation-management/order/index.vue index b6399d3..a28c662 100644 --- a/src/views/modules/operation-management/order/index.vue +++ b/src/views/modules/operation-management/order/index.vue @@ -1,209 +1,498 @@ - + +