diff --git a/components/orderItem/ExpressListPopup.vue b/components/orderItem/ExpressListPopup.vue index eec4e75..3f89a12 100644 --- a/components/orderItem/ExpressListPopup.vue +++ b/components/orderItem/ExpressListPopup.vue @@ -23,11 +23,11 @@ - + {{ item.spuName }} @@ -54,7 +54,7 @@ - + 物流信息加载中... 暂无物流轨迹 @@ -393,23 +393,18 @@ const open = async () => { if (oid) { try { if (isOpenOrder) { - // 开通店铺订单:用详情接口获取延迟记录和物流数据,不走延迟记录接口 const { code, data } = await getOpenOrderDetail({ id: oid }); if (code === 0) { - // 更新 props.orderData 引用(因为原 props 可能是旧的) if (data) { - // 把最新的订单详情中的 delayRecords 取出来作为延迟记录 loadedRecords.value = Array.isArray(data?.delayRecords) ? data.delayRecords : Array.isArray(data?.delayRecordList) ? data.delayRecordList : []; - // 同时把最新的 orderData 保存下来,供 loadTrackList 查物流轨迹时用 props.orderData._openOrderDetailData = data; } } } else { - // 正常商城/店铺订单:走专门的延迟记录接口 const { code, data } = await getAiOrderDelayRecords({ orderId: oid }); if (code === 0 && Array.isArray(data)) { loadedRecords.value = data; @@ -419,7 +414,34 @@ const open = async () => { loadedRecords.value = []; } } - innerItems.value = buildExpressItemList(); + const expressList = buildExpressItemList(); + if (expressList.length === 0 && oid) { + const fallbackItem = reactive({ + itemKey: 'fallback-order-express', + isFallback: true, + delayRecordId: 0, + spuName: '', + skuText: '', + picUrl: '', + count: 0, + logisticsNo: '', + expanded: true, + loading: true, + tracks: null, + }); + expressList.push(fallbackItem); + innerItems.value = expressList; + popupRef.value?.open?.(); + emit('view-express', { + id: oid, + code: 2, + }); + const tracks = await loadTrackList(fallbackItem); + fallbackItem.tracks = tracks; + fallbackItem.loading = false; + return; + } + innerItems.value = expressList; popupRef.value?.open?.(); }; @@ -433,9 +455,17 @@ const handleClose = () => { }; const loadTrackList = async (item) => { - const delayRecordId = Number(item?.delayRecordId) || 0; const id = props.orderId || props.orderData?.id || props.orderData?.orderId; - if (!delayRecordId || !id) { + if (!id) { + uni.showToast({ + title: '物流信息异常', + icon: 'none', + }); + return []; + } + const isFallback = !!item?.isFallback; + const delayRecordId = Number(item?.delayRecordId) || 0; + if (!isFallback && !delayRecordId) { uni.showToast({ title: '物流信息异常', icon: 'none', @@ -443,14 +473,14 @@ const loadTrackList = async (item) => { return []; } const isOpenOrder = Number(props.orderData?.type) === 5; - // 开通店铺订单(type===5):物流接口 /aishop/app/open/order/get-express-track-list const requestApi = isOpenOrder ? getOpenOrderExpressTrackList : getExpressTrackList; + const params = { + id, + code: 2, + delayRecordId: !isFallback ? delayRecordId : '', + }; try { - const { code, data } = await requestApi({ - id, - code: 2, - delayRecordId, - }); + const { code, data } = await requestApi(params); if (code === 0 && Array.isArray(data)) { return data; } @@ -463,10 +493,11 @@ const loadTrackList = async (item) => { const handleToggleTrack = async (item) => { if (!item) return; if (item.loading) return; + if (item.isFallback) return; if (!item.expanded) { - const delayRecordId = Number(item?.delayRecordId) || 0; const id = props.orderId || props.orderData?.id || props.orderData?.orderId; - if (!delayRecordId || !id) { + const delayRecordId = Number(item?.delayRecordId) || 0; + if (!id || !delayRecordId) { uni.showToast({ title: '物流信息异常', icon: 'none', @@ -699,6 +730,29 @@ defineExpose({ open, close }); background: #f8fafc; border-radius: 12rpx; } + &__track--fallback { + margin-left: 0; + } + &__item--fallback &__item-action { + margin-top: 16rpx; + } + &__fallback-top { + display: flex; + flex-direction: column; + gap: 8rpx; + padding: 8rpx 0; + } + &__fallback-title { + font-size: 30rpx; + font-weight: 600; + color: #111827; + line-height: 42rpx; + } + &__fallback-desc { + font-size: 24rpx; + color: #6b7280; + line-height: 32rpx; + } &__track-loading, &__track-empty { padding: 28rpx 0;