From 866ee54a0bd87258e020ad6b44478680c51129e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Fri, 12 Sep 2025 16:11:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=AE=B6=E5=B7=B2?=
=?UTF-8?q?=E5=A4=84=E7=90=86=E7=9A=84=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/myOrders/afterSale/index.vue | 29 +++++++++++++++---------
packages/myOrders/changeInfo/index.vue | 3 ++-
packages/myOrders/pending/index.vue | 10 ++++-----
packages/myOrders/refundOver/index.css | 11 ++++-----
packages/myOrders/refundOver/index.vue | 21 ++++++++++-------
packages/myOrders/sendBack/index.css | 11 ++++-----
packages/myOrders/sendBack/index.vue | 31 ++++++++++++++++----------
7 files changed, 65 insertions(+), 51 deletions(-)
diff --git a/packages/myOrders/afterSale/index.vue b/packages/myOrders/afterSale/index.vue
index eb40338f..5de003a8 100644
--- a/packages/myOrders/afterSale/index.vue
+++ b/packages/myOrders/afterSale/index.vue
@@ -98,12 +98,12 @@ export default {
});
},
getStatusText(item) {
- if(item.after_sales_status === 2) {
+ if (item.after_sales_status === 2) {
return '已撤销';
}
- if(item.process_status === 2) {
+ if (item.process_status === 2) {
return '已完成';
- }else if(item.process_status === 3) {
+ } else if (item.process_status === 3) {
return '已取消';
}
const status = item.review_status;
@@ -157,14 +157,21 @@ export default {
},
pendingPage(item) {
console.log("🚀 ~ pendingPage ~ item:", item)
- if (item.after_sales_type === 3) {
- NavgateTo(`/packages/myOrders/changeInfo/index?item=${JSON.stringify(item)}`)
- } else {
- NavgateTo(`/packages/myOrders/pending/index?item=${JSON.stringify(item)}`); //拒绝申请
- // NavgateTo(`/packages/myOrders/sendBack/index?item=${JSON.stringify(item)}`); //自行寄回
- // NavgateTo(`/packages/myOrders/refundOver/index?item=${JSON.stringify(item)}`); //退款成功
- // NavgateTo(`/packages/myOrders/changeInfo/index?item=${JSON.stringify(item)}`); //换货
- }
+ NavgateTo(`/packages/myOrders/refundOver/index?item=${JSON.stringify(item)}`);
+
+ // if (item.after_sales_type === 3) {
+ // if (item.review_status === 2) {
+ // NavgateTo(`/packages/myOrders/sendBack/index?item=${JSON.stringify(item)}`); //自行寄回
+ // return;
+ // }
+ // NavgateTo(`/packages/myOrders/changeInfo/index?item=${JSON.stringify(item)}`)
+ // } else {
+ // if (item.refund_completed_time) {
+ // NavgateTo(`/packages/myOrders/refundOver/index?item=${JSON.stringify(item)}`); //退款成功
+ // return;
+ // }
+ // NavgateTo(`/packages/myOrders/pending/index?item=${JSON.stringify(item)}`);
+ // }
}
},
};
diff --git a/packages/myOrders/changeInfo/index.vue b/packages/myOrders/changeInfo/index.vue
index e880978f..26a13022 100644
--- a/packages/myOrders/changeInfo/index.vue
+++ b/packages/myOrders/changeInfo/index.vue
@@ -83,7 +83,7 @@
{{ currentAfterSale.commodity_order_item[0].goods_spec }}
{{ '¥' + currentAfterSale.commodity_order_item[0].sales_price.toFixed(2) + '/个' }}
- X{{ currentAfterSale.commodity_order_item[0].count }}
+ X{{ currentAfterSale.after_sales_goods.split('@')[0] }}
@@ -197,6 +197,7 @@ import {
upload,
NavgateTo
} from '../../../utils';
+import { apiArr } from "../../../api/afterSale";
export default {
data() {
diff --git a/packages/myOrders/pending/index.vue b/packages/myOrders/pending/index.vue
index 7d5b9286..b978f381 100644
--- a/packages/myOrders/pending/index.vue
+++ b/packages/myOrders/pending/index.vue
@@ -1,7 +1,7 @@
-
+
商家处理
@@ -15,7 +15,7 @@
-
+
商家处理
@@ -26,13 +26,13 @@
-
+
请等待商家处理
2天后商家未处理将自动同意
您已成功发起退款申请，请耐心等待商家处理
-
+
商家拒绝申请,请您处理
2天后未处理将自动关闭
@@ -91,7 +91,7 @@
-
+
diff --git a/packages/myOrders/refundOver/index.css b/packages/myOrders/refundOver/index.css
index 331732fc..f09763d6 100644
--- a/packages/myOrders/refundOver/index.css
+++ b/packages/myOrders/refundOver/index.css
@@ -107,6 +107,7 @@
display: flex;
flex-direction: column;
justify-content: space-between;
+ position: relative;
}
.asGoodTag {
@@ -141,12 +142,9 @@
.goods-desc {
font-size: 26rpx;
- color: #ff4d4f;
- background-color: #fff2f0;
- padding: 4rpx 12rpx;
+ color: #999999;
border-radius: 8rpx;
display: inline-block;
- margin: 10rpx 0;
}
.goods-price {
@@ -164,10 +162,9 @@
.refund-amount {
font-size: 28rpx;
align-self: flex-start;
- margin-top: 20rpx;
font-weight: 500;
- position: relative;
- left: 140rpx;
+ position: absolute;
+ right: 10rpx;
}
.refund-info {
diff --git a/packages/myOrders/refundOver/index.vue b/packages/myOrders/refundOver/index.vue
index 2f9d3347..39d88e9f 100644
--- a/packages/myOrders/refundOver/index.vue
+++ b/packages/myOrders/refundOver/index.vue
@@ -46,10 +46,10 @@
{{ currentAfterSale.commodity_order_item[0].goods_name }}
退款：¥{{ currentAfterSale.refund_amount.toFixed(2) }}
- {{ ite.after_sales_reason }}
+ {{ currentAfterSale.commodity_order_item[0].goods_spec }}
{{ '¥' + currentAfterSale.commodity_order_item[0].sales_price.toFixed(2) + '/个' }}
- X{{ currentAfterSale.commodity_order_item[0].count }}
+ X{{ currentAfterSale.after_sales_goods.split('@')[0] }}
@@ -155,6 +155,7 @@ import {
upload,
NavgateTo
} from '../../../utils';
+import { apiArr } from "../../../api/afterSale";
export default {
data() {
@@ -175,7 +176,7 @@ export default {
},
methods: {
getServiceTypeText(type) {
- return type === 1 ? '退货退款' : '仅退款';
+ return type === 1 ? '仅退款' : (type === 2 ? '退货退款' : '换货');
},
// 格式化日期
@@ -236,11 +237,15 @@ export default {
confirmText: "确认撤销",
confirmColor: "#ff4d4f",
success: (res) => {
- if (res.confirm) {
- // 撤销售后接口
- uni.showToast({
- title: '订单撤销成功',
- icon: 'success'
+ if (res.confirm) {
+ const params = {
+ id: this.currentAfterSale.id,
+ }
+ request(apiArr.revokeApply, "POST", params).then((res) => {
+ uni.showToast({
+ title: '订单撤销成功',
+ icon: 'success'
+ });
});
}
},
diff --git a/packages/myOrders/sendBack/index.css b/packages/myOrders/sendBack/index.css
index 37f3a43c..caa0747e 100644
--- a/packages/myOrders/sendBack/index.css
+++ b/packages/myOrders/sendBack/index.css
@@ -108,6 +108,7 @@
display: flex;
flex-direction: column;
justify-content: space-between;
+ position: relative;
}
.asGoodTag {
@@ -142,12 +143,9 @@
.goods-desc {
font-size: 26rpx;
- color: #ff4d4f;
- background-color: #fff2f0;
- padding: 4rpx 12rpx;
+ color: #999999;
border-radius: 8rpx;
display: inline-block;
- margin: 10rpx 0;
}
.goods-price {
@@ -165,10 +163,9 @@
.refund-amount {
font-size: 28rpx;
align-self: flex-start;
- margin-top: 20rpx;
font-weight: 500;
- position: relative;
- left: 140rpx;
+ position: absolute;
+ right: 10rpx;
}
.refund-info {
diff --git a/packages/myOrders/sendBack/index.vue b/packages/myOrders/sendBack/index.vue
index 2013eb4f..5490b5eb 100644
--- a/packages/myOrders/sendBack/index.vue
+++ b/packages/myOrders/sendBack/index.vue
@@ -22,7 +22,7 @@
需您自行联系快递公司退回，请不要邮寄到付
商家地址
- {{ currentAfterSale.after_sales_no }}
+ {{ currentAfterSale.supplier_address }}
@@ -44,10 +44,11 @@
{{ currentAfterSale.commodity_order_item[0].goods_name }}
退款：¥{{ currentAfterSale.refund_amount.toFixed(2) }}
- {{ ite.after_sales_reason }}
+ {{ currentAfterSale.commodity_order_item[0].goods_spec }}
{{ '¥' + currentAfterSale.commodity_order_item[0].sales_price.toFixed(2) + '/个' }}
- X{{ currentAfterSale.commodity_order_item[0].count }}
+ X{{ currentAfterSale.after_sales_goods.split('@')[0] }}
+
@@ -83,7 +84,8 @@
-
+
@@ -99,6 +101,7 @@ import {
upload,
NavgateTo
} from '../../../utils';
+import { apiArr } from "../../../api/afterSale";
export default {
data() {
@@ -118,7 +121,7 @@ export default {
},
methods: {
getServiceTypeText(type) {
- return type === 1 ? '退货退款' : '仅退款';
+ return type === 1 ? '仅退款' : (type === 2 ? '退货退款' : '换货');
},
// 格式化日期
@@ -131,7 +134,7 @@ export default {
// 赋值商家地址
copyAdress() {
uni.setClipboardData({
- data: this.currentAfterSale.after_sales_no,
+ data: this.currentAfterSale.supplier_address,
success: () => {
uni.showToast({
title: '复制成功',
@@ -147,7 +150,7 @@ export default {
});
},
- addOrderId(){
+ addOrderId() {
NavgateTo(`../returnLogistics/index?item=${JSON.stringify(this.currentAfterSale)}`);
},
@@ -180,10 +183,14 @@ export default {
confirmColor: "#ff4d4f",
success: (res) => {
if (res.confirm) {
- // 撤销售后接口
- uni.showToast({
- title: '订单撤销成功',
- icon: 'success'
+ const params = {
+ id: this.currentAfterSale.id,
+ }
+ request(apiArr.revokeApply, "POST", params).then((res) => {
+ uni.showToast({
+ title: '订单撤销成功',
+ icon: 'success'
+ });
});
}
},
@@ -192,7 +199,7 @@ export default {
// 修改申请
modifyRefund() {
- NavgateTo(`../apply/index?item=${JSON.stringify(this.currentAfterSale)}`);
+ // NavgateTo(`../apply/index?item=${JSON.stringify(this.currentAfterSale)}`);
},
}
};