Update OfferResultCard: add location, mini map, fix price format
All checks were successful
Build Docker Image / build (push) Successful in 4m30s

- Remove distance from right side (shown in stepper)
- Change price format to symbol + formatted number (e.g. $1,200/тонна)
- Add locationName prop for displaying offer location
- Add LocationMiniMap component for showing point on map
- Update hub page and CalcResultContent to pass coordinates
This commit is contained in:
Ruslan Bakiev
2026-01-15 00:07:21 +07:00
parent de95dbd059
commit f03554893b
4 changed files with 155 additions and 15 deletions

View File

@@ -21,11 +21,13 @@
v-for="option in productRouteOptions"
:key="option.sourceUuid"
:source-name="option.sourceName || 'Склад'"
:location-name="getOfferData(option.sourceUuid)?.locationName"
: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"
:latitude="option.sourceLat"
:longitude="option.sourceLon"
:stages="getRouteStages(option)"
/>
</div>

View File

@@ -0,0 +1,103 @@
<template>
<div class="rounded-lg overflow-hidden border border-base-300">
<ClientOnly>
<MapboxMap
:key="mapId"
:map-id="mapId"
:style="`height: ${height}px; width: 100%;`"
:options="mapOptions"
@load="onMapCreated"
/>
<template #fallback>
<div :style="`height: ${height}px`" class="w-full bg-base-200 flex items-center justify-center">
<span class="loading loading-spinner loading-xs"></span>
</div>
</template>
</ClientOnly>
</div>
</template>
<script setup lang="ts">
import type { Map as MapboxMapType } from 'mapbox-gl'
import { getCurrentInstance } from 'vue'
const props = withDefaults(defineProps<{
latitude: number
longitude: number
height?: number
}>(), {
height: 120
})
const mapRef = ref<MapboxMapType | null>(null)
const instanceId = getCurrentInstance()?.uid || Math.floor(Math.random() * 100000)
const mapId = computed(() => `location-mini-map-${instanceId}`)
const mapOptions = computed(() => ({
style: 'mapbox://styles/mapbox/streets-v12',
center: [props.longitude, props.latitude] as [number, number],
zoom: 5,
interactive: false,
attributionControl: false
}))
const onMapCreated = (map: MapboxMapType) => {
mapRef.value = map
const initMap = () => {
map.addSource('location-point', {
type: 'geojson',
data: {
type: 'Feature',
properties: {},
geometry: {
type: 'Point',
coordinates: [props.longitude, props.latitude]
}
}
})
map.addLayer({
id: 'location-point-layer',
type: 'circle',
source: 'location-point',
paint: {
'circle-radius': 8,
'circle-color': '#10b981',
'circle-stroke-width': 2,
'circle-stroke-color': '#ffffff'
}
})
}
if (map.loaded()) {
initMap()
} else {
map.on('load', initMap)
}
}
watch(
() => [props.latitude, props.longitude],
() => {
const map = mapRef.value
if (!map) return
map.setCenter([props.longitude, props.latitude])
const source = map.getSource('location-point') as mapboxgl.GeoJSONSource | undefined
if (source) {
source.setData({
type: 'Feature',
properties: {},
geometry: {
type: 'Point',
coordinates: [props.longitude, props.latitude]
}
})
}
}
)
</script>

View File

@@ -1,21 +1,32 @@
<template>
<Card padding="md" interactive @click="$emit('select')">
<!-- Header: Source + Price -->
<div class="flex items-start justify-between mb-2">
<!-- Header: Source name + Location + Price -->
<div class="flex items-start justify-between mb-3">
<div>
<Text weight="semibold">{{ sourceName }}</Text>
<Text v-if="productName" tone="muted" size="sm">{{ productName }}</Text>
<Text v-if="locationName" tone="muted" size="sm">{{ locationName }}</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" />
<!-- Product name + Route stepper -->
<div v-if="productName" class="mb-3">
<Text size="sm" class="mb-1">{{ productName }}</Text>
<RouteStepper v-if="stages.length > 0" :stages="stages" />
</div>
<RouteStepper v-else-if="stages.length > 0" :stages="stages" class="mb-3" />
<!-- Mini map -->
<LocationMiniMap
v-if="latitude && longitude"
:latitude="latitude"
:longitude="longitude"
:height="100"
/>
</Card>
</template>
@@ -24,11 +35,13 @@ import type { RouteStage } from './RouteStepper.vue'
const props = withDefaults(defineProps<{
sourceName: string
locationName?: string
productName?: string
pricePerUnit?: number | null
currency?: string | null
unit?: string | null
totalDistance: number
latitude?: number | null
longitude?: number | null
stages?: RouteStage[]
}>(), {
stages: () => []
@@ -40,13 +53,33 @@ defineEmits<{
const priceDisplay = computed(() => {
if (!props.pricePerUnit) return null
const curr = props.currency || 'USD'
const u = props.unit || 'т'
return `${props.pricePerUnit} ${curr}/${u}`
const currSymbol = getCurrencySymbol(props.currency)
const unitName = getUnitName(props.unit)
const formattedPrice = props.pricePerUnit.toLocaleString()
return `${currSymbol}${formattedPrice}/${unitName}`
})
const formatDistance = (km?: number | null) => {
if (!km) return '0'
return Math.round(km).toLocaleString()
const getCurrencySymbol = (currency?: string | null) => {
switch (currency?.toUpperCase()) {
case 'USD': return '$'
case 'EUR': return '€'
case 'RUB': return '₽'
case 'CNY': return '¥'
default: return '$'
}
}
const getUnitName = (unit?: string | null) => {
switch (unit?.toLowerCase()) {
case 'т':
case 'ton':
case 'tonne':
return 'тонна'
case 'кг':
case 'kg':
return 'кг'
default:
return 'тонна'
}
}
</script>