Merge branch 'zjm'

src/pages/common/css/common.less

@@ -809,6 +809,11 @@ footer{
                 .footerShow{
                     display: flex;
                     flex-direction: column;
+                    a{
+                        &:hover{
+                            color: #000;
+                        }
+                    }
                 }
             }
         }
@@ -1092,8 +1097,8 @@ footer{
                 margin-right: 0px;
                 text-align: center;
                 .footerLogo{
-                    width: 175px;
-                    height: 33px;
+                    width: 190px;
+                    height: 40px;
                     margin: 0px auto;
                     background-size: auto 100%;
                 }

src/pages/common/tpl/footer.tpl

@@ -3,7 +3,7 @@
         <div class="footerLeft">
             <div class="footerLogo"></div>
             <!--<div class="footerLCon1"><div>电话：<span>010-65008562</span></div><div>邮编：<span>100020</span></div></div>-->
-            <div class="footerLCon2">地址：<span>北京市朝阳区金河东路正大中心北塔28层</span></div>
+            <div class="footerLCon2">地址：<span>北京市朝阳区金和东路正大中心北塔28层</span></div>
             <div class="footerLCon2">邮箱：<span class="txt16">zzjt@lnzzgroup.com</span></div>
         </div>
         <div class="footerCenter">
@@ -58,7 +58,7 @@
             <div></div>
             <a class="h7" href="./product.html">产业布局</a>
             <div></div>
-            <a class="h7" href="./news.html">新闻中心</a>
+            <a class="h7" href="./news.html">新闻动态</a>
             <div></div>
             <a class="h7" href="./join.html">加入中泽</a>
         </div>
@@ -73,7 +73,7 @@
             </div>-->
             
             <div class="footerLConM">
-                <div class="footerLCon2">地址：北京市朝阳区金河东路正大中心北塔28层</div>
+                <div class="footerLCon2">地址：北京市朝阳区金和东路正大中心北塔28层</div>
                 <a href="mail:zzjt@lnzzgroup.com" class="footerLCon2">邮箱：zzjt@lnzzgroup.com</a>
             </div>
             <div class="imgWx"><img src="./static/images/weixin.png" alt=""/><span>微信公众号</span></div>
@@ -85,5 +85,5 @@
             <div><img src="./static/images/weixin.png" alt=""/></div>
         </div>
     </div>-->
-    <div class="footerText"><a href="">法律声明</a><span></span><a href="">隐私政策</a><br>中泽集团版权所有 ZHONGZE GROUP COPYRIGHT <br>@ 2014-2024 <a href="https://beian.miit.gov.cn/#/Integrated/index">辽ICP备14015583号</a></div>
+    <div class="footerText">中泽集团版权所有 ZHONGZE GROUP COPYRIGHT <br>@ 2014-2024 <a href="https://beian.miit.gov.cn/#/Integrated/index">辽ICP备14015583号</a></div>
 </footer>

src/pages/index/App.js

@@ -214,6 +214,15 @@ export default class App {
                 ease: "power1.out" // 缓动效果
               });
         }
