Merge pull request 'изменение хэдера и исправление ключеых багов' (#19) from mobile into main

Reviewed-on: #19

src/components/BestPriceItem.tsx

@@ -39,7 +39,7 @@ const BestPriceItem: React.FC<BestPriceItemProps> = ({
         />
         <div className="saletagbp">{discount}</div>
       </div>
-      <div className="div-block-3">
+      <div className="div-block-3 bp-item-info">
         <div className="w-layout-hflex pricecartbp">
           <div className="actualprice">{price}</div>
           <div className="oldpricebp">{oldPrice}</div>

src/components/Header.tsx

@@ -157,20 +157,20 @@ const Header: React.FC<HeaderProps> = ({ onOpenAuthModal = () => console.log('Au
   }, []);
 
   // Скрытие top_head при скролле
-  useEffect(() => {
+  // useEffect(() => {
-    const topHead = document.querySelector('.top_head');
+  //   const topHead = document.querySelector('.top_head');
-    if (!topHead) return;
+  //   if (!topHead) return;
-    const onScroll = () => {
+  //   const onScroll = () => {
-      if (window.scrollY > 0) {
+  //     if (window.scrollY > 0) {
-        topHead.classList.add('hide-top-head');
+  //       topHead.classList.add('hide-top-head');
-      } else {
+  //     } else {
-        topHead.classList.remove('hide-top-head');
+  //       topHead.classList.remove('hide-top-head');
-      }
+  //     }
-    };
+  //   };
-    window.addEventListener('scroll', onScroll);
+  //   window.addEventListener('scroll', onScroll);
-    onScroll();
+  //   onScroll();
-    return () => window.removeEventListener('scroll', onScroll);
+  //   return () => window.removeEventListener('scroll', onScroll);
-  }, []);
+  // }, []);
 
   // Проверяем, является ли строка VIN номером
   const isVinNumber = (query: string): boolean => {
@@ -358,7 +358,7 @@ const Header: React.FC<HeaderProps> = ({ onOpenAuthModal = () => console.log('Au
 
   return (
     <>
-      <section className="top_head">
+      {/* <section className="top_head">
         <div className="w-layout-blockcontainer container nav w-container">
           <div data-animation="default" data-collapse="medium" data-duration="400" data-easing="ease" data-easing2="ease" role="banner" className="navbar w-nav">
           <Link href="/" className="brand w-nav-brand"><img src="/images/logo.svg" loading="lazy" alt="" className="image-24" /></Link>
@@ -381,11 +381,34 @@ const Header: React.FC<HeaderProps> = ({ onOpenAuthModal = () => console.log('Au
             </div>
           </div>
         </div>
-      </section>
+      </section> */}
       <section className="bottom_head">
         <div className="w-layout-blockcontainer container nav w-container">
             <div className="w-layout-hflex flex-block-93">
-          <div data-animation="default" data-collapse="all" data-duration="400" data-easing="ease-in" data-easing2="ease" role="banner" className="navbar-2 w-nav">
+              <Link href="/" className="code-embed-15 w-embed" style={{ display: 'block', cursor: 'pointer' }}>
+                <svg width="190" height="72" viewBox="0 0 190 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+                  <path d="M138.377 29.5883V23.1172H112.878V29.5883H138.377Z" fill="white"></path>
+                  <path d="M107.423 18.1195C109.21 18.1195 110.658 16.6709 110.658 14.884C110.658 13.097 109.21 11.6484 107.423 11.6484L88.395 11.6484C86.6082 11.6484 85.1596 13.097 85.1596 14.884C85.1596 16.6709 86.6082 18.1195 88.395 18.1195H107.423Z" fill="white"></path>
+                  <path d="M130.288 34.2491C128.773 35.3865 126.89 36.0628 124.852 36.0628C119.849 36.0628 115.791 32.0052 115.791 27.0013C115.791 21.9974 119.849 17.9399 124.852 17.9399C129.856 17.9399 133.913 21.9974 133.913 27.0013C133.913 27.9022 133.779 28.7696 133.536 29.5893H140.169C140.31 28.7481 140.384 27.8831 140.384 27.0013C140.384 18.4226 133.431 11.4688 124.852 11.4688C116.274 11.4688 109.32 18.4226 109.32 27.0013C109.32 35.5801 116.274 42.5339 124.852 42.5339C129.249 42.5339 133.218 40.7058 136.045 37.769L130.288 34.2491Z" fill="white"></path>
+                  <path d="M148.633 11.4531H148.631C146.629 11.4531 145.006 13.0761 145.006 15.0782V38.9075C145.006 40.9096 146.629 42.5326 148.631 42.5326H148.633C150.635 42.5326 152.258 40.9096 152.258 38.9075V15.0782C152.258 13.0761 150.635 11.4531 148.633 11.4531Z" fill="white"></path>
+                  <path d="M168.935 36.3511L154.515 21.9297L149.387 27.0578L163.807 41.4792C164.489 42.1603 165.411 42.5402 166.371 42.5402C169.602 42.5402 171.22 38.6356 168.935 36.3511Z" fill="white"></path>
+                  <path d="M168.937 17.7751L154.733 31.979L149.605 26.8509L163.809 12.6469C164.49 11.9659 165.412 11.5859 166.373 11.5859C169.603 11.5859 171.221 15.4906 168.937 17.7751Z" fill="white"></path>
+                  <path d="M186.029 36.3511L171.608 21.9297L166.48 27.0578L180.901 41.4792C181.582 42.1603 182.505 42.5402 183.465 42.5402C186.696 42.5402 188.314 38.6356 186.029 36.3511Z" fill="#EC1C24"></path>
+                  <path d="M186.029 17.7751L171.587 32.218L166.459 27.0898L180.901 12.6469C181.582 11.9659 182.505 11.5859 183.465 11.5859C186.696 11.5859 188.314 15.4906 186.029 17.7751Z" fill="#EC1C24"></path>
+                  <path d="M3.6249 50.4184C1.62248 50.4184 0 48.7958 0 46.7933V11.4531L7.2522 14.3207V46.7933C7.2522 48.7958 5.62971 50.4184 3.62729 50.4184H3.6249Z" fill="white"></path>
+                  <path d="M97.9491 42.5353C95.9467 42.5353 94.3242 40.9128 94.3242 38.9103V0L101.576 2.86755V38.9103C101.576 40.9128 99.9539 42.5353 97.9515 42.5353H97.9491Z" fill="white"></path>
+                  <path d="M38.578 42.5326C36.5756 42.5326 34.9531 40.91 34.9531 38.9075V11.4531L42.2053 14.3207V38.9075C42.2053 40.91 40.5828 42.5326 38.5804 42.5326H38.578Z" fill="white"></path>
+                  <path d="M51.334 11.4555C42.7508 11.4555 35.7949 18.4141 35.7949 26.9953H42.2705C42.2705 21.989 46.3279 17.929 51.3364 17.929C52.0102 17.929 52.6649 18.0055 53.2958 18.1441C54.2301 16.0723 55.4798 14.1749 56.9876 12.5141C55.2361 11.8307 53.3316 11.4531 51.3364 11.4531L51.334 11.4555Z" fill="white"></path>
+                  <path d="M70.4707 11.4531C61.8875 11.4531 54.9316 18.4117 54.9316 26.9929C54.9316 35.574 61.8899 42.5326 70.4707 42.5326C79.0515 42.5326 86.0098 35.574 86.0098 26.9929C86.0098 18.4117 79.0515 11.4531 70.4707 11.4531ZM70.4707 36.0591C65.4647 36.0591 61.4049 32.0015 61.4049 26.9929C61.4049 21.9842 65.4623 17.9266 70.4707 17.9266C75.4791 17.9266 79.5365 21.9842 79.5365 26.9929C79.5365 32.0015 75.4791 36.0591 70.4707 36.0591Z" fill="white"></path>
+                  <path d="M16.2309 11.4531C7.64774 11.4531 0.689453 18.4093 0.689453 26.9929C0.689453 35.5764 7.64774 42.5326 16.2285 42.5326C24.8093 42.5326 31.7676 35.574 31.7676 26.9929C31.7676 18.4117 24.8117 11.4531 16.2309 11.4531ZM16.2309 36.0591C11.2249 36.0591 7.16506 32.0015 7.16506 26.9929C7.16506 21.9842 11.2225 17.9266 16.2309 17.9266C21.2393 17.9266 25.2967 21.9842 25.2967 26.9929C25.2967 32.0015 21.2393 36.0591 16.2309 36.0591Z" fill="white"></path>
+                  <rect width="53.354" height="21.8647" rx="8" transform="matrix(0.991808 -0.127739 0.127728 0.991809 134.291 50.3047)" fill="#EC1C24"></rect>
+                  <path d="M141.15 66.1413L144.154 54.4607L146.879 54.1098L152.697 64.6542L149.925 65.0112L149.085 63.3647L144.317 63.9787L143.906 65.7864L141.15 66.1413ZM144.828 61.5681L147.98 61.1621L145.874 57.0626L144.828 61.5681Z" fill="white"></path>
+                  <path d="M153.767 64.5163L152.337 53.4068L157.579 52.7316C158.076 52.6677 158.536 52.6615 158.962 52.7131C159.396 52.7528 159.781 52.868 160.117 53.0587C160.462 53.2376 160.749 53.5038 160.977 53.8573C161.203 54.2003 161.353 54.6542 161.426 55.2191C161.481 55.648 161.433 56.0689 161.283 56.4818C161.132 56.8947 160.885 57.2296 160.543 57.4864C161.063 57.6108 161.499 57.8736 161.852 58.2749C162.213 58.6643 162.438 59.2043 162.527 59.8947C162.615 60.5746 162.561 61.1559 162.365 61.6383C162.179 62.109 161.886 62.5029 161.487 62.8202C161.097 63.1257 160.634 63.366 160.099 63.5414C159.563 63.7167 158.994 63.8431 158.392 63.9206L153.767 64.5163ZM156.032 61.8478L158.345 61.55C158.609 61.516 158.844 61.4645 159.049 61.3954C159.264 61.3146 159.44 61.2228 159.577 61.12C159.724 61.0055 159.824 60.8702 159.879 60.7143C159.944 60.5465 159.963 60.3632 159.937 60.1644C159.91 59.9552 159.851 59.7874 159.76 59.6609C159.679 59.5331 159.565 59.4361 159.416 59.3701C159.267 59.2937 159.095 59.252 158.901 59.2451C158.706 59.2277 158.487 59.2347 158.244 59.266L155.741 59.5883L156.032 61.8478ZM155.472 57.5013L157.516 57.2382C157.769 57.2055 157.987 57.1508 158.171 57.074C158.365 56.9959 158.519 56.9016 158.634 56.7911C158.748 56.6806 158.828 56.5533 158.874 56.4092C158.931 56.2637 158.947 56.102 158.924 55.9242C158.893 55.6836 158.811 55.5027 158.677 55.3817C158.553 55.2489 158.387 55.1692 158.18 55.1427C157.971 55.1058 157.724 55.1057 157.439 55.1424L155.206 55.43L155.472 57.5013Z" fill="white"></path>
+                  <path d="M166.971 62.8158L165.843 54.06L162.469 54.4945L162.166 52.1408L171.511 50.9373L171.814 53.291L168.409 53.7296L169.536 62.4854L166.971 62.8158Z" fill="white"></path>
+                  <path d="M178.85 61.4134C177.699 61.5617 176.671 61.4548 175.766 61.0929C174.87 60.7191 174.14 60.1378 173.577 59.3489C173.012 58.5496 172.658 57.5903 172.514 56.471C172.366 55.3203 172.469 54.2913 172.825 53.3842C173.189 52.4652 173.764 51.7159 174.548 51.1364C175.331 50.5464 176.297 50.1773 177.448 50.029C178.578 49.8835 179.591 49.9924 180.485 50.3557C181.391 50.7176 182.13 51.2924 182.704 52.0799C183.287 52.8555 183.652 53.8135 183.799 54.9537C183.943 56.073 183.839 57.0968 183.486 58.0248C183.132 58.9425 182.559 59.7022 181.767 60.304C180.984 60.894 180.012 61.2638 178.85 61.4134ZM178.588 59.0065C179.306 58.914 179.866 58.6771 180.268 58.2957C180.67 57.9143 180.939 57.4596 181.075 56.9316C181.211 56.4037 181.245 55.8782 181.178 55.3551C181.128 54.9681 181.02 54.5885 180.854 54.2164C180.698 53.843 180.478 53.5097 180.194 53.2167C179.92 52.9223 179.58 52.7003 179.174 52.5505C178.768 52.4007 178.286 52.3618 177.726 52.4339C177.018 52.525 176.464 52.7613 176.062 53.1427C175.659 53.5136 175.384 53.9637 175.238 54.4931C175.102 55.021 175.07 55.5622 175.141 56.1167C175.212 56.6711 175.386 57.1858 175.662 57.6607C175.938 58.1356 176.318 58.5014 176.801 58.7581C177.296 59.0135 177.892 59.0963 178.588 59.0065Z" fill="white"></path>
+                </svg>
+              </Link>
+          <div data-animation="default" data-collapse="all" data-duration="400" data-easing="ease-in" data-easing2="ease" role="banner" className="topnav w-nav">
             <div
                 className={`menu-button w-nav-button${menuOpen ? " w--open" : ""}`}
                 onClick={() => setMenuOpen((open) => !open)}
@@ -398,7 +421,7 @@ const Header: React.FC<HeaderProps> = ({ onOpenAuthModal = () => console.log('Au
                 </svg></div>
             </div>
           </div>
-              <div className="form-block w-form" style={{ position: 'relative' }}>
+              <div className="searcj w-form" style={{ position: 'relative' }}>
                 <form
                   id="custom-search-form"
                   name="custom-search-form"

src/components/Layout.tsx

@@ -3,6 +3,7 @@ import { useRouter } from "next/router";
 import Header from "./Header";
 import AuthModal from "./auth/AuthModal";
 import MobileMenuBottomSection from "./MobileMenuBottomSection";
+import IndexTopMenuNav from "./index/IndexTopMenuNav";
 
 const Layout = ({ children }: { children: React.ReactNode }) => {
   const [authModalOpen, setAuthModalOpen] = useState(false);
@@ -30,7 +31,10 @@ const Layout = ({ children }: { children: React.ReactNode }) => {
         onSuccess={handleAuthSuccess}
       />
       </header>
-      <main className="pt-[108px] md:pt-[131px]">{children}</main>
+      
+      <main className="pt-[62px] md:pt-[63px]">
+      <IndexTopMenuNav />
+        {children}</main>
       <MobileMenuBottomSection onOpenAuthModal={() => setAuthModalOpen(true)} />
     </>
   );

src/components/index/IndexTopMenuNav.tsx

@@ -1,27 +1,28 @@
 import React from 'react';
+import Link from 'next/link';
 
 const IndexTopMenuNav = () => (
   <section className="topmenub">
     <div className="w-layout-blockcontainer tb nav w-container">
       <div className="w-layout-hflex flex-block-107">
-        <a href="#" className="link-block-8 w-inline-block">
+        <Link href="/about" className="link-block-8 w-inline-block">
           <div>О компании</div>
-        </a>
+        </Link>
-        <a href="#" className="link-block-8 w-inline-block">
+        <Link href="/payments-method" className="link-block-8 w-inline-block">
           <div>Оплата и доставка</div>
-        </a>
+        </Link>
-        <a href="#" className="link-block-8 w-inline-block">
+        <Link href="/" className="link-block-8 w-inline-block">
           <div>Гарантия и возврат</div>
-        </a>
+        </Link>
-        <a href="#" className="link-block-8 w-inline-block">
+        <Link href="/payments-method" className="link-block-8 w-inline-block">
           <div>Покупателям</div>
-        </a>
+        </Link>
-        <a href="#" className="link-block-8 w-inline-block">
+        <Link href="/wholesale" className="link-block-8 w-inline-block">
           <div>Оптовым клиентам</div>
-        </a>
+        </Link>
-        <a href="#" className="link-block-8 w-inline-block">
+        <Link href="/contacts" className="link-block-8 w-inline-block">
           <div>Контакты</div>
-        </a>
+        </Link>
         <a href="#" className="link-block-8 green w-inline-block">
           <div>Новые поступления товаров</div>
         </a>

src/components/index/SupportVinSection.tsx

@@ -3,12 +3,12 @@ import React from "react";
 const SupportVinSection: React.FC = () => (
   <section className="main">
     <div className="w-layout-blockcontainer container-copy w-container">
-      <img 
+    <img 
-        src="images/support_img.png" 
+  src="images/support_img.png" 
-        loading="lazy" 
+  loading="lazy" 
-        alt="Поддержка: помощь с VIN-запросом" 
+  alt="" 
-        className="image-27" 
+  className="image-27" 
-      />
+/>
       <div className="div-block-11">
         <div className="w-layout-vflex flex-block-30">
           <h3 className="supportheading">МЫ ВСЕГДА РАДЫ ПОМОЧЬ</h3>

src/components/vin/VinLeftbar.tsx

@@ -23,6 +23,7 @@ interface VinLeftbarProps {
   activeTab?: 'uzly' | 'manufacturer';
   openedPath?: string[];
   setOpenedPath?: (path: string[]) => void;
+  onCloseQuickGroup?: () => void;
 }
 
 interface QuickGroup {
@@ -32,7 +33,7 @@ interface QuickGroup {
   children?: QuickGroup[];
 }
 
-const VinLeftbar: React.FC<VinLeftbarProps> = ({ vehicleInfo, onSearchResults, onNodeSelect, onActiveTabChange, onQuickGroupSelect, activeTab: activeTabProp, openedPath = [], setOpenedPath = () => {} }) => {
+const VinLeftbar: React.FC<VinLeftbarProps> = ({ vehicleInfo, onSearchResults, onNodeSelect, onActiveTabChange, onQuickGroupSelect, activeTab: activeTabProp, openedPath = [], setOpenedPath = () => {}, onCloseQuickGroup }) => {
   const router = useRouter();
   const catalogCode = vehicleInfo?.catalog || '';
   const vehicleId = vehicleInfo?.vehicleid || '';
@@ -65,6 +66,7 @@ const VinLeftbar: React.FC<VinLeftbarProps> = ({ vehicleInfo, onSearchResults, o
   // Обновляем openedPath и URL
   const setOpenedPathAndUrl = (newPath: string[]) => {
     setOpenedPath(newPath);
+    if (onCloseQuickGroup) onCloseQuickGroup();
     const params = new URLSearchParams(router.query as any);
     if (newPath.length > 0) {
       params.set('catpath', newPath.join(','));
@@ -320,6 +322,7 @@ const VinLeftbar: React.FC<VinLeftbarProps> = ({ vehicleInfo, onSearchResults, o
               if (searchQuery) setSearchQuery('');
               if (onActiveTabChange) onActiveTabChange('uzly');
               if (onQuickGroupSelect) onQuickGroupSelect(null);
+              if (onCloseQuickGroup) onCloseQuickGroup();
             }}
           >
             Узлы
@@ -337,8 +340,8 @@ const VinLeftbar: React.FC<VinLeftbarProps> = ({ vehicleInfo, onSearchResults, o
               e.preventDefault();
               if (searchQuery) setSearchQuery('');
               if (onActiveTabChange) onActiveTabChange('manufacturer');
-              // Не вызываем onQuickGroupSelect с null - это вызывает ошибку
+              if (onQuickGroupSelect) onQuickGroupSelect(null);
-              // Просто переключаем вкладку, а обработка отображения происходит через activeTab
+              if (onCloseQuickGroup) onCloseQuickGroup();
             }}
           >
             От производителя

src/pages/index.tsx

@@ -34,7 +34,7 @@ export default function Home() {
       <MetaTags {...metaData} />
       <JsonLdScript schema={organizationSchema} />
       <JsonLdScript schema={websiteSchema} />
-      <IndexTopMenuNav />
+      {/* <IndexTopMenuNav /> */}
       <ProductOfDaySection />
       <CategoryNavSection />
       <BrandSelectionSection />

src/pages/vehicle-search/[brand]/[vehicleId].tsx

@@ -355,15 +355,17 @@ const VehicleDetailsPage = () => {
       { shallow: true }
     );
   };
-  // Функция для закрытия VinQuick и удаления quickgroup из URL
+  // --- Сброс VinQuick (selectedQuickGroup) и quickgroup в URL ---
   const closeQuickGroup = () => {
     setSelectedQuickGroup(null);
     const { quickgroup, ...rest } = router.query;
-    router.push(
+    if (quickgroup) {
-      { pathname: router.pathname, query: rest },
+      router.push(
-      undefined,
+        { pathname: router.pathname, query: rest },
-      { shallow: true }
+        undefined,
-    );
+        { shallow: true }
+      );
+    }
   };
 
   // --- Синхронизация selectedNode (KnotIn) с URL ---
@@ -448,6 +450,7 @@ const VehicleDetailsPage = () => {
                       activeTab={activeTab}
                       openedPath={openedPath}
                       setOpenedPath={setOpenedPath}
+                      onCloseQuickGroup={closeQuickGroup}
                     />
                     {searchState.isSearching ? (
                       <div className="knot-parts">

src/styles/my.css

@@ -23,7 +23,7 @@
   align-items: flex-start;
   width: 100%;
   height: auto;
-  margin-top: -15px;
+  /* margin-top: -15px; */
   padding-left: 60px;
   padding-right: 60px;
   display: flex;
@@ -180,7 +180,7 @@ input.text-block-31 {
   background: #e5e7eb;
 }
 
-.form-block, .text-field.w-input {
+.form-block {
   min-height: 44px !important;
 }
 
@@ -643,12 +643,19 @@ body {
 }
 
 
+.knot-parts {
+  overflow: hidden;
+}
+
 @media screen and (max-width: 991px) {
-  .flex-block-108 {
+  .flex-block-108, .flex-block-14-copy-copy {
     flex-flow: column;
     justify-content: space-between;
     
   }
+  .flex-block-14-copy-copy{
+    align-items: center;
+  }
 
 } 
 @media screen and (max-width: 991px) {
@@ -805,6 +812,12 @@ body {
     min-width: 160px !important;
     padding: 15px;
   }
+  .div-block-3 {
+    height: 102px !important;
+  }
+  .div-block-3.bp-item-info {
+    height: 90px !important;
+  }
 }
 
 
@@ -825,6 +838,10 @@ body {
     line-height: 18px;
     overflow: hidden;
   }
+
+  .knot-parts {
+    min-width: 100%;
+  }
 }
 
 
@@ -845,4 +862,18 @@ body {
     padding: 15px;
   }
 }
+@media screen and (max-width: 1440px) {
+  .image-27 {
+    margin-bottom: -212px;
+    margin-left: 800px;
+  }
+}
+@media (max-width: 991px) {
+  .topnav.w-nav {
+    margin-left: 0 !important;
+  }
+  .code-embed-15.w-embed {
+    display: none !important;
+  }
+}
 

src/styles/protekproject.webflow.css

@@ -6897,7 +6897,7 @@ body {
   }
 
   .image-27 {
-    margin-bottom: -218px;
+    margin-bottom: -212px;
     margin-left: 800px;
   }
 }