From 87e67fa36aabae985362c18245041a758e488919 Mon Sep 17 00:00:00 2001
From: mixtan <424491071@qq.com>
Date: Tue, 30 Sep 2025 08:53:45 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E7=9A=84=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=94=B6=E8=B4=A7=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 member/order/detail.vue | 3 ++-
 member/order/list.vue   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/member/order/detail.vue b/member/order/detail.vue
index e7f6b10..3dd1312 100644
--- a/member/order/detail.vue
+++ b/member/order/detail.vue
@@ -167,7 +167,8 @@
             :data-on="OrderInfo.order_id"
             v-if="
               OrderInfo.kind_id == 1201 &&
-              OrderInfo.order_state_id == StateCode.ORDER_STATE_SHIPPED
+              [2040,2050,2060].includes(OrderInfo.order_state_id) && 
+              OrderInfo.order_is_received==0
             "
             @click="confirmReceipt(OrderInfo, $event)"
             >{{ __("确认收货") }}</view
diff --git a/member/order/list.vue b/member/order/list.vue
index e59ff98..ff918ac 100644
--- a/member/order/list.vue
+++ b/member/order/list.vue
@@ -351,7 +351,8 @@
                 :data-on="items.order_id"
                 v-if="
                   items.kind_id == 1201 &&
-                  items.order_state_id == StateCode.ORDER_STATE_SHIPPED
+                  [2040, 2050, 2060].includes(items.order_state_id) &&
+                  items.order_is_received == 0
                 "
                 class="u-link-btn"
                 @click="confirmReceipt(items, $event)"