diff --git a/api/aftersales.js b/api/aftersales.js index adf3a9c..e91e718 100644 --- a/api/aftersales.js +++ b/api/aftersales.js @@ -30,35 +30,35 @@ export function getAfterSalesDeatail(key) { // 查询订单 export function getAfterSealsDetail (key, id) { - return request.get(`/api/store/detail/${key}/${id}`) + return request.get(`/store/detail/${key}/${id}`) } // 搜索 export function searchAfterSealsDetail (key) { - return request.get(`/api/store/detail/${key}`) + return request.get(`/store/detail/${key}`) } // 撤销售后订单 export function rebackAfterSeals (key, id) { - return request.get(`/api/revoke/revoke/${key}/${id}`) + return request.get(`/revoke/${key}/${id}`) } // 获取物流信息 export function getExpressData () { - return request.get('/api/yxExpress') + return request.get('/yxExpress') } // 添加快递单号 export function addExpressData (params) { - return request.post('/api/addLogisticsInformation', params, { + return request.post('/addLogisticsInformation?' + `code=${params.code}&name=${params.name}&postalCode=${params.postalCode}&orderCode=${params.orderCode}&`, '', { login: true }) } // 删除售后订单 export function deleteAfterSeals (params) { - return request.delete('/api/deleteAfterSalesOrder', params, { + return request.delete('/deleteAfterSalesOrder', params, { login: true }) } diff --git a/pages.json b/pages.json index 998fb4f..e1ca664 100644 --- a/pages.json +++ b/pages.json @@ -327,6 +327,12 @@ "navigationBarTitleText": "我的售后" } }, + { + "path": "pages/order/submitExpress/index", + "style": { + "navigationBarTitleText": "售后物流填写" + } + }, { "path": "pages/orderAdmin/OrderIndex/index", "style": { diff --git a/pages/order/GoodsReturn/index.vue b/pages/order/GoodsReturn/index.vue index 7264110..6f0380e 100644 --- a/pages/order/GoodsReturn/index.vue +++ b/pages/order/GoodsReturn/index.vue @@ -48,8 +48,14 @@ > - 申请退款 - 申请退货 + 申请退款 + 申请退货 diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue index 904bb47..d45f839 100644 --- a/pages/order/OrderDetails/index.vue +++ b/pages/order/OrderDetails/index.vue @@ -253,13 +253,11 @@ } })" >查看物流 - 申请退款 确认收货 查看物流 - 申请退款 删除订单 diff --git a/pages/order/OrderReturnDetail/index.vue b/pages/order/OrderReturnDetail/index.vue index 41edfad..e961460 100644 --- a/pages/order/OrderReturnDetail/index.vue +++ b/pages/order/OrderReturnDetail/index.vue @@ -1,78 +1,210 @@ - - - - {{ orderInfo._status._msg }} - {{ orderInfo.createTime || '' }} - + + + + 已提交申请,请耐心等待卖家处理 + + + + 已通过平台审核,正在退款 + + + 已通过平台审核 ,请填写退货物流 + + + + 已发货,等待商家审核 + + + 售后订单已完成 + + + + 已撤销售后订单 + + 商家已拒绝售后申请 + + 退款总金额 - ¥{{200.0}} + ¥{{ orderDetail.refundAmount || 0}} + + + 商家已同意退货申请,请尽快发货。 + + 收货人: {{ orderDetail.consignee || '' }} + + + 收货地址: {{ orderDetail.address || '' }} + + + 收货电话: {{ orderDetail.phoneNumber || '' }} + - + 您已成功发起退款申请,请耐心等待商家处理 · 卖家同意或超时未处理,系统将退款给您 · 如果卖家拒绝,您可以修改退款申请后再次发起,卖家会重新处理 + + + + - 撤销申请 - 修改申请 + 填写物流 + 撤销申请 + - - - - - - - + 退款信息 - - - - - - - - + + + + + {{ item.productInfo.storeName }} + + + {{ item.productInfo.attrInfo.sku }} + + - + + + 退款原因: + + + {{ orderDetail.reasons || '' }} + + + + + 退款金额: + + + ¥{{ orderDetail.refundAmount || 0 }} + + + + + 退款编号: + + + {{ orderDetail.id || '' }} + + + + + 申请时间: + + + {{ orderDetail.createTime || '' }} + + diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 4d31225..9f5ace4 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -21,23 +21,23 @@ - - - + + + {{ storeItems.name }} {{ storeItems.phone }} - - {{ storeItems.address }} - - - + + {{ storeItems.address }} + + + {{ systemStore.name }} {{ systemStore.phone }} - - {{ systemStore.address }} - - - + + {{ systemStore.address }} + + + @@ -393,8 +393,6 @@ export default { } postOrderConfirm(cartIds) .then(res => { - console.log(res, 999999) - console.log(res.data.systemStore || {}, 999999) this.offlinePayStatus = res.data.offline_pay_status this.orderGroupInfo = res.data this.deduction = res.data.deduction diff --git a/pages/order/ReturnList/listItem.vue b/pages/order/ReturnList/listItem.vue index 41b1510..72a4260 100644 --- a/pages/order/ReturnList/listItem.vue +++ b/pages/order/ReturnList/listItem.vue @@ -33,7 +33,18 @@ - 审核中 + + 商家处理中 + 售后中 + 等待商家收货 + 已完成 + + + 已撤销 + + + 商家拒绝 + 退款: @@ -52,6 +63,9 @@ + +