diff --git a/src/api/AfterSalesManagement.js b/src/api/AfterSalesManagement.js index 11a4b38..b2ae61f 100644 --- a/src/api/AfterSalesManagement.js +++ b/src/api/AfterSalesManagement.js @@ -1,2 +1,49 @@ import request from '@axioshooks' - +// 获取售后管理列表 +export function select_by_conditions(data) { + return request({ + url: 'xy_openapi/afterSale/select_by_conditions', + method: 'post', + data + }) +} +// 同意退款 +export function agree_refund(data) { + return request({ + url: `xy_openapi/afterSale/agree_refund/${data}`, + method: 'get', + data + }) +} +// 拒绝退款 +export function refuse_refund(data) { + return request({ + url: `xy_openapi/afterSale/refuse_refund/${data}`, + method: 'get', + data + }) +} +// 确认收货 +export function confirm_receipt(data) { + return request({ + url: `xy_openapi/afterSale/confirm_receipt/${data}`, + method: 'get', + data + }) +} +// 拒绝收货 +export function refuse_receipt(data) { + return request({ + url: `xy_openapi/afterSale/refuse_receipt/${data}`, + method: 'get', + data + }) +} +// 日志 +export function after_log(data) { + return request({ + url: `xy_openapi/afterSale/after_log/${data}`, + method: 'get', + data + }) +} \ No newline at end of file diff --git a/src/api/CommodityManagement.js b/src/api/CommodityManagement.js index a06d0cb..461245f 100644 --- a/src/api/CommodityManagement.js +++ b/src/api/CommodityManagement.js @@ -18,7 +18,7 @@ export function edit_product(data) { // 复制商品 export function get_commodity(data) { return request({ - url: `xy_openapi/commodity_info/get_commodity`, + url: `xy_openapi/commodity_info/get_commodity/${data}`, method: 'get', data }) @@ -46,4 +46,12 @@ export function delete_one(data) { method: 'delete', data }) +} +// 日志 +export function commodity_log(data) { + return request({ + url: `xy_openapi/commodity_info/commodity_log/${data}`, + method: 'get', + data + }) } \ No newline at end of file diff --git a/src/api/OrderManagement.js b/src/api/OrderManagement.js index 9cc5545..e0e2b6e 100644 --- a/src/api/OrderManagement.js +++ b/src/api/OrderManagement.js @@ -7,3 +7,61 @@ export function order_info(data) { data }) } +// 获取物流信息 +export function logistics_inquiry(data) { + return request({ + url: `xy_openapi/api/order_info/logistics_inquiry/${data}`, + method: 'get', + data + }) +} +// 订单发货信息查询 +export function get_order_shopped_info(data) { + return request({ + url: `xy_openapi/api/order_info/get_order_shopped_info/${data}`, + method: 'get', + data + }) +} + +// 订单下单 +export function sf_place_order(data) { + return request({ + url: `xy_openapi/api/logistics/sf_place_order`, + method: 'post', + data + }) +} +//发货 +export function order_shopped(data) { + return request({ + url: `xy_openapi/api/order_info/order_shopped`, + method: 'post', + data + }) +} +//打印面单 +export function express_printing(data) { + return request({ + url: `xy_openapi/api/logistics/express_printing`, + method: 'post', + data + }) +} +//取消订单 +export function cancel_order(data) { + return request({ + url: `xy_openapi/api/order_info/cancel_order/${data}`, + method: 'get', + data + }) +} +//机器日志 +export function order_log(data) { + return request({ + url: `xy_openapi/api/order_info/order_log/${data}`, + method: 'get', + data + }) +} + diff --git a/src/api/translateSet.js b/src/api/translateSet.js new file mode 100644 index 0000000..0656695 --- /dev/null +++ b/src/api/translateSet.js @@ -0,0 +1,42 @@ +import request from '@axioshooks' +// 获取地址列表 +export function userAddress(data) { + return request({ + url: 'xy_openapi/address/userAddress', + method: 'post', + data + }) +} +// 添加物流信息 +export function add(data) { + return request({ + url: 'xy_openapi/address/add', + method: 'post', + data + }) +} +// 获取寄件人集合 +export function senderList(data) { + return request({ + url: 'xy_openapi/sender/list', + method: 'get', + data + }) +} +// 添加寄件人 +export function senderAdd(data) { + return request({ + url: 'xy_openapi/sender/add', + method: 'post', + data + }) +} +// 删除寄件人 +export function senderDelete(data) { + return request({ + url: `xy_openapi/sender/delete/${data}`, + method: 'delete', + data + }) +} + diff --git a/src/components/LogsDialog.vue b/src/components/LogsDialog.vue new file mode 100644 index 0000000..1bed1f7 --- /dev/null +++ b/src/components/LogsDialog.vue @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + 关 闭 + + + + + + + + \ No newline at end of file diff --git a/src/components/OperateButton.vue b/src/components/OperateButton.vue index 343e2e7..64b78a5 100644 --- a/src/components/OperateButton.vue +++ b/src/components/OperateButton.vue @@ -1,6 +1,6 @@ - + + + {{ item.name }} + + + + + + + \ No newline at end of file diff --git a/src/components/driverForm/index.vue b/src/components/driverForm/index.vue index 19f93c9..03658b1 100644 --- a/src/components/driverForm/index.vue +++ b/src/components/driverForm/index.vue @@ -1,748 +1,728 @@ + - - - 订单信息 - - - - + + 订单详情 + + + + + - - - - - - - {{ data.DeliveryInfoList.brand_name }}{{ data.DeliveryInfoList.model_name - }}{{ data.DeliveryInfoList.rom_name - }}{{ data.DeliveryInfoList.color_name }} - - {{DeliveryInfoList.machine_name}} - - 售价:¥{{ (data.DeliveryInfoList.price / 100).toFixed(2) }} - - + + {{ DeliveryInfoList.title }} + + + {{ DeliveryInfoList.buyAmount }} + ¥{{ DeliveryInfoList.retailPrice }} - - - - - - - 收件人信息 - + + 订单备注 + {{ DeliveryInfoList.remark }} + + + + + 收件信息 + 一键复制收件人信息 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + 更改收件人信息 + + + + + + + + + - - - - - 寄件人信息 - - - 寄件人: - - - - 手机号:{{ SHIPPER?.mobile }} + + + + {{ orderDeliveryDto.contactInfoList[0][item.params] }} + + + + + + + + + 寄件信息 - 寄件地址:{{ SHIPPER?.address}} + + + 更改寄件人信息 + + + + + + + + + + + - - - - - - + + + + {{ orderDeliveryDto.contactInfoList[1][item.params] }} + + + - {{ el.label }} - - - - - - + - - - - - - - 顺丰(京东)快递已支持快速下单,确认后将自动发货 - - - 快速下单 - - - - - - - - - - - - - - - - 打印面单 - - - - + + + 17:00前下单当日揽收 + + + + + - - - - - - + + + + + - diff --git a/src/components/driverForm/reviceform.vue b/src/components/driverForm/reviceform.vue index 8ff7aa4..d116a44 100644 --- a/src/components/driverForm/reviceform.vue +++ b/src/components/driverForm/reviceform.vue @@ -160,7 +160,7 @@ const onFormChange=(value)=>{ } - \ No newline at end of file diff --git a/src/views/OrderManagement/index.vue b/src/views/OrderManagement/index.vue index 0130b72..bb27f26 100644 --- a/src/views/OrderManagement/index.vue +++ b/src/views/OrderManagement/index.vue @@ -35,6 +35,39 @@ > + + + + + + + + + \ No newline at end of file diff --git a/src/views/translateSet/index.vue b/src/views/translateSet/index.vue new file mode 100644 index 0000000..0bac70b --- /dev/null +++ b/src/views/translateSet/index.vue @@ -0,0 +1,585 @@ + + + + + + + {{ item.name }} + + + + + + + + + + + + + + + + + {{ row.default_flag ? "是" : "否" }} + + + + + + + + + + + + + + + + + 新增 + 修改 + + + + 删除 + + + + + + + + + + + + + + + {{ row.province + row.city + row.detailed }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 确 定 + 修 改 + + + + + + + \ No newline at end of file