diff --git a/components/orderItem/orderItem.vue b/components/orderItem/orderItem.vue index f604aea..9dd6706 100644 --- a/components/orderItem/orderItem.vue +++ b/components/orderItem/orderItem.vue @@ -17,7 +17,7 @@ {{ formatAfterSaleStatus(props.data) }} - + @@ -225,7 +225,9 @@ }; const isAiActionOrder = - String(props.data?.__source) === 'aishop' || Number(props.data?.type) === 5; + String(props.data?.__source) === 'aishop' || + Number(props.data?.type) === 4 || + Number(props.data?.type) === 5; const isAiStoreOrder = computed(() => String(props.data?.__source) === 'aishop'); const isPickUpOrder = computed(() => { if (Number(props.data?.deliveryType) === 2) return true; @@ -501,8 +503,15 @@ }); return; } + // 店铺订单(source=aishop)、入店订单(type=4)、赠送店铺订单(type=5) 一律弹窗查看物流;只有普通商城订单走原生跳转 const orderType = Number(props.data?.type ?? 0); - if (orderType !== 0 && isAiStoreOrder.value && !isPickUpOrder.value) { + const isStoreOrGiftOrInStore = + isAiStoreOrder.value || orderType === 4 || orderType === 5; + if (!isStoreOrGiftOrInStore) { + proxy.utils.go('/pages/order/express/log', { id }); + return; + } + if (!isPickUpOrder.value) { expressListPopupRef.value?.open?.(); return; } diff --git a/components/truckLine/truckLine.vue b/components/truckLine/truckLine.vue index 7c93d47..70f4fcb 100644 --- a/components/truckLine/truckLine.vue +++ b/components/truckLine/truckLine.vue @@ -31,12 +31,7 @@ let show = ref(false); let list = ref([]); const logistics = () => { - if (props.code === 2) { - emit('openExpress', { data: props.data, code: props.code }); - return; - } - getData(); - show.value = true; + emit('openExpress', { data: props.data, code: props.code }); }; const close = () => { show.value = false; diff --git a/pages/AI/giftOrderInfo.vue b/pages/AI/giftOrderInfo.vue index 7d903ba..e680557 100644 --- a/pages/AI/giftOrderInfo.vue +++ b/pages/AI/giftOrderInfo.vue @@ -42,6 +42,7 @@ :data="state.orderInfo" type="4" @getOrderDetail="getOrderDetail" + @openExpress="handleOpenExpress" > @@ -77,6 +78,7 @@ :data="state.orderInfo" :code="3" v-if="state.orderInfo.deliveryTime" + @openExpress="handleOpenExpress" > @@ -99,8 +101,14 @@ + 查看物流