From 15c427edf71079f5fd3bf3d56a0218d1d10479dc Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 14 Oct 2024 14:27:53 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95):[#2488]=E5=BE=85?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=EF=BC=8C=E5=BE=85=E6=94=B6=E8=B4=A7=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E7=94=B3=E8=AF=B7=E9=80=80=E6=AC=BE=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E8=B5=B0=E9=80=80=E6=AC=BE=E6=B5=81=E7=A8=8B=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AE=A2=E5=8D=95=E5=B7=B2=E6=94=B6=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderDetails/index.vue | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index c17d9be..18ad204 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -729,20 +729,21 @@ export default {
       })
     },
     goGoodsReturn(orderInfo) {
-      if(orderInfo.refundSystemStatus === 0) {
-        uni.showToast({
-          title: '订单已收货，如需退款请联系商家',
-          mask: false,
-          icon: 'none',
-          duration: 3000
-        })
+      // fix bug#1631  bug#2488
+      if (parseInt(orderInfo._status._type) === 3) {
+        if(orderInfo.refundSystemStatus === 0) {
+          uni.showToast({
+            title: '订单已收货，如需退款请联系商家',
+            mask: false,
+            icon: 'none',
+            duration: 3000
+          })
+        } else {
+          uni.navigateTo({
+            url: `/pkg_orders/views/refund?id=${orderInfo.orderId}`
+          })
+        }
       } else {
-        // this.$yrouter.push({
-        //   path: `/pkg_orders/views/refund?id=${orderInfo.orderId}`,
-        //   query: {
-        //     id: orderInfo.orderId
-        //   }
-        // });
         uni.navigateTo({
           url: `/pkg_orders/views/refund?id=${orderInfo.orderId}`
         })