diff --git a/components/card_orderBan/card_orderBan.vue b/components/card_orderBan/card_orderBan.vue index cc7ec34..f3248b4 100644 --- a/components/card_orderBan/card_orderBan.vue +++ b/components/card_orderBan/card_orderBan.vue @@ -11,6 +11,7 @@ - + 下单时间 @@ -564,7 +565,8 @@ }); return; } - if (isAiStoreOrder.value && !isPickUpOrder.value) { + const orderType = Number(state.orderInfo?.type ?? state.orderType ?? 0); + if (orderType !== 0 && isAiStoreOrder.value && !isPickUpOrder.value) { expressListPopupRef.value?.open?.(); return; } @@ -580,7 +582,8 @@ }); return; } - if (!isPickUpOrder.value) { + const orderType = Number(state.orderInfo?.type ?? state.orderType ?? 0); + if (orderType !== 0 && !isPickUpOrder.value) { expressListPopupRef.value?.open?.(); return; } diff --git a/pages/order/list.vue b/pages/order/list.vue index 22233a7..7b75fa3 100644 --- a/pages/order/list.vue +++ b/pages/order/list.vue @@ -206,8 +206,18 @@ : Array.isArray(pageData) ? pageData : []; - const nextList = + const nextListRaw = state.currentType === 1 ? list.map((o) => ({ ...o, __source: 'aishop' })) : list; + const isMallOrder = state.currentType === 0; + let nextList = isMallOrder && !isAfterSaleTab + ? nextListRaw.map((order) => { + const items = Array.isArray(order?.items) ? order.items.filter((item) => Number(item?.afterSaleStatus ?? 0) === 0) : []; + return { ...order, items }; + }) + : nextListRaw; + if (isMallOrder && !isAfterSaleTab) { + nextList = nextList.filter((order) => Array.isArray(order?.items) && order.items.length > 0); + } nextList.forEach((order) => handleOrderButtons(order)); if (mescroll.num == 1) state.list[mescroll.dataObj.i] = []; state.list[mescroll.dataObj.i] = state.list[mescroll.dataObj.i].concat(nextList);