diff --git a/components/orderItem/card_order.vue b/components/orderItem/card_order.vue index 1dcb7d0..61e8361 100644 --- a/components/orderItem/card_order.vue +++ b/components/orderItem/card_order.vue @@ -20,7 +20,7 @@ {{ v.spuName }} - ¥¥{{ fen2yuan(v.price) }} @@ -40,6 +40,19 @@ + + + + + {{ formatSkuProperties(item?.properties) }} + + + x{{ item.count }} + ¥{{ fen2yuan(item.payPrice || item.price) }} + + + + {{ formatSkuProperties(v.properties) }} {{ @@ -80,6 +93,14 @@ .filter(Boolean) .join(' '); }; + const showMultiSku = (item: any) => { + return ( + ['2', '3'].includes(props.type) && + [String(props.source), String(props.data?.__source)].includes('aishop') && + Array.isArray(item?.items) && + item.items.length > 1 + ); + }; const props = defineProps({ data: { type: Object, @@ -91,6 +112,10 @@ type: String, default: '0', //0列表2订单详情 3订单列表 4ai订单详情 }, + source: { + type: String, + default: '', + }, theme: { type: String, default: '2', //1浅色 2深色 @@ -152,6 +177,25 @@ font-size: 24rpx; } + .multi-sku-list { + width: 100%; + } + + .multi-sku-item:last-child { + margin-bottom: 0; + } + + .multi-sku-row { + height: 52rpx; + } + + .multi-sku-text { + flex: 1; + min-width: 0; + color: #777777; + font-size: 24rpx; + } + .btnItem { line-height: 50rpx; padding: 0 20rpx; diff --git a/components/orderItem/orderItem.vue b/components/orderItem/orderItem.vue index fbb7b7e..6796d4e 100644 --- a/components/orderItem/orderItem.vue +++ b/components/orderItem/orderItem.vue @@ -243,19 +243,28 @@ }; const delayPopupRef = ref(); const delayShipmentItems = ref([]); + const createDelayShipmentItem = (item, parentItem = {}) => { + const maxCount = Number(item?.count || 0); + const orderItemId = + resolveDelayOrderItemId(item) || resolveDelayOrderItemId(parentItem); + return { + orderItemId, + picUrl: item?.picUrl || parentItem?.picUrl || '', + spuName: item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || '', + skuText: formatSkuProperties(item?.properties), + maxCount, + selectedCount: maxCount, + }; + }; const createDelayShipmentItems = (data) => { const sourceItems = Array.isArray(data?.items) ? data.items : []; return sourceItems - .map((item) => { - const maxCount = Number(item?.count || 0); - return { - orderItemId: resolveDelayOrderItemId(item), - picUrl: item?.picUrl || '', - spuName: item?.spuName || item?.name || '', - skuText: formatSkuProperties(item?.properties), - maxCount, - selectedCount: maxCount, - }; + .flatMap((item) => { + const children = Array.isArray(item?.items) ? item.items : []; + if (children.length) { + return children.map((child) => createDelayShipmentItem(child, item)); + } + return [createDelayShipmentItem(item)]; }) .filter((item) => item.orderItemId > 0 && item.maxCount > 0); }; diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 826382d..7c556e9 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -26,6 +26,7 @@ class="order-goods" v-if="state?.orderInfo?.items?.length > 0" :data="state.orderInfo" + :source="state.source" type="2" theme="2" @getOrderDetail="getOrderDetail" @@ -269,19 +270,28 @@ }); const delayPopupRef = ref(); const delayShipmentItems = ref([]); + const createDelayShipmentItem = (item, parentItem = {}) => { + const maxCount = Number(item?.count || 0); + const orderItemId = + resolveDelayOrderItemId(item) || resolveDelayOrderItemId(parentItem); + return { + orderItemId, + picUrl: item?.picUrl || parentItem?.picUrl || '', + spuName: item?.spuName || item?.name || parentItem?.spuName || parentItem?.name || '', + skuText: formatSkuProperties(item?.properties), + maxCount, + selectedCount: maxCount, + }; + }; const createDelayShipmentItems = (data) => { const sourceItems = Array.isArray(data?.items) ? data.items : []; return sourceItems - .map((item) => { - const maxCount = Number(item?.count || 0); - return { - orderItemId: resolveDelayOrderItemId(item), - picUrl: item?.picUrl || '', - spuName: item?.spuName || item?.name || '', - skuText: formatSkuProperties(item?.properties), - maxCount, - selectedCount: maxCount, - }; + .flatMap((item) => { + const children = Array.isArray(item?.items) ? item.items : []; + if (children.length) { + return children.map((child) => createDelayShipmentItem(child, item)); + } + return [createDelayShipmentItem(item)]; }) .filter((item) => item.orderItemId > 0 && item.maxCount > 0); };