From e1053073a115af3cccc7be495a76a96021c29397 Mon Sep 17 00:00:00 2001 From: SBD Date: Fri, 14 Feb 2025 16:20:26 +0300 Subject: [PATCH] 0.0.152 routes --- static/v2/css/widgets/w_route_card.css | 9 +++++++++ static/v2/js/blocks/b_search_routes.js | 5 +++-- static/v2/js/widgets/w_route_card.js | 8 ++++++++ .../w_route_card/route_card_info_data.html | 4 ---- .../w_route_card/route_card_info_data_for_search.html | 4 ++-- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/static/v2/css/widgets/w_route_card.css b/static/v2/css/widgets/w_route_card.css index c92b02e..99882f3 100644 --- a/static/v2/css/widgets/w_route_card.css +++ b/static/v2/css/widgets/w_route_card.css @@ -131,6 +131,15 @@ border-radius: var(--route-text-container-border-radius); font-size: var(--big-font-size); + &.wrapped{ + .route_card_text_container_txt{ + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + } + } + &.msg{ .route_card_text_container_txt{ background-image: linear-gradient(94.66deg, rgba(0, 0, 0, 1) 0%, rgba(241, 241, 241, 0) 8.64%, rgba(241, 241, 241, 0.98) 16.62%); diff --git a/static/v2/js/blocks/b_search_routes.js b/static/v2/js/blocks/b_search_routes.js index f2e2ab5..41ec53e 100644 --- a/static/v2/js/blocks/b_search_routes.js +++ b/static/v2/js/blocks/b_search_routes.js @@ -5,10 +5,11 @@ function searchRoutes (form=undefined) { let formData = getFormData($search_form); formData = getFormData($filter_form, formData); - formData.append('owner_type', 'mover'); + let owner_type = 'mover' + formData.append('owner_type', owner_type); let query = formDataToQueryString(formData, [$filter_form, $search_form]); - query+='owner_type=mover' + query+=`owner_type=${owner_type}` window.history.pushState(null, null, `?${query}`); let request = new api({ url: '/routes/find_routes/', diff --git a/static/v2/js/widgets/w_route_card.js b/static/v2/js/widgets/w_route_card.js index d6f7e13..0c1fa6e 100644 --- a/static/v2/js/widgets/w_route_card.js +++ b/static/v2/js/widgets/w_route_card.js @@ -138,4 +138,12 @@ function clickedUnregisteredMsgRoute (el) { let $parent = el.closest(".route_card_text_container") $parent.classList.add('clicked'); +} + +function unwrapRouteComment (el){ + if (!el) return; + let $parent = el.closest(".wrapped") + if (!$parent) return; + + $parent.classList.remove('wrapped'); } \ No newline at end of file diff --git a/templates/v2/content_widgets/w_route_card/route_card_info_data.html b/templates/v2/content_widgets/w_route_card/route_card_info_data.html index ae82068..45befa9 100644 --- a/templates/v2/content_widgets/w_route_card/route_card_info_data.html +++ b/templates/v2/content_widgets/w_route_card/route_card_info_data.html @@ -34,10 +34,6 @@
{% if route.owner_type == 'customer' %}{% trans "Нужен перевозчик" %}{% else %}{% trans "Могу перевезти" %}{% endif %}
{% trans "Тип посылки:" %}
{{ route.cargo_type|get_cargo_type_for_show }}
-
- -
{{ route.phone }}
-
{{ route.owner }}
diff --git a/templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html b/templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html index 52cef60..5cbdba5 100644 --- a/templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html +++ b/templates/v2/content_widgets/w_route_card/route_card_info_data_for_search.html @@ -31,7 +31,7 @@
{% trans "Откликнуться" %}
-
+
{% if route.comment %} {{ route.comment|linebreaksbr }} @@ -63,7 +63,7 @@
{{ route.owner }}
-
+
{% if route.comment %} {{ route.comment|linebreaksbr }}