From 50b8039ad63b34247fd262319f2331c07186c88f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=96=B5=E5=92=AA?= <15233722133@163.com> Date: Fri, 7 Aug 2026 15:38:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=97=81=E8=BE=B9=E5=BB=B6=E8=BF=9Ftag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/orderItem/AiOrderActionBar.vue | 13 +++++++++---- components/orderItem/card_order.vue | 10 +++++++--- components/orderItem/orderItem.vue | 15 +++++++++++++-- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/components/orderItem/AiOrderActionBar.vue b/components/orderItem/AiOrderActionBar.vue index c70ba8a..dbd24ae 100644 --- a/components/orderItem/AiOrderActionBar.vue +++ b/components/orderItem/AiOrderActionBar.vue @@ -93,16 +93,21 @@ }); const showDelay = computed(() => { - if (![10, 15, 50].includes(Number(props.status))) return false; - if (Number(props.status) === 10 || Number(props.status) === 15) return true; + // 待收货(status=50)不展示延迟发货按钮——货已经发出,不需要延迟/立即发货操作 + const s = Number(props.status); + if (s === 50) return false; + if (![10, 15].includes(s)) return false; + if (s === 10 || s === 15) return true; return Boolean(props.canDelayItems); }); const showNow = computed(() => { - if (![10, 15, 50].includes(Number(props.status))) return false; + // 待收货(status=50)不展示立即发货按钮 + const s = Number(props.status); + if (s === 50) return false; + if (![10, 15].includes(s)) return false; // 只有存在延迟中(status===1)的商品时才展示立即发货按钮 if (!Boolean(props.hasDelayedItems)) return false; - if (Number(props.status) === 50) return true; return Boolean(props.canShipItems); }); diff --git a/components/orderItem/card_order.vue b/components/orderItem/card_order.vue index bfb6f1c..b7736f3 100644 --- a/components/orderItem/card_order.vue +++ b/components/orderItem/card_order.vue @@ -24,9 +24,6 @@ :class="{ 'p-r-10': props.type == 3, c0: props.theme == 2 }" > {{ v.spuName }} - - 已延迟 {{ getSpuDelayInfo(v).text }} - ¥ @@ -218,6 +215,13 @@ }); const isCompletedOrder = computed(() => orderStatusText.value === '已完成'); + // 待收货状态(status=50):不再展示任何"已延迟 N 件"tab / 状态 + 数量的 SKU 延迟明细, + // 因为货已经发出,延迟发货的相关状态对用户无意义。 + const isReceivingOrder = computed(() => { + const s = Number(props.data?.status); + return s === 50; + }); + const hasDelayRecords = computed(() => { if (isCompletedOrder.value) return false; if (!isAiStoreOrder.value) return false; diff --git a/components/orderItem/orderItem.vue b/components/orderItem/orderItem.vue index 725d102..d906584 100644 --- a/components/orderItem/orderItem.vue +++ b/components/orderItem/orderItem.vue @@ -244,8 +244,19 @@ }, { immediate: true }, ); - const isDelayedShipmentOrder = () => - currentStatus.value === 50 && !isPickUpOrder.value; + // 顶部提示条「延迟发货中...」仅在待付款/待发货/处理中这些发货流程前的状态展示, + // 待收货(status=50)已经发货完成,不应该再展示这条提醒。 + const isDelayedShipmentOrder = () => { + const s = Number(currentStatus.value); + if (s === 50) return false; // 待收货:不再展示延迟发货提示 + if (isPickUpOrder.value) return false; + // 其余状态(待付款/待发货/处理中)下,只要有延迟中(status===1)的商品就展示 + return Boolean( + getCurrentDelayRecords().some( + (record) => Number(record?.status) === 1, + ), + ); + }; const hasDelayedItems = computed(() => { if (!isAiStoreOrder.value) return false;