Browse Source

解决冲突

zjm
等你 4 months ago
parent
commit
e52da8e9ae

+ 15
- 2
src/pages/common/css/common.less View File

174
         max-width: 1920px;
174
         max-width: 1920px;
175
         // box-shadow: 0px 0px 34px 9px rgba(0,0,0,0.1);
175
         // box-shadow: 0px 0px 34px 9px rgba(0,0,0,0.1);
176
         background: #ffffff;
176
         background: #ffffff;
177
-        border-bottom: 1px solid rgba(0,0,0,0.1);
177
+        // border-bottom: 1px solid rgba(0,0,0,0.1);
178
+        box-shadow: 6px 8px 10px 0px rgba(159,176,191,0.13);
178
     }
179
     }
179
     .menuType{
180
     .menuType{
180
         background: #ffffff12;
181
         background: #ffffff12;
356
             text-align: center;
357
             text-align: center;
357
             width: 100px;
358
             width: 100px;
358
             height: 30px;
359
             height: 30px;
360
+            font-size: 12px;
359
             box-sizing: border-box;
361
             box-sizing: border-box;
362
+            border-radius: 4px;
360
         }
363
         }
361
         .line{
364
         .line{
362
             display: inline-block;
365
             display: inline-block;
621
                     .iconfont{
624
                     .iconfont{
622
                         font-size: 14px;
625
                         font-size: 14px;
623
                         float: right;
626
                         float: right;
627
+                        transition: all .3s ease;
624
                     }
628
                     }
625
                 }
629
                 }
626
                 .btnDownMenu{
630
                 .btnDownMenu{
647
                         }
651
                         }
648
                     }
652
                     }
649
                 }
653
                 }
650
-                .btnShow{
654
+                
655
+            }
656
+            .btnShow{
657
+                .btnDownTitle{
658
+                    .iconfont{
659
+                        transform: rotate(-180deg);
660
+                    }
661
+                }
662
+                .btnDownMenu{
651
                     clip-path: inset(0% 0% 0% 0%);
663
                     clip-path: inset(0% 0% 0% 0%);
652
                 }
664
                 }
665
+                
653
             }
666
             }
