From 6c3e9c58638ab54ad74945380954adad0006dac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com> Date: Mon, 18 Apr 2022 21:12:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=94=AE=E5=90=8E=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.test | 2 +- .vscode/extra.code-snippets | 6 + src/api/sales/service.js | 75 +++++ src/layouts/components/menu-item.vue | 17 +- src/layouts/components/menu.vue | 6 +- src/router/index.js | 48 +-- src/router/modules/sales.js | 21 ++ src/store/modules/core/auth.js | 51 ++-- src/store/modules/sales/order.js | 9 + src/store/modules/sales/service.js | 143 +++++++++ src/styles/globalVariables.module.less | 8 +- src/views/sales/order/address.vue | 11 +- src/views/sales/service/detail.vue | 406 +++++++++++++++++++++++++ src/views/sales/service/index.vue | 233 ++++++++++++++ 14 files changed, 959 insertions(+), 77 deletions(-) create mode 100644 src/api/sales/service.js create mode 100644 src/store/modules/sales/service.js create mode 100644 src/views/sales/service/detail.vue create mode 100644 src/views/sales/service/index.vue diff --git a/.env.test b/.env.test index d911fb4..4204265 100644 --- a/.env.test +++ b/.env.test @@ -1,2 +1,2 @@ -VITE_BASE_URL=https://gateway-test.mashibing.cn +VITE_BASE_URL=http://k8s-horse-gateway.mashibing.cn/ VITE_REQUEST_TIMEOUT=20000 diff --git a/.vscode/extra.code-snippets b/.vscode/extra.code-snippets index e229412..7eb1558 100644 --- a/.vscode/extra.code-snippets +++ b/.vscode/extra.code-snippets @@ -40,5 +40,11 @@ "" ], "description": "快速二次封装ElementPlus组件" + }, + "try catch": { + "scope": "javascript,typescript", + "prefix": "trycatch", + "body": ["try {", "\t$0", "} catch (e) {", "\tconsole.info('取消$1', e);", "}"], + "description": "TryCatch代码块" } } diff --git a/src/api/sales/service.js b/src/api/sales/service.js new file mode 100644 index 0000000..1298e17 --- /dev/null +++ b/src/api/sales/service.js @@ -0,0 +1,75 @@ +import request from '@/utils/request.js'; +export const search = (params) => { + return request({ + url: '/mall/trade/admin/refundOrder/page', + method: 'get', + params, + }); +}; +export const detail = (id) => { + return request({ + url: '/mall/trade/admin/refundOrder/refundInfo/' + id, + method: 'get', + }); +}; +export const returnDetail = (id) => { + return request({ + url: '/mall/trade/admin/refundOrder/returnInfo/' + id, + method: 'get', + }); +}; +export const logistics = (id) => { + return request({ + url: '/mall/trade/admin/refundOrder/logistics/' + id, + method: 'get', + }); +}; +export const summary = () => { + return request({ + url: '/mall/trade/admin/tradeOrder/statistics', + method: 'get', + }); +}; + +export const resolveReceive = (data) => { + return request({ + url: '/mall/trade/admin/refundOrder/agreeReceiving', + method: 'put', + data, + }); +}; +export const rejectReceive = (data) => { + return request({ + url: '/mall/trade/admin/refundOrder/disagreeReceiving', + method: 'put', + data, + }); +}; +export const resolveRefund = (data) => { + return request({ + url: '/mall/trade/admin/refundOrder/agreeRefund', + method: 'put', + data, + }); +}; +export const rejectRefund = (data) => { + return request({ + url: '/mall/trade/admin/refundOrder/disagreeRefund', + method: 'put', + data, + }); +}; +export const resolveReturn = (data) => { + return request({ + url: '/mall/trade/admin/refundOrder/agreeReturn', + method: 'put', + data, + }); +}; +export const rejectReturn = (data) => { + return request({ + url: '/mall/trade/admin/refundOrder/disagreeReturn', + method: 'put', + data, + }); +}; diff --git a/src/layouts/components/menu-item.vue b/src/layouts/components/menu-item.vue index b61c819..fc100a6 100644 --- a/src/layouts/components/menu-item.vue +++ b/src/layouts/components/menu-item.vue @@ -8,11 +8,11 @@

{{ props.menuItem.meta.title }}

- + - + + diff --git a/src/views/sales/service/index.vue b/src/views/sales/service/index.vue new file mode 100644 index 0000000..15bbad9 --- /dev/null +++ b/src/views/sales/service/index.vue @@ -0,0 +1,233 @@ + + + + +