Unify offer cards: RouteStepper + OfferResultCard components
All checks were successful
Build Docker Image / build (push) Successful in 4m36s

- Add RouteStepper component with transport icons (🚛 🚂 🚢)
- Add OfferResultCard with price, distance, route stages
- Update hub page to use OfferResultCard
- Update CalcResultContent to use OfferResultCard
This commit is contained in:
Ruslan Bakiev
2026-01-14 23:47:42 +07:00
parent 1c19e5cb78
commit de95dbd059
4 changed files with 202 additions and 91 deletions

View File

@@ -1,61 +1,37 @@
<template>
<div class="space-y-10">
<div class="space-y-6">
<!-- Header -->
<Card padding="lg" class="border border-base-300">
<RouteSummaryHeader :title="summaryTitle" :meta="summaryMeta" />
</Card>
<!-- Loading -->
<div v-if="pending" class="text-sm text-base-content/60">
Загрузка маршрутов...
</div>
<!-- Error -->
<div v-else-if="error" class="text-sm text-error">
Ошибка загрузки маршрутов: {{ error.message }}
</div>
<div v-else-if="productRouteOptions.length > 0 || legacyRoutes.length > 0" class="space-y-10">
<div v-if="productRouteOptions.length" class="space-y-10">
<div
v-for="(option, optionIndex) in productRouteOptions"
:key="option.sourceUuid || optionIndex"
class="space-y-6"
>
<div class="space-y-1">
<Heading :level="3" weight="semibold">Источник {{ optionIndex + 1 }}</Heading>
<Text tone="muted" size="sm">{{ option.sourceName || 'Склад' }}</Text>
<!-- Results -->
<div v-else-if="productRouteOptions.length > 0" class="space-y-4">
<OfferResultCard
v-for="option in productRouteOptions"
:key="option.sourceUuid"
:source-name="option.sourceName || 'Склад'"
:product-name="productName"
:price-per-unit="getOfferData(option.sourceUuid)?.pricePerUnit"
:currency="getOfferData(option.sourceUuid)?.currency"
:unit="getOfferData(option.sourceUuid)?.unit"
:total-distance="option.distanceKm || 0"
:stages="getRouteStages(option)"
/>
</div>
<div v-if="option.routes?.length" class="space-y-6">
<Card
v-for="(route, routeIndex) in option.routes"
:key="routeIndex"
padding="lg"
class="border border-base-300"
>
<Stack gap="4">
<div class="flex flex-wrap items-center justify-between gap-2">
<Text weight="semibold">Маршрут {{ routeIndex + 1 }}</Text>
<Text tone="muted" size="sm">
{{ formatDistance(route.totalDistanceKm) }} км · {{ formatDuration(route.totalTimeSeconds) }}
</Text>
</div>
<RouteStagesList :stages="mapRouteStages(route)" />
<div class="divider my-0"></div>
<RequestRoutesMap :routes="[route]" :height="240" />
</Stack>
</Card>
</div>
<Text v-else tone="muted" size="sm">
Маршруты от источника не найдены.
</Text>
</div>
</div>
<template v-if="!productRouteOptions.length && legacyRoutes.length">
<div class="space-y-6">
<!-- Legacy routes (fallback) -->
<div v-else-if="legacyRoutes.length > 0" class="space-y-6">
<Card
v-for="(route, routeIndex) in legacyRoutes"
:key="routeIndex"
@@ -78,9 +54,8 @@
</Stack>
</Card>
</div>
</template>
</div>
<!-- Empty -->
<div v-else class="text-sm text-base-content/60">
Маршруты не найдены. Возможно, нет связи между точками в графе.
</div>
@@ -91,14 +66,19 @@
import { FindRoutesDocument } from '~/composables/graphql/public/geo-generated'
import type { RoutePathType } from '~/composables/graphql/public/geo-generated'
import type { RouteStageItem } from '~/components/RouteStagesList.vue'
import { GetOfferDocument } from '~/composables/graphql/public/exchange-generated'
const route = useRoute()
const searchStore = useSearchStore()
const { execute } = useGraphQL()
const productName = computed(() => searchStore.searchForm.product || (route.query.product as string) || 'Товар')
const locationName = computed(() => searchStore.searchForm.location || (route.query.location as string) || 'Назначение')
const quantity = computed(() => (route.query.quantity as string) || (searchStore.searchForm as any)?.quantity)
// Offer data for prices
const offersData = ref<Map<string, any>>(new Map())
const summaryTitle = computed(() => `${productName.value}${locationName.value}`)
const summaryMeta = computed(() => {
const meta: string[] = []
@@ -226,6 +206,51 @@ const mapRouteStages = (route: RoutePathType): RouteStageItem[] => {
}))
}
// Get route stages for OfferResultCard stepper
const getRouteStages = (option: ProductRouteOption) => {
const route = option.routes?.[0]
if (!route?.stages) return []
return route.stages.filter(Boolean).map((stage: any) => ({
transportType: stage?.transportType,
distanceKm: stage?.distanceKm
}))
}
// Get offer data for card
const getOfferData = (uuid?: string | null) => {
if (!uuid) return null
return offersData.value.get(uuid)
}
// Load offer details for prices
const loadOfferDetails = async (options: ProductRouteOption[]) => {
if (options.length === 0) {
offersData.value.clear()
return
}
const newOffersData = new Map<string, any>()
await Promise.all(options.map(async (option) => {
if (!option.sourceUuid) return
try {
const data = await execute(GetOfferDocument, { uuid: option.sourceUuid }, 'public', 'exchange')
if (data?.getOffer) {
newOffersData.set(option.sourceUuid, data.getOffer)
}
} catch (error) {
console.error('Error loading offer:', option.sourceUuid, error)
}
}))
offersData.value = newOffersData
}
// Watch for route options and load offers
watch(productRouteOptions, (options) => {
if (options.length > 0) {
loadOfferDetails(options)
}
}, { immediate: true })
// Formatting helpers
const formatDistance = (km: number | null | undefined) => {
if (!km) return '0'

View File

@@ -0,0 +1,52 @@
<template>
<Card padding="md" interactive @click="$emit('select')">
<!-- Header: Source + Price -->
<div class="flex items-start justify-between mb-2">
<div>
<Text weight="semibold">{{ sourceName }}</Text>
<Text v-if="productName" tone="muted" size="sm">{{ productName }}</Text>
</div>
<div class="text-right">
<Text v-if="priceDisplay" weight="semibold" class="text-primary text-lg">
{{ priceDisplay }}
</Text>
<Text tone="muted" size="sm">{{ formatDistance(totalDistance) }} км</Text>
</div>
</div>
<!-- Route stepper -->
<RouteStepper v-if="stages.length > 0" :stages="stages" />
</Card>
</template>
<script setup lang="ts">
import type { RouteStage } from './RouteStepper.vue'
const props = withDefaults(defineProps<{
sourceName: string
productName?: string
pricePerUnit?: number | null
currency?: string | null
unit?: string | null
totalDistance: number
stages?: RouteStage[]
}>(), {
stages: () => []
})
defineEmits<{
select: []
}>()
const priceDisplay = computed(() => {
if (!props.pricePerUnit) return null
const curr = props.currency || 'USD'
const u = props.unit || 'т'
return `${props.pricePerUnit} ${curr}/${u}`
})
const formatDistance = (km?: number | null) => {
if (!km) return '0'
return Math.round(km).toLocaleString()
}
</script>

View File

@@ -0,0 +1,39 @@
<template>
<div class="flex items-center gap-1 flex-wrap text-xs">
<template v-for="(stage, index) in stages" :key="index">
<div v-if="index > 0" class="w-3 h-px bg-base-300" />
<div class="flex items-center gap-0.5">
<span>{{ getTransportIcon(stage.transportType) }}</span>
<span class="text-base-content/70">{{ formatDistance(stage.distanceKm) }}км</span>
</div>
</template>
</div>
</template>
<script setup lang="ts">
export interface RouteStage {
transportType?: string | null
distanceKm?: number | null
}
defineProps<{
stages: RouteStage[]
}>()
const getTransportIcon = (type?: string | null) => {
switch (type) {
case 'rail':
return '🚂'
case 'sea':
return '🚢'
case 'road':
default:
return '🚛'
}
}
const formatDistance = (km?: number | null) => {
if (!km) return '0'
return Math.round(km).toLocaleString()
}
</script>

View File

@@ -59,22 +59,15 @@
</template>
<template #card="{ item }">
<Card padding="sm" interactive>
<div class="flex items-center justify-between">
<div>
<Text weight="semibold">{{ item.name }}</Text>
<Text tone="muted" size="sm">{{ selectedProductName }}</Text>
</div>
<div class="text-right">
<Text weight="semibold" class="text-primary">
{{ getOfferPrice(item.uuid) }}
</Text>
<Text tone="muted" size="sm">
{{ formatDistance(item.distanceKm) }} км
</Text>
</div>
</div>
</Card>
<OfferResultCard
:source-name="item.name"
:product-name="selectedProductName"
:price-per-unit="getOfferData(item.uuid)?.pricePerUnit"
:currency="getOfferData(item.uuid)?.currency"
:unit="getOfferData(item.uuid)?.unit"
:total-distance="item.distanceKm"
:stages="item.stages"
/>
</template>
<template #empty>
@@ -120,7 +113,7 @@ const selectedProductName = computed(() => {
return product?.name || ''
})
// Transform sources for CatalogPage (needs uuid, latitude, longitude, name)
// Transform sources for CatalogPage (needs uuid, latitude, longitude, name, stages)
const sources = computed(() => {
return rawSources.value.map(source => ({
uuid: source.sourceUuid || '',
@@ -128,15 +121,17 @@ const sources = computed(() => {
latitude: source.sourceLat,
longitude: source.sourceLon,
distanceKm: source.distanceKm,
durationSeconds: source.routes?.[0]?.totalTimeSeconds
durationSeconds: source.routes?.[0]?.totalTimeSeconds,
stages: (source.routes?.[0]?.stages || []).map((stage: any) => ({
transportType: stage?.transportType,
distanceKm: stage?.distanceKm
}))
}))
})
// Get offer price for display
const getOfferPrice = (uuid: string) => {
const offer = offersData.value.get(uuid)
if (!offer) return '-'
return `${offer.pricePerUnit} ${offer.currency}/${offer.unit}`
// Get offer data for card
const getOfferData = (uuid: string) => {
return offersData.value.get(uuid)
}
// Load offer details for prices