From cd9454dae14c104fd0ab658a5051ceb94fa80280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com> Date: Wed, 15 Jan 2025 17:26:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86=E5=92=8C=E5=93=81?= =?UTF-8?q?=E7=89=8C=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/mer_admin.js | 16 + src/router/full-routers.js | 13 + src/utils/index.js | 1 + .../brand-market/index.vue | 217 +++++++++ .../brand-market/popup/view-details.vue | 199 ++++++++ .../brand-order/index.vue | 429 +++++++++++++++++- 6 files changed, 870 insertions(+), 5 deletions(-) create mode 100644 src/views/modules/operation-management/brand-market/index.vue create mode 100644 src/views/modules/operation-management/brand-market/popup/view-details.vue diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js index 0f6f260..26dfc84 100644 --- a/src/api/modules/mer_admin.js +++ b/src/api/modules/mer_admin.js @@ -276,4 +276,20 @@ export const mer_admin = { sortnotice: (data) => { return $http.post(`/admin-api/notice/update/sort`, data); }, + //品牌和分销商的订单 + distributorOrBrandOrderPage: (data) => { + return $http.request({ + method: "get", + url: `/merchant-api/backend/order/page`, + params: data, + }); + }, + //订单概述 + orderOverview: (data) => { + return $http.request({ + method: "get", + url: `/merchant-api/backend/order/overview`, + params: data, + }); + }, }; diff --git a/src/router/full-routers.js b/src/router/full-routers.js index d1b81b3..bc15d8e 100644 --- a/src/router/full-routers.js +++ b/src/router/full-routers.js @@ -77,6 +77,19 @@ export default { open: null, list: [], }, + { + menuId: getUUID(), + parentId: 0, + parentName: null, + name: "品牌市场", + url: "operation-management/brand-market/index", + perms: "", + type: 1, + elIcon: "el-icon-shopping-cart-full", + orderNum: 0, + open: null, + list: [], + }, { menuId: getUUID(), parentId: 0, diff --git a/src/utils/index.js b/src/utils/index.js index b254852..674a891 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -176,6 +176,7 @@ export function getMenu(role) { return [ "operation-management", // "operation-management/shop-list/index", + "operation-management/brand-market/index", "operation-management/brand-store/index", // "operation-management/order/index", "operation-management/brand-order/index", diff --git a/src/views/modules/operation-management/brand-market/index.vue b/src/views/modules/operation-management/brand-market/index.vue new file mode 100644 index 0000000..8c9347b --- /dev/null +++ b/src/views/modules/operation-management/brand-market/index.vue @@ -0,0 +1,217 @@ + + + + + \ No newline at end of file diff --git a/src/views/modules/operation-management/brand-market/popup/view-details.vue b/src/views/modules/operation-management/brand-market/popup/view-details.vue new file mode 100644 index 0000000..c357cf7 --- /dev/null +++ b/src/views/modules/operation-management/brand-market/popup/view-details.vue @@ -0,0 +1,199 @@ + + + \ No newline at end of file diff --git a/src/views/modules/operation-management/brand-order/index.vue b/src/views/modules/operation-management/brand-order/index.vue index 661fef6..06e6764 100644 --- a/src/views/modules/operation-management/brand-order/index.vue +++ b/src/views/modules/operation-management/brand-order/index.vue @@ -1,15 +1,434 @@ - \ No newline at end of file