654
             .btnUp,.footerLConM{
667
             .btnUp,.footerLConM{
655
                 display: none;
668
                 display: none;

+ 1
- 1
src/pages/common/js/Common.js View File

36
     this.textAni();
36
     this.textAni();
37
     
37
     
38
     let btnDownTitle = document.querySelector(".btnDownTitle");
38
     let btnDownTitle = document.querySelector(".btnDownTitle");
39
-    let btnDownMenu = document.querySelector(".btnDownMenu");
39
+    let btnDownMenu = document.querySelector(".btnDown");
40
     btnDownTitle.addEventListener("click", (e) => {
40
     btnDownTitle.addEventListener("click", (e) => {
41
       if (btnDownMenu.classList?.contains("btnShow")) {
41
       if (btnDownMenu.classList?.contains("btnShow")) {
42
         btnDownMenu.classList.remove("btnShow");
42
         btnDownMenu.classList.remove("btnShow");

+ 10
- 10
src/pages/common/tpl/header.tpl View File

24
                     <a href="./productDec5.html"><span>化工</span></a>
24
                     <a href="./productDec5.html"><span>化工</span></a>
25
                     <a href="./productDec6.html"><span>装备制造</span></a>
25
                     <a href="./productDec6.html"><span>装备制造</span></a>
26
                     <a href="./productDec7.html"><span>产业互联网</span></a>
26
                     <a href="./productDec7.html"><span>产业互联网</span></a>
27
-                    <a href="./product.html"><span>金融</span></a>
28
-                    <a href="./product.html"><span>其他</span></a>
27
+                    <a href="./product.html#jinrong"><span>金融</span></a>
28
+                    <a href="./product.html#qita"><span>其他</span></a>
29
                 </div>
29
                 </div>
30
             </div>
30
             </div>
31
             <div class="menuOne">
31
             <div class="menuOne">
86
                     <a class="title" href="./index.html">首页</a>
86
                     <a class="title" href="./index.html">首页</a>
87
                 </div>
87
                 </div>
88
                 <div>
88
                 <div>
89
-                    <div class="title" href="">走进中泽<span class="iconfont icon-xiala"></span></div>
89
+                    <div class="title"><a href="">走进中泽</a><span class="iconfont icon-xiala"></span></div>
90
                     <div class="menuSon">
90
                     <div class="menuSon">
91
                         <a href=""><span>集团简介</span></a>
91
                         <a href=""><span>集团简介</span></a>
92
                         <a href=""><span>发展历程</span></a>
92
                         <a href=""><span>发展历程</span></a>
96
                     </div>
96
                     </div>
97
                 </div>
97
                 </div>
98
                 <div>
98
                 <div>
99
-                    <div class="title">产业布局<span class="iconfont icon-xiala"></span></div>
99
+                    <div class="title"><a href="./product.html">产业布局</a><span class="iconfont icon-xiala"></span></div>
100
                     <div class="menuSon">
100
                     <div class="menuSon">
101
                         <a href="./productDec1.html"><span>铁合金</span></a>
101
                         <a href="./productDec1.html"><span>铁合金</span></a>
102
                         <a href="./productDec2.html"><span>炭素</span></a>
102
                         <a href="./productDec2.html"><span>炭素</span></a>
105
                         <a href="./productDec5.html"><span>化工</span></a>
105
                         <a href="./productDec5.html"><span>化工</span></a>
106
                         <a href="./productDec6.html"><span>装备制造</span></a>
106
                         <a href="./productDec6.html"><span>装备制造</span></a>
107
                         <a href="./productDec7.html"><span>产业互联网</span></a>
107
                         <a href="./productDec7.html"><span>产业互联网</span></a>
108
-                        <a href="./product.html"><span>金融</span></a>
109
-                        <a href="./product.html"><span>其他</span></a>
108
+                        <a href="./product.html#jinrong"><span>金融</span></a>
109
+                        <a href="./product.html#qita"><span>其他</span></a>
110
                     </div>
110
                     </div>
111
                 </div>
111
                 </div>
112
                 <div>
112
                 <div>
113
-                    <div class="title" href="./news.html">新闻中心<span class="iconfont icon-xiala"></span></div>
113
+                    <div class="title"><a href="./news.html">新闻中心</a><span class="iconfont icon-xiala"></span></div>
114
                     <div class="menuSon">
114
                     <div class="menuSon">
115
                         <a href="./news.html#point"><span>集团新闻</span></a>
115
                         <a href="./news.html#point"><span>集团新闻</span></a>
116
                         <a href="./news.html#point"><span>前沿资讯</span></a>
116
                         <a href="./news.html#point"><span>前沿资讯</span></a>
119
                     </div>
119
                     </div>
120
                 </div>
120
                 </div>
121
                 <div>
121
                 <div>
122
-                    <div class="title" href="./partyBuilding.html">党建工作<span class="iconfont icon-xiala"></span></div>
122
+                    <div class="title"><a href="./partyBuilding.html">党建工作</a><span class="iconfont icon-xiala"></span></div>
123
                     <div class="menuSon">
123
                     <div class="menuSon">
124
                         <a href="./partyBuilding.html#p1"><span>企业党建</span></a>
124
                         <a href="./partyBuilding.html#p1"><span>企业党建</span></a>
125
                         <a href="./partyBuilding.html#p2"><span>学习文件</span></a>
125
                         <a href="./partyBuilding.html#p2"><span>学习文件</span></a>
126
                     </div>
126
                     </div>
127
                 </div>
127
                 </div>
128
                 <div>
128
                 <div>
129
-                    <div class="title" href="./socialResponsibility.html">社会责任<span class="iconfont icon-xiala"></span></div>
129
+                    <div class="title"><a href="./socialResponsibility.html">社会责任</a><span class="iconfont icon-xiala"></span></div>
130
                     <div class="menuSon">
130
                     <div class="menuSon">
131
                         <a href="./socialResponsibility.html"><span>社会公益</span></a>
131
                         <a href="./socialResponsibility.html"><span>社会公益</span></a>
132
                         <a href="./socialResponsibility.html"><span>绿色转型</span></a>
132
                         <a href="./socialResponsibility.html"><span>绿色转型</span></a>
133
                     </div>
133
                     </div>
134
                 </div>
134
                 </div>
135
                 <div>
135
                 <div>
136
-                    <div class="title" href="">加入中泽<span class="iconfont icon-xiala"></span></div>
136
+                    <div class="title"><a href="">加入中泽</a><span class="iconfont icon-xiala"></span></div>
137
                     <div class="menuSon">
137
                     <div class="menuSon">
138
                         <a href=""><span>招聘信息</span></a>
138
                         <a href=""><span>招聘信息</span></a>
139
                         <a href=""><span>招标信息</span></a>
139
                         <a href=""><span>招标信息</span></a>

+ 2
- 2
src/pages/index/index.html View File

427
                 <img class="show" src="./static/images/index/productT5h.png" alt=""/>
427
                 <img class="show" src="./static/images/index/productT5h.png" alt=""/>
428
               </div>
428
               </div>
429
             </div>
429
             </div>
430
-            <div class="wow fadeInUp productTit" data-wow-delay="0.6s">
430
+            <div class="wow fadeInUp productTit selfW1" data-wow-delay="0.6s">
431
               <div>装备制造</div>
431
               <div>装备制造</div>
432
               <div>
432
               <div>
433
                 <img class="default" src="./static/images/index/productT6.png" alt=""/>
433
                 <img class="default" src="./static/images/index/productT6.png" alt=""/>
434
                 <img class="show" src="./static/images/index/productT6h.png" alt=""/>
434
                 <img class="show" src="./static/images/index/productT6h.png" alt=""/>
435
               </div>
435
               </div>
436
             </div>
436
             </div>
437
-            <div class="wow fadeInUp productTit" data-wow-delay="0.7s">
437
+            <div class="wow fadeInUp productTit selfW2" data-wow-delay="0.7s">
438
               <div>产业互联网</div>
438
               <div>产业互联网</div>
439
               <div>
439
               <div>
440
                 <img class="default" src="./static/images/index/productT7.png" alt=""/>
440
                 <img class="default" src="./static/images/index/productT7.png" alt=""/>

+ 29
- 7
src/pages/index/index.less View File

231
             display: flex;
231
             display: flex;
232
             justify-content: space-between;
232
             justify-content: space-between;
233
             padding-bottom: 27px;
233
             padding-bottom: 27px;
234
-            border-bottom: 1px solid #ACACAC;
234
+            border-bottom: 1px solid #acacac5e;
235
             margin-top: 27px;
235
             margin-top: 27px;
236
             &:last-child{
236
             &:last-child{
237
               border-bottom: 0px solid #ACACAC;
237
               border-bottom: 0px solid #ACACAC;
605
       margin: 40px auto 32px;
605
       margin: 40px auto 32px;
606
       height: auto;
606
       height: auto;
607
       flex-wrap: wrap;
607
       flex-wrap: wrap;
608
-      padding-top: 48px;
608
+      padding-top: 68px;
609
       &>div{
609
       &>div{
610
         width: 100%;
610
         width: 100%;
611
         height: auto;
611
         height: auto;
647
               }
647
               }
648
               .newsLiCon{
648
               .newsLiCon{
649
                 font-size: 16px;
649
                 font-size: 16px;
650
-                padding-top: 8px;
650
+                padding-top: 4px;
651
                 &>div{
651
                 &>div{
652
                   height: 20px;
652
                   height: 20px;
653
                 }
653
                 }
669
       margin: 40px auto 0px;
669
       margin: 40px auto 0px;
670
       .productTits{
670
       .productTits{
671
         overflow-x: auto;
671
         overflow-x: auto;
672
+        &::-webkit-scrollbar{
673
+          -webkit-appearance: none;
674
+          width: 0px;
675
+          height: 0px;
676
+        }
677
+        
678
+        // &::-webkit-scrollbar:horizontal{
679
+        //   width: 2px;
680
+        //   height: 100%;
681
+        //   background: #fff;
682
+        // }
683
+        &::-webkit-scrollbar-thumb{
684
+          width: 0px;
685
+          height: 0px;
686
+          background: #B81C25;
687
+        }
672
         &>div{
688
         &>div{
673
-          width: 640px;
689
+          width: 688px;
674
           &>div{
690
           &>div{
675
             width: 71px;
691
             width: 71px;
676
             height: 74px;
692
             height: 74px;
683
               height: 20px;
699
               height: 20px;
684
             }
700
             }
685
           }
701
           }
702
+          .selfW1{
703
+            width: 90px;
704
+          }
705
+          .selfW2{
706
+            width: 100px;
707
+          }
686
         }
708
         }
687
       }
709
       }
688
       .productConBox{
710
       .productConBox{
704
               text-overflow: ellipsis;
726
               text-overflow: ellipsis;
705
               display: -webkit-box;
727
               display: -webkit-box;
706
               -webkit-box-orient: vertical;
728
               -webkit-box-orient: vertical;
707
-              margin-bottom: 50px;
729
+              margin-bottom: 70px;
708
               -webkit-line-clamp: 2;
730
               -webkit-line-clamp: 2;
709
               white-space: inherit;
731
               white-space: inherit;
710
           }
732
           }
738
     .aboutCon {
760
     .aboutCon {
739
       .aboutNum{
761
       .aboutNum{
740
         margin-top: 40px;
762
         margin-top: 40px;
741
-        margin-bottom: 60px;
763
+        margin-bottom: 80px;
742
         justify-content: space-between;
764
         justify-content: space-between;
743
         .num{
765
         .num{
744
           .numT{
766
           .numT{
779
     }
801
     }
780
     &>.btn{
802
     &>.btn{
781
       display: block;
803
       display: block;
782
-      margin-top: 60px;
804
+      margin-top: 80px;
783
     }
805
     }
784
   }
806
   }
785
 }
807
 }

+ 2
- 2
src/pages/product/index.html View File

105
           <img class="lazy" data-src="./static/images/product/product7.png" data-srcM="./static/images/product/product7.png" alt="" />
105
           <img class="lazy" data-src="./static/images/product/product7.png" data-srcM="./static/images/product/product7.png" alt="" />
106
         </div>
106
         </div>
107
       </div>
107
       </div>
108
-      <div class="li">
108
+      <div class="li" id="jinrong">
109
         <div class="liLeft">
109
         <div class="liLeft">
110
           <div class="liCon">
110
           <div class="liCon">
111
             <div class="wow fadeInUp num">08</div>
111
             <div class="wow fadeInUp num">08</div>
118
           <img class="lazy" data-src="./static/images/product/product8.png" data-srcM="./static/images/product/product8.png" alt="" />
118
           <img class="lazy" data-src="./static/images/product/product8.png" data-srcM="./static/images/product/product8.png" alt="" />
119
         </div>
119
         </div>
120
       </div>
120
       </div>
121
-      <div class="li">
121
+      <div class="li" id="qita">
122
         <div class="liLeft">
122
         <div class="liLeft">
123
           <div class="liCon">
123
           <div class="liCon">
124
             <div class="wow fadeInUp num">09</div>
124
             <div class="wow fadeInUp num">09</div>

+ 1
- 1
src/pages/productDec1/index.less View File

76
     padding-top: 61px;
76
     padding-top: 61px;
77
   }
77
   }
78
   .desCon{
78
   .desCon{
79
-    padding-top: 100px;
79
+    padding-top: 50px;
80
     box-sizing: border-box;
80
     box-sizing: border-box;
81
     padding-left: 15px;
81
     padding-left: 15px;
82
     padding-right: 15px;
82
     padding-right: 15px;

+ 1
- 1
src/pages/productDec2/index.less View File

76
     padding-top: 61px;
76
     padding-top: 61px;
77
   }
77
   }
78
   .desCon{
78
   .desCon{
79
-    padding-top: 100px;
79
+    padding-top: 50px;
80
     box-sizing: border-box;
80
     box-sizing: border-box;
81
     padding-left: 15px;
81
     padding-left: 15px;
82
     padding-right: 15px;
82
     padding-right: 15px;

+ 1
- 1
src/pages/productDec3/index.less View File

76
     padding-top: 61px;
76
     padding-top: 61px;
77
   }
77
   }
78
   .desCon{
78
   .desCon{
79
-    padding-top: 100px;
79
+    padding-top: 50px;
80
     box-sizing: border-box;
80
     box-sizing: border-box;
81
     padding-left: 15px;
81
     padding-left: 15px;
82
     padding-right: 15px;
82
     padding-right: 15px;

+ 1
- 1
src/pages/productDec4/index.less View File

76
     padding-top: 61px;
76
     padding-top: 61px;
77
   }
77
   }
78
   .desCon{
78
   .desCon{
79
-    padding-top: 100px;
79
+    padding-top: 50px;
80
     box-sizing: border-box;
80
     box-sizing: border-box;
81
     padding-left: 15px;
81
     padding-left: 15px;
82
     padding-right: 15px;
82
     padding-right: 15px;

+ 1
- 1
src/pages/productDec5/index.less View File

76
     padding-top: 61px;
76
     padding-top: 61px;
77
   }
77
   }
78
   .desCon{
78
   .desCon{
79
-    padding-top: 100px;
79
+    padding-top: 50px;
80
     box-sizing: border-box;
80
     box-sizing: border-box;
81
     padding-left: 15px;
81
     padding-left: 15px;
82
     padding-right: 15px;
82
     padding-right: 15px;

+ 1
- 1
src/pages/productDec6/index.less View File

76
     padding-top: 61px;
76
     padding-top: 61px;
77
   }
77
   }
78
   .desCon{
78
   .desCon{
79
-    padding-top: 100px;
79
+    padding-top: 50px;
80
     box-sizing: border-box;
80
     box-sizing: border-box;
81
     padding-left: 15px;
81
     padding-left: 15px;
82
     padding-right: 15px;
82
     padding-right: 15px;

+ 1
- 1
src/pages/productDec7/index.less View File

76
     padding-top: 61px;
76
     padding-top: 61px;
77
   }
77
   }
78
   .desCon{
78
   .desCon{
79
-    padding-top: 100px;
79
+    padding-top: 50px;
80
     box-sizing: border-box;
80
     box-sizing: border-box;
81
     padding-left: 15px;
81
     padding-left: 15px;
82
     padding-right: 15px;
82
     padding-right: 15px;

+ 1
- 1
src/pages/productDec8/index.less View File

76
     padding-top: 61px;
76
     padding-top: 61px;
77
   }
77
   }
78
   .desCon{
78
   .desCon{
79
-    padding-top: 100px;
79
+    padding-top: 50px;
80
     box-sizing: border-box;
80
     box-sizing: border-box;
81
     padding-left: 15px;
81
     padding-left: 15px;
82
     padding-right: 15px;
82
     padding-right: 15px;

+ 1
- 1
src/pages/productDec9/index.less View File

76
     padding-top: 61px;
76
     padding-top: 61px;
77
   }
77
   }
78
   .desCon{
78
   .desCon{
79
-    padding-top: 100px;
79
+    padding-top: 50px;
80
     box-sizing: border-box;
80
     box-sizing: border-box;
81
     padding-left: 15px;
81
     padding-left: 15px;
82
     padding-right: 15px;
82
     padding-right: 15px;

Loading…
Cancel
Save