From 0022ff1befbe494e249ad5b5e9393212d719465d Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Thu, 23 May 2024 16:07:09 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E6=88=91=E7=9A=84/=E8=AE=A2=E5=8D=95):[#16?=
 =?UTF-8?q?31]=E5=BE=85=E8=AF=84=E4=BB=B7=E7=9A=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=94=B3=E8=AF=B7=E9=80=80=E6=AC=BE=20?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E8=B7=B3=E8=BD=AC=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E2=80=9C=E8=AE=A2=E5=8D=95=E5=B7=B2=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=EF=BC=8C=E5=A6=82=E9=9C=80=E9=80=80=E6=AC=BE=E8=AF=B7?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E5=AE=A2=E6=9C=8D=E2=80=9D=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index d90b595..cc6d81c 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -183,7 +183,7 @@ export default {
     this.type = parseInt(this.$yroute.query.type) || 0;
     this.changeType(this.type);
     this.getOrderData();
-    this.getOrderList();
+    this.getOrderListReq();
   },
   onHide: function () {
     this.orderList = [];
@@ -202,7 +202,8 @@ export default {
       })
     },
     goRefund(order) {
-      if (this.type === 4) {
+      // fix bug#1631
+      if (this.type === 4 || parseInt(order._status._type) === 3) {
         uni.showToast({
           title: '订单已收货，如需退款请联系客服',
           mask: false,
@@ -300,9 +301,9 @@ export default {
       this.page = 1;
       this.loaded = false;
       this.loading = false;
-      this.getOrderList();
+      this.getOrderListReq();
     },
-    getOrderList() {
+    getOrderListReq() {
       if (this.loading || this.loaded) return;
       this.loading = true;
       const {
@@ -413,7 +414,7 @@ export default {
     }
   },
   onReachBottom() {
-    !this.loading && this.getOrderList();
+    !this.loading && this.getOrderListReq();
   }
 };
 </script>