diff --git a/App.vue b/App.vue index 07d19fa..7ffd168 100644 --- a/App.vue +++ b/App.vue @@ -2,12 +2,6 @@ export default { onLaunch: function() { console.log('App Launch'); - uni.addInterceptor('navigateTo', { - invoke(e) { - console.log('路由监听'); - console.log(e); - } - }) }, onShow: function() { console.log('App Show') diff --git a/api/order.js b/api/order.js index 22212b1..db2860b 100644 --- a/api/order.js +++ b/api/order.js @@ -59,4 +59,19 @@ export const writeCountApi = (data) => { // 根据核销码查询记录 export const writeCodeApi = (data) => { return request.post('/order/order/write_code', data); +} + +// 取消售后 +export const cancelSaleApi = (data) => { + return request.get('/order/order/cancel_sale', data); +} + +// 订单退款原因 +export const refundReasonListApi = (data) => { + return request.post('/order/order/refund_reason', data); +} + +// 订单退款申请 +export const applyRefundApi = (data) => { + return request.post('/order/order/apply_refund', data); } \ No newline at end of file diff --git a/components/addressPopup.vue b/components/addressPopup.vue index da9134d..d395425 100644 --- a/components/addressPopup.vue +++ b/components/addressPopup.vue @@ -1,149 +1,151 @@ \ No newline at end of file diff --git a/pages.json b/pages.json index 1852cde..3c93849 100644 --- a/pages.json +++ b/pages.json @@ -9,7 +9,6 @@ } }, "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - { "path": "pages/index/index", "style": { @@ -49,20 +48,36 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } - }, - { + }, { "path": "pages/charge/charge_record", "style": { "navigationBarTitleText": "充值记录", "enablePullDownRefresh": false } - }, - { + }, { "path": "pages/charge/charge", "style": { "navigationBarTitleText": "会员充值", "enablePullDownRefresh": false } + }, { + "path": "pages/afterSales/afterSales", + "style": { + "navigationBarTitleText": "售后退款", + "enablePullDownRefresh": false + } + }, { + "path": "pages/afterSales/afterSalesOrder", + "style": { + "navigationBarTitleText": "退款订单 ", + "enablePullDownRefresh": false + } + }, { + "path": "pages/afterSales/afterSalesOrderDetail", + "style": { + "navigationBarTitleText": "售后退款详情", + "enablePullDownRefresh": false + } } ], "subPackages": [{ diff --git a/pages/afterSales/afterSales.vue b/pages/afterSales/afterSales.vue new file mode 100644 index 0000000..5903335 --- /dev/null +++ b/pages/afterSales/afterSales.vue @@ -0,0 +1,483 @@ + + + + + \ No newline at end of file diff --git a/pages/afterSales/afterSalesOrder.vue b/pages/afterSales/afterSalesOrder.vue new file mode 100644 index 0000000..65255fe --- /dev/null +++ b/pages/afterSales/afterSalesOrder.vue @@ -0,0 +1,264 @@ + + + + \ No newline at end of file diff --git a/pages/afterSales/afterSalesOrderDetail.vue b/pages/afterSales/afterSalesOrderDetail.vue new file mode 100644 index 0000000..9791f6f --- /dev/null +++ b/pages/afterSales/afterSalesOrderDetail.vue @@ -0,0 +1,281 @@ + + + + \ No newline at end of file diff --git a/pages/my/my.vue b/pages/my/my.vue index c3cd4ba..146dc13 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -74,14 +74,14 @@ {{orderCount.waiting}} - + 已核销 {{orderCount.receiving}} - + 售后/退款 diff --git a/pagesOrder/order/component/good.vue b/pagesOrder/order/component/good.vue index 9f75998..1979db3 100644 --- a/pagesOrder/order/component/good.vue +++ b/pagesOrder/order/component/good.vue @@ -39,6 +39,8 @@ size="small" plain color="#20B128" shape="circle">再次购买 查看详情 + 申请售后 + + + 选择商品 + + + 售后类型 + + 仅退款 + 退款退货 + 换货 + + + + + + + + + + + + + {{item.value}} + + + + + + + 提交 + +