diff --git a/api/order.js b/api/order.js
index 825e27c..cd9933d 100644
--- a/api/order.js
+++ b/api/order.js
@@ -103,3 +103,39 @@ export function getMiniProgramSignUrl(data) {
data,
});
}
+
+// 售后申请
+export function afterSaleApply(data) {
+ return request({
+ url: "/order/afterApply",
+ method: "post",
+ data,
+ });
+}
+
+// 售后订单详情
+export function afterSaleDetail(data) {
+ return request({
+ url: "/order/getAfterDetail",
+ method: "get",
+ data,
+ });
+}
+
+// 撤销售后申请
+export function cancelAfterSale(data) {
+ return request({
+ url: "/order/cancelAfterApply",
+ method: "post",
+ data,
+ });
+}
+
+// 寄回商品反馈
+export function returnGoodsFeedback(data) {
+ return request({
+ url: "/order/sendGoodsBack",
+ method: "post",
+ data,
+ });
+}
diff --git a/pages/mine_package/mine_order/after-sales/index.vue b/pages/mine_package/mine_order/after-sales/index.vue
index c556e33..e943bcd 100644
--- a/pages/mine_package/mine_order/after-sales/index.vue
+++ b/pages/mine_package/mine_order/after-sales/index.vue
@@ -1,15 +1,86 @@
-
-
- 售后
-
-
-
-
+
+
+ 选择退货原因
+
+
+
+
+
+
+ 下一步
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/mine_package/mine_order/after-sales/refund-popu.vue b/pages/mine_package/mine_order/after-sales/refund-popu.vue
new file mode 100644
index 0000000..280f066
--- /dev/null
+++ b/pages/mine_package/mine_order/after-sales/refund-popu.vue
@@ -0,0 +1,411 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ product.items[0].title }}
+ ¥{{ product.items[0].goodsAmount }}
+
+ 规格:{{ product.sumAmount }}
+
+
+ 共{{ product.buyNum }}件
+ 合计{{ product.sumAmount }}元
+
+
+
+
+ 退款原因
+ {{ RETURN_REASON_OBJ[product.afterReason] }}
+
+
+ 退款金额
+
+ ¥{{ product.refundAmount || product.sumAmount }}
+ (退回现金余额)
+
+
+
+
+
+ 邮寄地址
+ {{ address || "--" }}
+
+
+ 填快递单号
+
+
+
+ 填快递名称
+
+
+
+
+ {{ buttonLabel }}
+
+
+
+
+
+
+
diff --git a/pages/mine_package/mine_order/components/salesStatus.vue b/pages/mine_package/mine_order/components/salesStatus.vue
new file mode 100644
index 0000000..c8a34b8
--- /dev/null
+++ b/pages/mine_package/mine_order/components/salesStatus.vue
@@ -0,0 +1,56 @@
+
+
+
+
+ {{ topTitle }}
+ {{ topLabel }}
+
+
+
+
+
+
+
diff --git a/pages/mine_package/mine_order/emun/index.js b/pages/mine_package/mine_order/emun/index.js
new file mode 100644
index 0000000..071a6f0
--- /dev/null
+++ b/pages/mine_package/mine_order/emun/index.js
@@ -0,0 +1,33 @@
+export const RETURN_REASON = {
+ 1: "我不想买了",
+ 2: "下错单了",
+ 3: "商家未发货",
+ 4: "商品质量问题",
+ 5: "商品实物与描述不符",
+ 6: "商家发错货",
+ 7: "假冒品牌",
+ 8: "配件破损",
+ 9: "主商品破损",
+ 10: "协商一致退款",
+ 11: "少件(少配件)",
+ 12: "其他",
+}
+
+export const RETURN_REASON_LIST = [
+ { id: 1, name: '我不想买了' },
+ { id: 2, name: '下错单了' },
+ { id: 3, name: '商家未发货' },
+ { id: 4, name: '商品质量问题' },
+ { id: 5, name: '商品实物与描述不符' },
+ { id: 6, name: '商家发错货' },
+ { id: 7, name: '假冒品牌' },
+ { id: 8, name: '配件破损' },
+ { id: 9, name: '主商品破损' },
+ { id: 10, name: '协商一致退款' },
+ { id: 11, name: '少件(少配件)' },
+ { id: 12, name: '其他' },
+]
+
+
+
+
\ No newline at end of file
diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue
index e605bb3..d3e39b4 100644
--- a/pages/mine_package/mine_order/mine_order.vue
+++ b/pages/mine_package/mine_order/mine_order.vue
@@ -1,904 +1,1115 @@
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ pItem.title }}
- {{ pItem.goodsSpece }}
-
-
-
- ¥{{ pItem.goodsAmount }}
- x{{ pItem.buyNum }}
-
-
-
- 运单号:({{ pItem.expressName }}){{ pItem.expressNo }}
-
-
-
-
-
-
-
-
-
-
- (快递动态跟进请复制单号至[快递100官网] 查询)
- 共{{ item.buyNum }}件,合计¥{{ item.sumAmount }}
-
-
- 共{{ item.buyNum }}件,合计¥{{ item.sumAmount }}
-
-
-
- 去付款
-
-
- 确认收货
-
- 去签署
-
-
-
- 申请售后
-
-
-
-
-
-
-
-
-
-
- 暂无相关订单
-
- 加载中...
-
-
-
-
- 取消订单
-
-
-
- 温馨提示:
- 1.限时特价、预约资格等购买优惠可能一并取消
- 2.订单一旦取消,支付优惠一并取消,可能无法恢复
-
-
- 请选择取消订单的原因(必选):
-
-
-
-
-
-
-
-
-
- 提交
-
-
-
-
-
-
-
-
-
-
- 温馨提示
- 暂未开放
-
-
- 确定
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ pItem.title }}
+ {{ pItem.goodsSpece }}
+
+
+
+ ¥{{ pItem.goodsAmount }}
+ x{{ pItem.buyNum }}
+
+
+
+
+ 运单号:
+ ({{ pItem.expressName }})
+ {{ pItem.expressNo }}
+
+
+
+
+
+
+
+
+
+
+ (快递动态跟进请复制单号至[快递100官网] 查询)
+ 共{{ item.buyNum }}件,合计¥{{ item.sumAmount }}
+
+ 共{{ item.buyNum }}件,合计¥{{ item.sumAmount }}
+
+
+ 去付款
+
+
+ 确认收货
+ 去签署
+
+
+ 售后
+
+
+
+
+
+
+
+
+
+
+ 暂无相关订单
+
+ 加载中...
+
+
+
+
+
+
+
+
+
+
+ 温馨提示
+ 暂未开放
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/rwa_package/dongjian/check.vue b/pages/rwa_package/dongjian/check.vue
index e4383d7..149c969 100644
--- a/pages/rwa_package/dongjian/check.vue
+++ b/pages/rwa_package/dongjian/check.vue
@@ -97,7 +97,7 @@ export default {
// this.dataList[2].value = this.obj.flowId;
this.dataList[0].value = this.obj.state ? '已签署' : '未签署';
- this.dataList[1].value = this.obj.flowid;
+ this.dataList[1].value = this.obj.flowId;
this.dataList[3].value = this.obj.details.startTime;
this.dataList[4].value = this.obj.details.endTime;
this.bottomList[0].value = this.obj.signatureName;
@@ -207,8 +207,8 @@ export default {
flex-direction: column;
.list-right {
- width: 238rpx;
- margin-left: 40rpx;
+ width: 255rpx;
+ margin-left: 25rpx;
word-break: break-all;
display: flex;
}
diff --git a/utils/request.js b/utils/request.js
index c0445f3..867215b 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -87,7 +87,7 @@ function request(options) {
}
} else {
uni.showToast({
- title: data.msg,
+ title: data.msg || "系统错误,请稍后再试",
icon: 'none', // 可选 success/loading/none
duration: 2000, // 持续时长,单位ms
});