diff --git a/src/pages/DeliveryOrderDetails.css b/src/pages/DeliveryOrderDetails.css index 12f16c8..165535e 100644 --- a/src/pages/DeliveryOrderDetails.css +++ b/src/pages/DeliveryOrderDetails.css @@ -6,7 +6,7 @@ } .content-container { - max-width: 800px; + max-width: 900px; width: 100%; text-align: left; } diff --git a/src/pages/DeliveryOrderDetails.jsx b/src/pages/DeliveryOrderDetails.jsx index 28ddc19..3a64aba 100644 --- a/src/pages/DeliveryOrderDetails.jsx +++ b/src/pages/DeliveryOrderDetails.jsx @@ -43,7 +43,6 @@ const DeliveryOrderDetails = () => { useEffect(() => { fetchDeliveryOrder(); fetchDeliveryAccessories(); - fetchTotalOrder(); }, [deliveryOrderId]); const formatDuration = (minutes) => { @@ -62,14 +61,17 @@ const DeliveryOrderDetails = () => { try { const order = await getDeliveryOrder(deliveryOrderId); setDeliveryOrder(order); + if (order) { + fetchTotalOrder(order.total_order_id); + } } catch (error) { console.error("Ошибка при загрузке deliveryOrder:", error); } }; - const fetchTotalOrder = async () => { + const fetchTotalOrder = async (orderId) => { try { - const order = await getTotalOrder(deliveryOrder.id); + const order = await getTotalOrder(orderId); setTotalOrder(order); } catch (error) { if (error.response && error.response.status === 401) { @@ -90,6 +92,7 @@ const DeliveryOrderDetails = () => { setTruckCapacity(deliveryOrderDetails.truck_capacity); const accessories = await getDeliveryAccessories(deliveryOrderId); + console.log(accessories); setDeliveryAccessories(accessories); const coords = await Promise.all( @@ -201,7 +204,6 @@ const DeliveryOrderDetails = () => { {truckName}
-
Грузоподъемность: {truckCapacity}кг {truckCount} @@ -225,13 +227,13 @@ const DeliveryOrderDetails = () => {

Маршрут

- +
- - + + @@ -239,12 +241,16 @@ const DeliveryOrderDetails = () => { - + ))}
Город КомплектующиеКоличество, шт.Объем, куб. мОбъем, шт.Вес, кг
{accessory.city_name} {accessory.accessory_name}{accessory.count} {Math.round( (accessory.accessory_volume * accessory.count) / 100 )} + {Math.round( + (accessory.accessory_weight * accessory.count) / 100 + )} +