From 9c1e42fe48a5d1d0c846844f9814bf07091f08ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E5=96=B5=E5=92=AA?= <15233722133@163.com>
Date: Mon, 10 Aug 2026 13:37:06 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=20=E6=99=AE=E9=80=9A=E5=95=86?=
=?UTF-8?q?=E5=93=81=E5=94=AE=E5=90=8E=E8=AE=A2=E5=8D=95=E9=9A=90=E8=97=8F?=
=?UTF-8?q?=E3=80=81=E6=9F=A5=E7=9C=8B=E7=89=A9=E6=B5=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/card_orderBan/card_orderBan.vue | 4 ++++
components/orderItem/orderItem.vue | 3 ++-
pages/order/detail.vue | 11 +++++++----
pages/order/list.vue | 12 +++++++++++-
4 files changed, 24 insertions(+), 6 deletions(-)
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);