diff --git a/pages/AI/orderInfo.vue b/pages/AI/orderInfo.vue index 9381fbd..c48644b 100644 --- a/pages/AI/orderInfo.vue +++ b/pages/AI/orderInfo.vue @@ -50,6 +50,8 @@ ref="pickUpVerifyRef" :orderInfo="state.orderInfo" :systemStore="systemStore" + source="aishop" + detailStyle="ai" /> @@ -189,6 +191,20 @@ const pickUpVerifyRef = ref(); let orderId = ref(); + const resolvePickUpStoreId = (data = {}) => { + return Number( + data?.pickUpStoreId || + data?.pickUpStore?.id || + data?.pickUpStore?.storeId || + data?.pickUpStoreVO?.id || + data?.pickUpStoreVO?.storeId || + data?.store?.id || + data?.store?.storeId || + data?.storeId || + 0, + ); + }; + async function getOrderDetail() { let id = orderId.value; // 对详情数据进行适配 @@ -197,8 +213,9 @@ if (res.code === 0) { state.orderInfo = res.data; handleOrderButtons(state.orderInfo); - if (res.data.pickUpStoreId) { - const { data } = await StoreApi.getStoreById(res.data.pickUpStoreId); + const pickUpStoreId = resolvePickUpStoreId(res.data); + if (pickUpStoreId > 0) { + const { data } = await StoreApi.getStoreById(pickUpStoreId); systemStore.value = data || {}; } else { systemStore.value = {}; diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 471db3d..a6efbb9 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -36,6 +36,9 @@ ref="pickUpVerifyRef" :orderInfo="state.orderInfo" :systemStore="systemStore" + :source="state.source" + :orderType="state.orderType" + detailStyle="order" /> @@ -159,6 +162,20 @@ ); }); + const resolvePickUpStoreId = (data = {}) => { + return Number( + data?.pickUpStoreId || + data?.pickUpStore?.id || + data?.pickUpStore?.storeId || + data?.pickUpStoreVO?.id || + data?.pickUpStoreVO?.storeId || + data?.store?.id || + data?.store?.storeId || + data?.storeId || + 0, + ); + }; + const resolveAiOrderId = (data) => { return data?.id || data?.orderId; }; @@ -266,12 +283,7 @@ handleOrderButtons(state.orderInfo); // 配送方式:门店自提 const isPickUp = Number(res.data?.deliveryType) === 2; - const pickUpStoreId = Number( - res.data?.pickUpStoreId || - res.data?.pickUpStore?.id || - res.data?.pickUpStore?.storeId || - res.data?.storeId, - ); + const pickUpStoreId = resolvePickUpStoreId(res.data); if (isPickUp && pickUpStoreId > 0) { const { data } = await StoreApi.getStoreById(pickUpStoreId); systemStore.value = data || {}; diff --git a/pages/order/pickUpVerify.vue b/pages/order/pickUpVerify.vue index dce4151..b11e7b2 100644 --- a/pages/order/pickUpVerify.vue +++ b/pages/order/pickUpVerify.vue @@ -80,27 +80,52 @@ type: Object, default() {}, }, + source: { + type: String, + default: '', + }, + orderType: { + type: [String, Number], + default: '', + }, + detailStyle: { + type: String, + default: 'order', + }, }); const state = reactive({ qrcodeSize: 145, }); - const goStockProgress = () => { - const id = props.orderInfo?.id || props.orderInfo?.orderId; - const pickUpStoreId = Number( + const resolvePickUpStoreId = () => { + return Number( props.orderInfo?.pickUpStoreId || props.orderInfo?.pickUpStore?.id || props.orderInfo?.pickUpStore?.storeId || + props.orderInfo?.pickUpStoreVO?.id || + props.orderInfo?.pickUpStoreVO?.storeId || + props.orderInfo?.store?.id || + props.orderInfo?.store?.storeId || props.systemStore?.id || props.systemStore?.storeId || props.orderInfo?.storeId || 0, ); + }; + + const goStockProgress = () => { + const id = props.orderInfo?.id || props.orderInfo?.orderId; + const pickUpStoreId = resolvePickUpStoreId(); + const source = String(props.source || props.orderInfo?.__source || props.orderInfo?.source || '').trim(); + const orderType = String(props.orderType || props.orderInfo?.type || '').trim(); + const detailStyle = String(props.detailStyle || '').trim(); if (!id) return; uni.navigateTo({ url: `/pages/order/stockProgress?id=${id}${ pickUpStoreId > 0 ? `&pickUpStoreId=${pickUpStoreId}` : '' - }`, + }${source ? `&source=${encodeURIComponent(source)}` : ''}${ + orderType ? `&type=${encodeURIComponent(orderType)}` : '' + }${detailStyle ? `&detailStyle=${encodeURIComponent(detailStyle)}` : ''}`, }); }; diff --git a/pages/order/stockProgress.vue b/pages/order/stockProgress.vue index d4e5f7a..3b2a9c6 100644 --- a/pages/order/stockProgress.vue +++ b/pages/order/stockProgress.vue @@ -45,15 +45,14 @@ - 商品清单 ({{ items.length }}) - - - - {{ it.spuName }} - {{ getSpecText(it) }} - x{{ it.count }} - - + + 暂无商品信息 @@ -71,18 +70,23 @@ import sheep from '@/sheep'; import OrderApi from '@/sheep/api/trade/order'; import OrderStoreApi from '@/sheep/api/trade/orderStore'; + import { getOrderDetail as getAiOrderDetail, getOpenOrderDetail } from '@/sheep/api/ai'; + import card_order from '@/components/orderItem/card_order.vue'; const state = reactive({ orderId: 0, pickUpStoreId: 0, preparationStatus: null, + source: '', + orderType: '', + detailStyle: 'order', orderInfo: {}, loading: false, }); const sortingPercent = ref(72); - const items = computed(() => { + const goodsItems = computed(() => { const list = state.orderInfo?.items || state.orderInfo?.orderItems || @@ -91,6 +95,15 @@ return Array.isArray(list) ? list : []; }); + const goodsCardType = computed(() => (String(state.detailStyle) === 'ai' ? '4' : '2')); + + const goodsCardData = computed(() => { + return { + ...(state.orderInfo || {}), + items: goodsItems.value, + }; + }); + const formatTime = (t) => { if (!t) return ''; return sheep.$helper.timeFormat(t, 'yyyy-mm-dd hh:MM:ss'); @@ -102,7 +115,15 @@ const resolvePickUpStoreId = (data = {}) => { return Number( - data?.pickUpStoreId || data?.pickUpStore?.id || data?.pickUpStore?.storeId || data?.storeId || 0, + data?.pickUpStoreId || + data?.pickUpStore?.id || + data?.pickUpStore?.storeId || + data?.pickUpStoreVO?.id || + data?.pickUpStoreVO?.storeId || + data?.store?.id || + data?.store?.storeId || + data?.storeId || + 0, ); }; @@ -183,21 +204,19 @@ return `data:image/svg+xml;utf8,${encodeURIComponent(svg)}`; }; - const getSpecText = (it) => { - const props = it?.properties; - if (Array.isArray(props) && props.length) { - return props.map((p) => p?.valueName).filter(Boolean).join(' / '); - } - return it?.spec || ''; - }; - const getDetail = async () => { if (!state.orderId || state.loading) return; if (!state.orderInfo || !Object.keys(state.orderInfo).length || !(state.pickUpStoreId > 0)) { - const detailRes = await OrderApi.getOrderDetail(state.orderId); + const detailRes = + String(state.orderType) === '5' + ? await getOpenOrderDetail({ id: state.orderId }) + : String(state.source) === 'aishop' + ? await getAiOrderDetail({ id: state.orderId }) + : await OrderApi.getOrderDetail(state.orderId); if (detailRes?.code === 0) { - state.orderInfo = detailRes.data || {}; - state.pickUpStoreId = resolvePickUpStoreId(detailRes.data); + const detailData = detailRes.data?.orderInfo || detailRes.data || {}; + state.orderInfo = detailData; + state.pickUpStoreId = resolvePickUpStoreId(detailData); } } if (!(state.pickUpStoreId > 0)) { @@ -239,6 +258,9 @@ if (id) state.orderId = id; const pickUpStoreId = Number(options?.pickUpStoreId || options?.storeId || 0); if (pickUpStoreId > 0) state.pickUpStoreId = pickUpStoreId; + state.source = String(options?.source || '').trim(); + state.orderType = String(options?.type || '').trim(); + state.detailStyle = String(options?.detailStyle || 'order').trim() || 'order'; }); onShow(() => { @@ -393,52 +415,13 @@ box-sizing: border-box; } - .goods-title { - font-size: 30rpx; - color: #222; - font-weight: 600; - margin-bottom: 18rpx; - } - - .goods-row { - display: flex; - align-items: flex-start; - padding: 16rpx 0; - } - - .goods-pic { - width: 96rpx; - height: 96rpx; - border-radius: 16rpx; - background: #f2f4f7; - flex-shrink: 0; - margin-right: 16rpx; - } - - .goods-main { - flex: 1; - } - - .goods-name { - font-size: 28rpx; - color: #222; - font-weight: 600; - line-height: 1.3; - } - - .goods-spec { - margin-top: 8rpx; - font-size: 24rpx; + .goods-empty { + padding: 24rpx 0; + text-align: center; + font-size: 26rpx; color: #9aa0a6; } - .goods-count { - margin-top: 6rpx; - font-size: 24rpx; - color: #222; - font-weight: 600; - } - .footer { padding: 18rpx 24rpx 28rpx; }