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 @@ + + + + + + + + + {{ ruleForm.name }} + + + + {{ + ruleForm.manageMode == 0 ? "平台" : "个体经营者" + }} + + + + {{ ruleForm.status == 0 ? "禁用" : "启用" }} + + + + + + {{ ruleForm.provinceName }}{{ ruleForm.ruleForm + }}{{ ruleForm.areaName }}{{ ruleForm.address }} + + + + {{ ruleForm.longitude }} + + + + {{ ruleForm.latitude }} + + + + + + + + + + + {{ ruleForm.isThirdPartyDelivery ? "是" : "否" }} + + + + {{ + ruleForm.businessStatus == 0 ? "休息" : "经营中" + }} + + + + + + + + + + \ 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 @@ - - 品牌订单 + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + 订单数量(笔) + + {{ overviewList.totalCount }} + + + + + + + 订单金额(元) + + {{ overviewList.totalMoney }} + + + + + + + 退款金额 + + {{ + overviewList.totalRefundMoney + }} + + + + + + + 订单完成率 + + {{ overviewList.completeRate }}% + + + + + + + 代理商抽成(元) + + {{ + overviewList.agentCommission ? overviewList.agentCommission : 0 + }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ scope.row.poi }} {{ scope.row.detail }} + + + + + + + + + + {{ filterStatus(scope.row.payStatus) }} + + + + + {{ filterUnitStatus(scope.row.status) }} + + + + + {{ filterUnitRefundStatus(scope.row.refundStatus) }} + + + + + {{ scope.row.settleStatus == 0 ? "未结算" : "已结算" }} + + + + + + + + + + - \ No newline at end of file