diff --git a/components/orderItem/AiOrderActionBar.vue b/components/orderItem/AiOrderActionBar.vue index b2db414..0c5c109 100644 --- a/components/orderItem/AiOrderActionBar.vue +++ b/components/orderItem/AiOrderActionBar.vue @@ -2,18 +2,25 @@ 延迟发货 立即发货 + + 查看物流 + {{ props.viewText }} - + 确认收货 @@ -37,6 +44,7 @@ diff --git a/components/orderItem/card_order.vue b/components/orderItem/card_order.vue index 2fbd869..3c1ac0b 100644 --- a/components/orderItem/card_order.vue +++ b/components/orderItem/card_order.vue @@ -483,7 +483,10 @@ return { delayed: false, count: 0, text: '' }; } const { spuRecords } = buildSpuRecordAssignment(spuItem); - const count = sumDelayCount(spuRecords); + const delayingRecords = spuRecords.filter( + (record) => resolveDelayStatus(record) === 1, + ); + const count = sumDelayCount(delayingRecords); if (!count) { return { delayed: false, count: 0, text: '' }; } diff --git a/components/orderItem/orderItem.vue b/components/orderItem/orderItem.vue index 3a85263..0242b53 100644 --- a/components/orderItem/orderItem.vue +++ b/components/orderItem/orderItem.vue @@ -79,12 +79,17 @@ :disableDelayShipment="isPickUpOrder || !isAiStoreOrder" :showView="true" :hasDelayedItems="hasDelayedItems" + :logisticsId="props.data.logisticsId" + :logisticsNo="props.data.logisticsNo" + :deliveryTime="props.data.deliveryTime" + :hasLogistics="hasLogistics" @delay="onDelayShipment" @now="onNowShipment" @view="goAiOrderInfo" @confirm="confirmReceiveOrder" @pay="goPay" @cancel="cancelAiOrder" + @express="goExpressLog" /> @@ -231,6 +236,26 @@ return orderRecords.some((record) => Number(record?.status) === 1); }); + const hasLogistics = computed(() => { + const data = props.data || {}; + if (Number(data.logisticsId) > 0) return true; + if (data.logisticsNo && String(data.logisticsNo).trim()) return true; + if (data.deliveryTime) return true; + const items = Array.isArray(data.items) ? data.items : []; + for (const item of items) { + if (Number(item?.logisticsId) > 0) return true; + if (item?.logisticsNo && String(item.logisticsNo).trim()) return true; + if (item?.deliveryTime) return true; + const subItems = Array.isArray(item?.items) ? item.items : []; + for (const sub of subItems) { + if (Number(sub?.logisticsId) > 0) return true; + if (sub?.logisticsNo && String(sub.logisticsNo).trim()) return true; + if (sub?.deliveryTime) return true; + } + } + return false; + }); + const state = reactive({ delayRecords: [], delayRecordsLoaded: false, @@ -385,6 +410,18 @@ proxy.utils.go('/pages/AI/orderInfo', { id }); }; + const goExpressLog = () => { + const id = resolveAiOrderId(props.data); + if (!id) { + uni.showToast({ + title: '订单信息异常', + icon: 'none', + }); + return; + } + proxy.utils.go('/pages/order/express/log', { id }); + }; + const confirmReceiveOrder = async () => { const id = resolveAiOrderId(props.data); if (!id) return; diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 726ffed..629721f 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -106,11 +106,16 @@ :status="Number(state.orderInfo.status)" :disableDelayShipment="isPickUpOrder || !isAiStoreOrder" :hasDelayedItems="hasDelayedItems" + :logisticsId="state.orderInfo.logisticsId" + :logisticsNo="state.orderInfo.logisticsNo" + :deliveryTime="state.orderInfo.deliveryTime" + :hasLogistics="hasLogistics" @delay="delayShipment" @now="nowShipment" @confirm="confirmReceiveOrder" @pay="goPay" @cancel="cancelAiOrder" + @express="goExpressLog" /> Number(record?.status) === 1); }); + const hasLogistics = computed(() => { + const info = state.orderInfo || {}; + if (Number(info.logisticsId) > 0) return true; + if (info.logisticsNo && String(info.logisticsNo).trim()) return true; + if (info.deliveryTime) return true; + const items = Array.isArray(info.items) ? info.items : []; + for (const item of items) { + if (Number(item?.logisticsId) > 0) return true; + if (item?.logisticsNo && String(item.logisticsNo).trim()) return true; + if (item?.deliveryTime) return true; + const subItems = Array.isArray(item?.items) ? item.items : []; + for (const sub of subItems) { + if (Number(sub?.logisticsId) > 0) return true; + if (sub?.logisticsNo && String(sub.logisticsNo).trim()) return true; + if (sub?.deliveryTime) return true; + } + } + return false; + }); + const showBottomBar = computed(() => { if (!isAiActionOrder.value) return true; const status = Number(state.orderInfo?.status); - if ([0, 20].includes(status)) return true; + if ([0, 15, 20].includes(status)) return true; if (!isAiStoreOrder.value) return false; if (isPickUpOrder.value) return false; if (hasDelayedItems.value) return true; - return [10, 50, 70].includes(status); + return [10, 15, 50, 70].includes(status); }); const resolvePickUpStoreId = (data = {}) => { @@ -444,6 +469,18 @@ }); }; + const goExpressLog = () => { + const id = resolveAiOrderId(state.orderInfo); + if (!id) { + uni.showToast({ + title: '订单信息异常', + icon: 'none', + }); + return; + } + sheep.$router.go('/pages/order/express/log', { id }); + }; + const cancelAiOrder = () => { const id = resolveAiOrderId(state.orderInfo); if (!id) return; diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js index 3f5d190..684aafb 100644 --- a/sheep/hooks/useGoods.js +++ b/sheep/hooks/useGoods.js @@ -103,7 +103,7 @@ export function formatOrderColor(order) { if (order.status === 0) { return 'info-color'; } - if (order.status === 10 || order.status === 20 || (order.status === 30 && !order.commentStatus)) { + if (order.status === 10 || order.status === 15 || order.status === 20 || (order.status === 30 && !order.commentStatus)) { return 'warning-color'; } if (order.status === 30 && order.commentStatus) { @@ -125,6 +125,9 @@ export function formatOrderStatus(order) { if (order.status == 10) { return '待发货'; } + if (order.status == 15) { + return '部分发货'; + } if (order.status == 20) { return '待收货'; } @@ -162,6 +165,9 @@ export function formatOrderStatusDescription(order) { if (order.status === 10) { return '商家未发货,请耐心等待'; } + if (order.status === 15) { + return '商家部分发货,剩余商品请耐心等待'; + } if (order.status === 20) { return '商家已发货,请耐心等待'; }