解决冲突

src/pages/common/css/common.less

@@ -174,7 +174,8 @@ header{
         max-width: 1920px;
         // box-shadow: 0px 0px 34px 9px rgba(0,0,0,0.1);
         background: #ffffff;
-        border-bottom: 1px solid rgba(0,0,0,0.1);
+        // border-bottom: 1px solid rgba(0,0,0,0.1);
+        box-shadow: 6px 8px 10px 0px rgba(159,176,191,0.13);
     }
     .menuType{
         background: #ffffff12;
@@ -356,7 +357,9 @@ header{
             text-align: center;
             width: 100px;
             height: 30px;
+            font-size: 12px;
             box-sizing: border-box;
+            border-radius: 4px;
         }
         .line{
             display: inline-block;
@@ -621,6 +624,7 @@ footer{
                     .iconfont{
                         font-size: 14px;
                         float: right;
+                        transition: all .3s ease;
                     }
                 }
                 .btnDownMenu{
@@ -647,9 +651,18 @@ footer{
                         }
                     }
                 }
-                .btnShow{
+                
+            }
+            .btnShow{
+                .btnDownTitle{
+                    .iconfont{
+                        transform: rotate(-180deg);
+                    }
+                }
+                .btnDownMenu{
                     clip-path: inset(0% 0% 0% 0%);
                 }
+                
             }
             .btnUp,.footerLConM{
                 display: none;

src/pages/common/js/Common.js

@@ -36,7 +36,7 @@ export default class Common {
     this.textAni();
     
     let btnDownTitle = document.querySelector(".btnDownTitle");
-    let btnDownMenu = document.querySelector(".btnDownMenu");
+    let btnDownMenu = document.querySelector(".btnDown");
     btnDownTitle.addEventListener("click", (e) => {
       if (btnDownMenu.classList?.contains("btnShow")) {
         btnDownMenu.classList.remove("btnShow");

src/pages/common/tpl/header.tpl

@@ -24,8 +24,8 @@
                     <a href="./productDec5.html"><span>化工</span></a>
                     <a href="./productDec6.html"><span>装备制造</span></a>
                     <a href="./productDec7.html"><span>产业互联网</span></a>
-                    <a href="./product.html"><span>金融</span></a>
-                    <a href="./product.html"><span>其他</span></a>
+                    <a href="./product.html#jinrong"><span>金融</span></a>
+                    <a href="./product.html#qita"><span>其他</span></a>
                 </div>
             </div>
             <div class="menuOne">
@@ -86,7 +86,7 @@
                     <a class="title" href="./index.html">首页</a>
                 </div>
                 <div>
-                    <div class="title" href="">走进中泽<span class="iconfont icon-xiala"></span></div>
+                    <div class="title"><a href="">走进中泽</a><span class="iconfont icon-xiala"></span></div>
                     <div class="menuSon">
                         <a href=""><span>集团简介</span></a>
                         <a href=""><span>发展历程</span></a>
@@ -96,7 +96,7 @@
                     </div>
                 </div>
                 <div>
-                    <div class="title">产业布局<span class="iconfont icon-xiala"></span></div>
+                    <div class="title"><a href="./product.html">产业布局</a><span class="iconfont icon-xiala"></span></div>
                     <div class="menuSon">
                         <a href="./productDec1.html"><span>铁合金</span></a>
                         <a href="./productDec2.html"><span>炭素</span></a>
@@ -105,12 +105,12 @@
                         <a href="./productDec5.html"><span>化工</span></a>
                         <a href="./productDec6.html"><span>装备制造</span></a>
                         <a href="./productDec7.html"><span>产业互联网</span></a>
-                        <a href="./product.html"><span>金融</span></a>
-                        <a href="./product.html"><span>其他</span></a>
+                        <a href="./product.html#jinrong"><span>金融</span></a>
+                        <a href="./product.html#qita"><span>其他</span></a>
                     </div>
                 </div>
                 <div>
-                    <div class="title" href="./news.html">新闻中心<span class="iconfont icon-xiala"></span></div>
+                    <div class="title"><a href="./news.html">新闻中心</a><span class="iconfont icon-xiala"></span></div>
                     <div class="menuSon">
                         <a href="./news.html#point"><span>集团新闻</span></a>
                         <a href="./news.html#point"><span>前沿资讯</span></a>
@@ -119,21 +119,21 @@
                     </div>
                 </div>
                 <div>
-                    <div class="title" href="./partyBuilding.html">党建工作<span class="iconfont icon-xiala"></span></div>
+                    <div class="title"><a href="./partyBuilding.html">党建工作</a><span class="iconfont icon-xiala"></span></div>
                     <div class="menuSon">
                         <a href="./partyBuilding.html#p1"><span>企业党建</span></a>
                         <a href="./partyBuilding.html#p2"><span>学习文件</span></a>
                     </div>
                 </div>
                 <div>
-                    <div class="title" href="./socialResponsibility.html">社会责任<span class="iconfont icon-xiala"></span></div>
+                    <div class="title"><a href="./socialResponsibility.html">社会责任</a><span class="iconfont icon-xiala"></span></div>
                     <div class="menuSon">
                         <a href="./socialResponsibility.html"><span>社会公益</span></a>
                         <a href="./socialResponsibility.html"><span>绿色转型</span></a>
                     </div>
                 </div>
                 <div>
-                    <div class="title" href="">加入中泽<span class="iconfont icon-xiala"></span></div>
+                    <div class="title"><a href="">加入中泽</a><span class="iconfont icon-xiala"></span></div>
                     <div class="menuSon">
                         <a href=""><span>招聘信息</span></a>
                         <a href=""><span>招标信息</span></a>

src/pages/index/index.html

@@ -427,14 +427,14 @@
                 <img class="show" src="./static/images/index/productT5h.png" alt=""/>
               </div>
             </div>
-            <div class="wow fadeInUp productTit" data-wow-delay="0.6s">
+            <div class="wow fadeInUp productTit selfW1" data-wow-delay="0.6s">
               <div>装备制造</div>
               <div>
                 <img class="default" src="./static/images/index/productT6.png" alt=""/>
                 <img class="show" src="./static/images/index/productT6h.png" alt=""/>
               </div>
             </div>
-            <div class="wow fadeInUp productTit" data-wow-delay="0.7s">
+            <div class="wow fadeInUp productTit selfW2" data-wow-delay="0.7s">
               <div>产业互联网</div>
               <div>
                 <img class="default" src="./static/images/index/productT7.png" alt=""/>

src/pages/index/index.less

@@ -231,7 +231,7 @@
             display: flex;
             justify-content: space-between;
             padding-bottom: 27px;
-            border-bottom: 1px solid #ACACAC;
+            border-bottom: 1px solid #acacac5e;
             margin-top: 27px;
             &:last-child{
               border-bottom: 0px solid #ACACAC;
@@ -605,7 +605,7 @@
       margin: 40px auto 32px;
       height: auto;
       flex-wrap: wrap;
-      padding-top: 48px;
+      padding-top: 68px;
       &>div{
         width: 100%;
         height: auto;
@@ -647,7 +647,7 @@
               }
               .newsLiCon{
                 font-size: 16px;
-                padding-top: 8px;
+                padding-top: 4px;
                 &>div{
                   height: 20px;
                 }
@@ -669,8 +669,24 @@
       margin: 40px auto 0px;
       .productTits{
         overflow-x: auto;
+        &::-webkit-scrollbar{
+          -webkit-appearance: none;
+          width: 0px;
+          height: 0px;
+        }
+        
+        // &::-webkit-scrollbar:horizontal{
+        //   width: 2px;
+        //   height: 100%;
+        //   background: #fff;
+        // }
+        &::-webkit-scrollbar-thumb{
+          width: 0px;
+          height: 0px;
+          background: #B81C25;
+        }
         &>div{
-          width: 640px;
+          width: 688px;
           &>div{
             width: 71px;
             height: 74px;
@@ -683,6 +699,12 @@
               height: 20px;
             }
           }
+          .selfW1{
+            width: 90px;
+          }
+          .selfW2{
+            width: 100px;
+          }
         }
       }
       .productConBox{
@@ -704,7 +726,7 @@
               text-overflow: ellipsis;
               display: -webkit-box;
               -webkit-box-orient: vertical;
-              margin-bottom: 50px;
+              margin-bottom: 70px;
               -webkit-line-clamp: 2;
               white-space: inherit;
           }
@@ -738,7 +760,7 @@
     .aboutCon {
       .aboutNum{
         margin-top: 40px;
-        margin-bottom: 60px;
+        margin-bottom: 80px;
         justify-content: space-between;
         .num{
           .numT{
@@ -779,7 +801,7 @@
     }
     &>.btn{
       display: block;
-      margin-top: 60px;
+      margin-top: 80px;
     }
   }
 }

src/pages/product/index.html

@@ -105,7 +105,7 @@
           <img class="lazy" data-src="./static/images/product/product7.png" data-srcM="./static/images/product/product7.png" alt="" />
         </div>
       </div>
-      <div class="li">
+      <div class="li" id="jinrong">
         <div class="liLeft">
           <div class="liCon">
             <div class="wow fadeInUp num">08</div>
@@ -118,7 +118,7 @@
           <img class="lazy" data-src="./static/images/product/product8.png" data-srcM="./static/images/product/product8.png" alt="" />
         </div>
       </div>
-      <div class="li">
+      <div class="li" id="qita">
         <div class="liLeft">
           <div class="liCon">
             <div class="wow fadeInUp num">09</div>

src/pages/productDec1/index.less

@@ -76,7 +76,7 @@
     padding-top: 61px;
   }
   .desCon{
-    padding-top: 100px;
+    padding-top: 50px;
     box-sizing: border-box;
     padding-left: 15px;
     padding-right: 15px;

src/pages/productDec2/index.less

@@ -76,7 +76,7 @@
     padding-top: 61px;
   }
   .desCon{
-    padding-top: 100px;
+    padding-top: 50px;
     box-sizing: border-box;
     padding-left: 15px;
     padding-right: 15px;

src/pages/productDec3/index.less

@@ -76,7 +76,7 @@
     padding-top: 61px;
   }
   .desCon{
-    padding-top: 100px;
+    padding-top: 50px;
     box-sizing: border-box;
     padding-left: 15px;
     padding-right: 15px;

src/pages/productDec4/index.less

@@ -76,7 +76,7 @@
     padding-top: 61px;
   }
   .desCon{
-    padding-top: 100px;
+    padding-top: 50px;
     box-sizing: border-box;
     padding-left: 15px;
     padding-right: 15px;

src/pages/productDec5/index.less

@@ -76,7 +76,7 @@
     padding-top: 61px;
   }
   .desCon{
-    padding-top: 100px;
+    padding-top: 50px;
     box-sizing: border-box;
     padding-left: 15px;
     padding-right: 15px;

src/pages/productDec6/index.less

@@ -76,7 +76,7 @@
     padding-top: 61px;
   }
   .desCon{
-    padding-top: 100px;
+    padding-top: 50px;
     box-sizing: border-box;
     padding-left: 15px;
     padding-right: 15px;

src/pages/productDec7/index.less

@@ -76,7 +76,7 @@
     padding-top: 61px;
   }
   .desCon{
-    padding-top: 100px;
+    padding-top: 50px;
     box-sizing: border-box;
     padding-left: 15px;
     padding-right: 15px;

src/pages/productDec8/index.less

@@ -76,7 +76,7 @@
     padding-top: 61px;
   }
   .desCon{
-    padding-top: 100px;
+    padding-top: 50px;
     box-sizing: border-box;
     padding-left: 15px;
     padding-right: 15px;

src/pages/productDec9/index.less

@@ -76,7 +76,7 @@
     padding-top: 61px;
   }
   .desCon{
-    padding-top: 100px;
+    padding-top: 50px;
     box-sizing: border-box;
     padding-left: 15px;
     padding-right: 15px;