From 54d04b3b4594d4398c7d225e8a4e3d35b4a1f846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=B0=91=E5=90=9B?= <476671688@qq.com> Date: Fri, 17 Nov 2023 20:57:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mall/order/storeAfterSales/OrderDetail.vue | 10 ++++++++++ src/views/mall/order/storeAfterSales/index.vue | 4 ++++ src/views/mall/order/storeOrder/OrderSend.vue | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/src/views/mall/order/storeAfterSales/OrderDetail.vue b/src/views/mall/order/storeAfterSales/OrderDetail.vue index 7364c49..e478d92 100644 --- a/src/views/mall/order/storeAfterSales/OrderDetail.vue +++ b/src/views/mall/order/storeAfterSales/OrderDetail.vue @@ -12,6 +12,15 @@ 已审核 用户已发货 退款成功 +<<<<<<< HEAD + + + 正常 + 用户取消 + 商家拒绝 + + {{ DetailData.refundAmount }} +======= 用户取消 商家拒绝 @@ -21,6 +30,7 @@ {{ DetailData.refundAmount.toFixed(2) }} +>>>>>>> master {{ DetailData.reasons }} {{ DetailData.explains }} diff --git a/src/views/mall/order/storeAfterSales/index.vue b/src/views/mall/order/storeAfterSales/index.vue index c93bdf9..cc0802b 100644 --- a/src/views/mall/order/storeAfterSales/index.vue +++ b/src/views/mall/order/storeAfterSales/index.vue @@ -51,11 +51,15 @@ +<<<<<<< HEAD + +======= +>>>>>>> master