+        let productConBox=document.querySelector(".product .productConBox");
+        let productPage=document.querySelector(".product .swiper-page");
+        let pagebefore=0;
+        let pageAfter=0;
+        if(productConBox.getBoundingClientRect().width>1300){
+            let pageT=(productConBox.getBoundingClientRect().width-productPage.getBoundingClientRect().width)/2;
+            pagebefore=pageT;
+            pageAfter=pageT+560-312;
+        }
         let mySwiper = new Swiper('.productSwiper', {
                 autoplay: false,//可选选项，自动滑动
                 autoHeight: true,
@@ -221,8 +230,8 @@ export default class App {
                 slidesPerGroup : isMob?1:3,
                 spaceBetween: isMob?0:20,
                 allowTouchMove: false,
-                slidesOffsetBefore : isMob?0:310,
-                slidesOffsetAfter : isMob?0:310,
+                slidesOffsetBefore : isMob?0:pagebefore,
+                slidesOffsetAfter : isMob?0:pageAfter,
                 navigation: {
                     nextEl: '.btn-nextP1',
                     prevEl: '.btn-prevP1',
@@ -262,6 +271,9 @@ export default class App {
         allNum.textContent=historySlides.length;
         let historySwiper = null;
         if(isMob){
+            let rightDiv=document.querySelector(".rightDiv").offsetWidth;
+            let fillLineWidth=parseFloat(rightDiv/historySlides.length);
+            fillLine.style.width=fillLineWidth+'px';
             historySwiper = new Swiper(".historySwiper", {
                 autoplay: false,
                 rewind:true,
@@ -273,8 +285,9 @@ export default class App {
                 on:{
                     slideChange: function(){
                         nowNum.textContent=this.activeIndex+1;
-                        let numL=historySlides.length-this.activeIndex;
-                        fillLine.style.width=parseFloat(numL/historySlides.length)*100+"%";
+                        let numL=historySlides.length-this.activeIndex-1;
+                        // fillLine.style.width=parseFloat(numL/historySlides.length)*100+"%";
+                        fillLine.style.right=numL*fillLineWidth+'px';
                     },
                 },
               });

src/pages/index/index.html

@@ -25,13 +25,13 @@
       <div class="wow domInUp banner">
         <div class="swiper bannerSwiper">
           <div class="swiper-wrapper">
-            <div class="swiper-slide">
+            <!--<div class="swiper-slide">
               <img
                 class="lazy"
                 data-src="./static/images/index/banner1.jpg"
                 data-srcM="./static/images/index/banner1m.jpg"
                 alt=""
-              />
+              />-->
               <!-- 用视频就用下面的，把图片删除 -->
               <!-- <video
                 class="lazy"
@@ -42,10 +42,10 @@
                 loop
                 playsinline
               ></video> -->
-              <div class="slideCon">
+              <!-- <div class="slideCon">
                   <div class="title">投资并购与企业<br>运营双轮驱动</div>
               </div>
-            </div>
+            </div>-->
             <!-- 多个直接复制添加swiper-slide -->
             <div class="swiper-slide">
               <img
@@ -236,20 +236,22 @@
       <div class="wow fadeInUp about">
         <div class="wow fadeInUp title mTxt">业务版图</div>
         <div class="aboutImg">
-          <img class="lazy" data-src="./static/images/index/aboutbg.png" data-srcM="./static/images/index/aboutbgm.jpg" alt="" />
-          <img class="wow fadeInUp lazy imgZi" data-wow-delay="0.3s" data-src="./static/images/index/aboutbg2.png" data-srcM="./static/images/index/aboutbgm2.png" alt="" />
-          <img class="wow fadeInUp lazy imgZi" data-wow-delay="0.6s" data-src="./static/images/index/aboutbg3.png" data-srcM="./static/images/index/aboutbgm3.png" alt="" />
-          <img class="wow fadeInUp lazy imgZi" data-wow-delay="0.7s" data-src="./static/images/index/aboutbg4.png" data-srcM="./static/images/index/aboutbgm4.png" alt="" />
-          <img class="wow fadeInUp lazy imgZi" data-wow-delay="0.8s" data-src="./static/images/index/aboutbg5.png" data-srcM="./static/images/index/aboutbgm5.png" alt="" />
-          <img class="wow fadeInUp lazy imgZi" data-wow-delay="0.9s" data-src="./static/images/index/aboutbg6.png" data-srcM="./static/images/index/aboutbgm6.png" alt="" />
+          <img class="lazy" data-src="./static/images/index/aboutbg.png" data-srcM="./static/images/index/aboutbgm.png" alt="" />
+          <img class="wow fadeInUp lazy imgZi" data-wow-delay="0.3s" data-src="./static/images/index/aboutbg2.png" data-srcM="./static/images/index/aboutbg2.png" alt="" />
+          <img class="wow fadeInUp lazy imgZi" data-wow-delay="0.6s" data-src="./static/images/index/aboutbg3.png" data-srcM="./static/images/index/aboutbg3.png" alt="" />
+          <img class="wow fadeInUp lazy imgZi" data-wow-delay="0.7s" data-src="./static/images/index/aboutbg4.png" data-srcM="./static/images/index/aboutbg4.png" alt="" />
+          <img class="wow fadeInUp lazy imgZi" data-wow-delay="0.8s" data-src="./static/images/index/aboutbg5.png" data-srcM="./static/images/index/aboutbg5.png" alt="" />
+          <img class="wow fadeInUp lazy imgZi" data-wow-delay="0.9s" data-src="./static/images/index/aboutbg6.png" data-srcM="./static/images/index/aboutbg6.png" alt="" />
         </div>
         <div class="aboutCon">
           <div class="wow fadeInUp title pcTxt">业务版图</div>
-          <div class="wow fadeInUp sltImg">
-            业务版图缩略图
-            <img src="./static/images/index/aboutbg7.png" alt=""/>
+          <div>
+            <div class="wow fadeInUp sltImg">
+              业务版图缩略图
+              <img src="./static/images/index/aboutbg7.png" alt=""/>
+            </div>
+            <a href="./product.html" class="wow fadeInUp btn3">产业布局<span class="icon iconfont icon-jiantou"></span></a>
           </div>
-          <a href="./product.html" class="wow fadeInUp btn3">产业布局<span class="icon iconfont icon-jiantou"></span></a>
         </div>
       </div>
       <div class="wow fadeInUp history" id="fzlc">

src/pages/index/index.less

@@ -309,6 +309,17 @@
                 font-size: 16px;
               }
             }
+            &:hover{
+              background: rgba(184,28,37,.05);
+              &::before{
+                width: 100%;
+              }
+              .newsLiCon{
+                .liTitle,.licon{
+                  color: #b81c25;
+                }
+              }
+            }
           }
           .liHight{
             background: rgba(184,28,37,.05);
@@ -520,8 +531,12 @@
     padding-top: 125px;
     text-align: left;
     box-sizing: border-box;
+    display: flex;
+    flex-wrap: wrap;
     .title{
-      margin-bottom: 260px;
+      // margin-bottom: 260px;
+      width: 100%;
+      height: auto;
     }
     .sltImg{
       width: 300px;
@@ -800,13 +815,14 @@
       justify-content: space-between;
       border-bottom: 1px solid #999;
       line-height: 60px;
-      color: #fff;
+      color: rgba(255, 255, 255, 0.8);
       box-sizing: border-box;
       div{
         font-size: 20px;
         padding: 0px 10px;
         position: relative;
         cursor: pointer;
+
         &::before{
           content: '';
           position: absolute;
@@ -842,13 +858,14 @@
   }
 }
 
-@media screen and (min-width: 801px) and (max-width: 1400px) {
+@media screen and (min-width: 801px) and (max-width: 1300px) {
   .banner {
     .slideCon{
-      padding-top: 160px;
+      padding: 120px 10px 0px;
       box-sizing: border-box;
     }
   }
+  
 }
 @media screen and (min-width:800px){
   
@@ -1109,11 +1126,17 @@
     .title{
       margin-bottom: 40px;
     }
+    .aboutImg{
+      .imgZi{
+        display: none;
+      }
+    }
     .aboutCon {
       position: relative;
       height: auto;
       text-align: center;
       padding-top: 15px;
+      justify-content: center;
       .sltImg{
         margin: 0px auto;
         padding-top: 0px;

src/pages/join/index.less

@@ -634,6 +634,11 @@
                 }
                 .btn3{
                     margin: 20px auto 0px;
+                    width: 190px;
+        height: 40px;
+        line-height: 40px;
+        font-size: 14px;
+        border-radius: 20px;
                 }
                 .inLiCon{
                     justify-content: center;

src/pages/joinList/index.less

@@ -24,9 +24,8 @@
       width: 100%;
       display: flex;
       justify-content: space-between;
-      padding-bottom: 37px;
       border-bottom: 1px dotted #acacac5e;
-      padding-top: 37px;
+      padding: 37px 8px;
       transition: all 0.3s ease-in-out;
       &:last-child{
         border-bottom: 0px dotted #ACACAC;
@@ -74,13 +73,15 @@
           font-size: 16px;
         }
       }
+      
       &:hover{
-        background: #EFEFEF;
+        background: rgba(184, 28, 37, 0.05);
         .newsLiCon{
             .liTitle{
                 color: #B81C25;
             }
         }
+        
       }
     }
    }
@@ -173,20 +174,20 @@
   font-size: 60px;
 }
 .news_paging{
-  width: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
+  width: 100%;
   padding: 0px 0 120px;
   box-sizing: border-box;
   .previousPage{
       width: 40px;
       height: 40px;
-      color: #041954;
+      color: #000000;
       display: flex;
       align-items: center;
       justify-content: center;
-      border: 1px solid #041954;
+      border: 1px solid #000000;
       margin-right: 20px;
       cursor: pointer;
       transition: all 0.2s;
@@ -205,11 +206,11 @@
   .nextPage{
       width: 40px;
       height: 40px;
-      color: #041954;
+      color: #000000;
       display: flex;
       align-items: center;
       justify-content: center;
-      border: 1px solid #041954;
+      border: 1px solid #000000;
       margin-left: 20px;
       cursor: pointer;
       transition: all 0.2s;
@@ -229,6 +230,7 @@
       min-width: 40px;
       height: 40px;
       line-height: 40px;
+      font-family: Source Han Sans CN;
       font-size: 18px;
       color: #000;
       transition: all 0.2s;
@@ -237,7 +239,6 @@
       cursor: pointer;
       text-align: center;
       border: 1px solid #DDE2E6;
-      border-radius: 2px;
       border-radius: 20px;
       box-sizing: border-box;
       &:hover{
@@ -246,18 +247,20 @@
           color: #fff;
       }
   }
-  .pageNumActive{
-      color: #fff;
-      background: #B81C25;
-  }
   .pageNums{
       pointer-events: none;
   }
   .pageNum+.pageNum{
       margin-left: 10px;
   }
+  .pageNumActive{
+      color: #fff;
+      background-color: #B81C25;
+      border: 1px solid #B81C25;
 
+  }
   .ellipsis{
+      font-family: Source Han Sans CN;
       font-weight: bold;
       font-size: 22px;
       padding: 10px 15px;
@@ -271,6 +274,7 @@
 }
 
 
+
 @media screen and (min-width: 801px) and (max-width: 1400px) {
   
 }
@@ -296,9 +300,10 @@
         font-size: 32px;
         line-height: normal;
     }
+    
     .news_paging{
-      // padding-top: 16vw;
-      padding-bottom: 60px;
+      padding-top: 5vw;
+      padding-bottom: 16vw;
       .previousPage{
           width: 40px;
           height: 40px;

src/pages/product/App.js

@@ -61,9 +61,12 @@ export default class App {
                 ease: "power1.out" // 缓动效果
               });
         }
+        let pagebefore=0;
         let pageAfter=0;
         if(productConBox.getBoundingClientRect().width>1300){
-            pageAfter=(productConBox.getBoundingClientRect().width-productPage.getBoundingClientRect().width)/2;
+            let pageT=(productConBox.getBoundingClientRect().width-productPage.getBoundingClientRect().width)/2;
+            pagebefore=pageT>50?pageT-50:pageT;
+            pageAfter=pageT;
         }
         let mySwiper = new Swiper('.productSwiper', {
                 autoplay: false,//可选选项，自动滑动
@@ -72,7 +75,7 @@ export default class App {
                 slidesPerGroup : isMob?1:3,
                 spaceBetween: isMob?0:20,
                 allowTouchMove: isMob?true:false,
-                slidesOffsetBefore : isMob?0:210,
+                slidesOffsetBefore : isMob?0:pagebefore,
                 slidesOffsetAfter : isMob?0:pageAfter,
                 navigation: {
                     nextEl: '.btn-nextP1',

src/pages/product/index.html

@@ -132,7 +132,7 @@
             <div class="upDiv">
               <div class="upDivTit">吉铁铁合金有限公司</div>
               <div class="text">集生产经营、研发设 计、设备制造等于一体的全国铁合金行业龙头企业</div>
-              <a href=""></a>
+              <a href="" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -140,7 +140,7 @@
             <div class="upDiv">
               <div class="upDivTit">吉林炭素有限公司</div>
               <div class="text">产品主要包括石墨电极、石墨阳极、炭块、糊类、特种炭制品、炭纤维制品等，广泛应用于冶金、化工、机械、电子、医疗及新材料等领域</div>
-              <a href=""></a>
+              <a href="http://www.jlts.cn" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -148,7 +148,7 @@
             <div class="upDiv">
               <div class="upDivTit">吉林吉恩镍业股份有限公司</div>
               <div class="text">集采矿、选矿、冶炼、精炼、化工于一体的大型镍、铜、钴有色金属生产加工企业。</div>
-              <a href=""></a>
+              <a href="http://www.jlnickel.com.cn" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -156,7 +156,7 @@
             <div class="upDiv">
               <div class="upDivTit">吉林大黑山钼业股份有限公司</div>
               <div class="text">集钼金属采矿、选矿、碎石骨料加工为一体的综合性矿山企业</div>
-              <a href=""></a>
+              <a href="http://www.jldhsmy.com" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -164,7 +164,7 @@
             <div class="upDiv">
               <div class="upDivTit">吉林中泽钼业有限公司</div>
               <div class="text">产品主要为氧化钼、钼铁、钼酸铵、高纯氧化钼等。</div>
-              <a href=""></a>
+              <a href="http://www.jlzzmoly.com" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -172,7 +172,7 @@
             <div class="upDiv">
               <div class="upDivTit">万联易达物流科技有限公司</div>
               <div class="text">以大宗商品交易和整车物流服务为纽带,以人工智能为支撑的产业互联网公司。</div>
-              <a href=""></a>
+              <a href="https://www.10000da.net/" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -180,7 +180,7 @@
             <div class="upDiv">
               <div class="upDivTit">通辽金煤化工有限公司</div>
               <div class="text">主要产品包括煤制乙二醇、草酸、催化剂、完全生物降解塑料等</div>
-              <a href=""></a>
+              <a href="http://www.tljmhg.com" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -188,7 +188,7 @@
             <div class="upDiv">
               <div class="upDivTit">辽宁省机械研究院有限公司</div>
               <div class="text">主营科研业务为机械轻量化 设计、智能装备及大宗固废综合利用系统等。</div>
-              <a href=""></a>
+              <a href="" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -196,7 +196,7 @@
             <div class="upDiv">
               <div class="upDivTit">吉林卓创新材料有限公司</div>
               <div class="text">主要生产羰基铁粉、羰基镍粉等新材料产品。</div>
-              <a href=""></a>
+              <a href="http://www.jlzcxcl.cn" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -204,7 +204,7 @@
             <div class="upDiv">
               <div class="upDivTit">吉林中泽新型建材有限公司</div>
               <div class="text">主营蒸压加气混凝土砌块、板材、高性能无机石等系列绿色建材产品。</div>
-              <a href=""></a>
+              <a href="http://www.jlzzxxjc.com" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -212,7 +212,7 @@
             <div class="upDiv">
               <div class="upDivTit">朝阳重型机器有限公司</div>
               <div class="text">公司成立于1959年，是集研发设计、设备制造、安装服务、进出口商务、物流及技术咨询于一体的综合性装备制造企业。</div>
-              <a href=""></a>
+              <a href="http://www.cyzxjqyxgs.com" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -220,7 +220,7 @@
             <div class="upDiv">
               <div class="upDivTit">黑龙江新瑞石油化工有限公司</div>
               <div class="text">主要产品为甲基叔丁基醚（MTBE）、乙苯、液化气、正丁烷等。</div>
-              <a href=""></a>
+              <a href="" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -228,7 +228,7 @@
             <div class="upDiv">
               <div class="upDivTit">吉林市神舟炭纤维有限责任公司</div>
               <div class="text">主要产品有聚丙烯睛基碳纤维、平纹碳布、斜纹碳布，主要应用于国防军工和民用领域。</div>
-              <a href=""></a>
+              <a href="http://www.jlccf.com" target="_blank"></a>
             </div>
           </div>
           <div class="memberLi">
@@ -237,7 +237,7 @@
             <div class="upDiv">
               <div class="upDivTit">沈阳中泽镁材料研究院有限公司</div>
               <div class="text">以镁为主体的金属制取、加工及高性能材料领域的新技术开发。</div>
-              <a href=""></a>
+              <a href="" target="_blank"></a>
             </div>
           </div>