diff --git a/api/aftersales.js b/api/aftersales.js
new file mode 100644
index 0000000..adf3a9c
--- /dev/null
+++ b/api/aftersales.js
@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+// 提交售后
+/**
+ *
+ 订单号 orderCode;
+ 服务类型 0仅退款1退货退款 serviceType;
+ 申请原因 reasonForApplication;
+ 申请说明 applicationInstructions;
+ 申请说明图片 applicationDescriptionPicture;
+ 商品数据 productParamList;
+ */
+export function submitAfterSealsOrder(data) {
+ return request.post(`/applyForAfterSales`, data, {
+ login: true
+ });
+}
+
+// 售后订单列表
+export function getAfterSealsList (params) {
+ return request.get('/storeAfterSales/list', params, {
+ login: true,
+ });
+}
+
+// 售后详情
+export function getAfterSalesDeatail(key) {
+ return request.get(`/applyForAfterSales/${key}`);
+}
+
+// 查询订单
+export function getAfterSealsDetail (key, id) {
+ return request.get(`/api/store/detail/${key}/${id}`)
+}
+
+// 搜索
+export function searchAfterSealsDetail (key) {
+ return request.get(`/api/store/detail/${key}`)
+}
+
+// 撤销售后订单
+export function rebackAfterSeals (key, id) {
+ return request.get(`/api/revoke/revoke/${key}/${id}`)
+}
+
+// 获取物流信息
+export function getExpressData () {
+ return request.get('/api/yxExpress')
+
+}
+
+// 添加快递单号
+export function addExpressData (params) {
+ return request.post('/api/addLogisticsInformation', params, {
+ login: true
+ })
+}
+
+// 删除售后订单
+export function deleteAfterSeals (params) {
+ return request.delete('/api/deleteAfterSalesOrder', params, {
+ login: true
+ })
+}
diff --git a/pages/order/GoodsReturn/index.vue b/pages/order/GoodsReturn/index.vue
index ab8fa94..9db9751 100644
--- a/pages/order/GoodsReturn/index.vue
+++ b/pages/order/GoodsReturn/index.vue
@@ -1,9 +1,10 @@
+
-
+
@@ -14,23 +15,23 @@
¥{{
- cart.productInfo.attrInfo
- ? cart.productInfo.attrInfo.price
- : cart.productInfo.price
- }}
+ cart.productInfo.attrInfo
+ ? cart.productInfo.attrInfo.price
+ : cart.productInfo.price
+ }}
x{{ cart.cartNum }}
-
+
退货件数
- {{ orderInfo.totalNum }}
+ {{ totalNum || 0 }}
退款金额
- ¥{{ orderInfo.payPrice }}
+ ¥{{ totalMoney || 0 }}
@@ -41,145 +42,345 @@
备注说明
-
+
- 申请退款
+ 申请退款
+ 申请退货
-
-
+
+
+
+
+
+
-
- {{ cart.productInfo.storeName }}
+
+ {{ cart.productInfo.storeName || '' }}
+
+
+ {{ cart.productInfo.attrInfo.sku || '' }}
+
+ x{{ cart.cartNum || 0 }}
+
-
- ¥{{
+ ¥
+ {{
cart.productInfo.attrInfo
? cart.productInfo.attrInfo.price
: cart.productInfo.price
}}
- x{{ cart.cartNum }}
+
+
+
+
+
+
+
+ {{ orderInfo.totalNum || 0 }}件商品
+
+
+ 合计 ¥ {{ orderInfo.totalPrice || 0 }}
+
+
+
+
+ 仅退款
+ 退货退款
+
+
+
+
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 243de94..904bb47 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -100,7 +100,10 @@
{{ orderInfo.realName }}
{{ orderInfo.userPhone }}
-
+
{{ orderInfo.userAddress }}
@@ -118,7 +121,11 @@
-
+
订单编号:
@@ -233,8 +240,8 @@
取消订单
立即付款
-
- 申请退款
+
+ 申请售后
diff --git a/pages/order/ReturnList/index.vue b/pages/order/ReturnList/index.vue
index 4a4d80d..89b3970 100644
--- a/pages/order/ReturnList/index.vue
+++ b/pages/order/ReturnList/index.vue
@@ -1,9 +1,28 @@
-
+
+
+
+ 全部
+
+
+ 售后中
+
+
+ 已完成
+
+
+
+
+
- 订单号:{{ order.orderId }}
+ 订单号:{{ order.orderId || '' }}
¥{{ order.payPrice }}
+ >¥{{ order.payPrice || 0 }}
@@ -44,22 +63,34 @@
+
+
diff --git a/pages/order/ReturnList/listItem.vue b/pages/order/ReturnList/listItem.vue
new file mode 100644
index 0000000..984cc50
--- /dev/null
+++ b/pages/order/ReturnList/listItem.vue
@@ -0,0 +1,73 @@
+
+
+
+
+
+ {{ 'YSHOP商铺' }}
+
+
+ 审核中
+
+
+
+
+
+
+ 工装裤男秋冬季韩版潮流潮牌ins直筒宽松阔腿休闲百搭加绒长裤子
+
+
+
+ 黑色 XL
+
+
+ x {{ 1 }}
+
+
+
+ 退款:¥299.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/request.js b/utils/request.js
index ab1868e..1a86e9d 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -20,7 +20,7 @@ import cookie from '@/utils/store/cookie'
const fly = new Fly()
fly.config.baseURL = VUE_APP_API_URL
-// 小程序请求域名
+// 小程序测试请求域名
// #ifdef MP-WEIXIN
fly.config.baseURL = 'http://347i13244b.zicp.vip/api'
// #endif