修改走进中泽企业文化

src/pages/common/js/Common.js

@@ -6,6 +6,7 @@
 import { isMobile } from "./utils";
 import gsap from 'gsap'
 import LocomotiveScroll from 'locomotive-scroll';
+import $ from '/dev/static/lib/jquery-2.1.1.min.js';
 export default class Common {
   /* 
     mainDom - 菜单展开时，需要往下移动的dom节点
@@ -22,10 +23,10 @@ export default class Common {
     } else {
       this.headerMenu();
     }
-    new WOW().init();
+    
     
     // let goTop = document.querySelector(".goTopBtn");
-    // const scroll = new LocomotiveScroll();
+    const scroll = new LocomotiveScroll();
     // goTop.addEventListener("click", (e) => {
     //   console.log('click');
       
@@ -52,10 +53,36 @@ export default class Common {
     let url = new URL(window.location.href);
     let anchor = url.hash.substring(1);
     
-    let element = document.getElementById(anchor);
-    if (element) {
-      element.scrollIntoView({ behavior: 'smooth' });
+    console.log(anchor,88);
+    
+    if (anchor) {
+      let element = document.getElementById(anchor);
+      element.scrollIntoView({ behavior: 'smooth',block: 'start' });
     }
+    if(window.location.href.indexOf("intoZz.html?") !== -1){
+      
+    }else{
+      new WOW().init();
+    }
+    $('a').on("click",function(event) {
+      
+      let str=$(this).attr("href");
+      
+      if(str.indexOf("intoZz.html#") !== -1){
+        event.preventDefault();
+        let hashIndex = str.indexOf('#');
+        let beforeHash = str.substring(0, hashIndex); // 获取 # 前面的部分
+        let afterHash = str.substring(hashIndex + 1);
+        let newStr = beforeHash + '?jumpz=' + afterHash;
+        window.location.href = ''+newStr;
+      }
+      
+      // let element = document.getElementById(targetId);
+      // if (element) {
+      //     element.scrollIntoView({ behavior: 'smooth', block: 'start' });
+      // }
+    });
+    
     // 微信二维码
     let wx=document.querySelector(".footerIcon .weixin");
     wx.addEventListener("click", (e) => {

src/pages/intoZz/App.js

@@ -34,7 +34,11 @@ export default class App {
                 // item.load();
             }
         });
-        this.four();
+        let _this=this;
+        $(document).ready(function() {
+            _this.four();
+        });
+        
     }
     four() {
         let isMob = this.isMobile;
@@ -67,32 +71,38 @@ export default class App {
                         if (index > 0) {
                             fourRsons[index - 1].style.clipPath = 'inset(0px 0px 100%)';
                         }
+                        fourRsons[index + 1].style.clipPath = 'inset(0px 0px 0%)';
                     }
                     if (index < fourSons.length) fourSons[index + 1].style.opacity = 0.3 + (val > 0.7 ? 0.7 : val);
                 }
             })
         }
 
-
+        //锚点跳转
+        let jumpM='';
+        if(window.location.href.indexOf("intoZz.html?") !== -1){
+            let ss=window.location.href.indexOf('=');
+            let afterHash = window.location.href.substring(ss + 1);
+            console.log(afterHash,88);
+            jumpM="#"+afterHash;
+            $(window).scrollTop(10);
+            // $("#"+afterHash).offset().top
+        }
         // 获取元素的滚动条高度
         let scrollHeight = fourCon.scrollHeight;
         let conStart = 0;
         let conEnd = 0;
         function updateScrollChange1() {
+            
             try {
-                let hh = fourCon.getBoundingClientRect();
-                let scrollTop = hh.top;
-                let scrollBottom = hh.bottom;
                 let scrollY = window.scrollY;
-
-
-                if (scrollTop < 0 & conStart == 0) {
-                    conStart = scrollY;
-                    conEnd = scrollY + scrollHeight;
+                if(conStart==0){
+                    conStart = $(".fourCon").offset().top;
+                    conEnd = conStart+$(".fourCon").height();
                     let startH = 0;
                     sonArr.forEach((item, index) => {
-                        let childH = scrollY + startH + item[0];
-                        let childHs = scrollY + startH;
+                        let childH = conStart + startH + item[0];
+                        let childHs = conStart + startH;
                         if(index==0){
                             startH += item[0]-80;
                         }else{
@@ -101,10 +111,18 @@ export default class App {
                         item.push(childH)
                         item.push(childHs)
                     });
-                } else if (scrollTop < 0 && scrollY > conStart && scrollY < conEnd) {
-
-
-
+                    if(jumpM!=''){
+                        let jj=$(jumpM).offset().top;
+                        $('html, body').animate({
+                            scrollTop: jj
+                        }, 'slow',function(){
+                            // new WOW().init();
+                        });
+                    }
+                    console.log(scrollY, 'scrollY',conStart,conEnd)
+                    
+                }
+                if (scrollY > conStart && scrollY < conEnd) {
                     sonArr.forEach((item, index) => {
                         let chazhi = item[2] - scrollY;
                         if (chazhi > 0 && scrollY < item[2] && scrollY > item[3]) {
@@ -118,13 +136,25 @@ export default class App {
                         }
                     });
                 }
-            } catch (error) { }
+            } catch (error) {
+                console.log(error);
+                
+             }
         }
 
 
         // 添加滚动事件监听器
         if(!isMob){
             window.addEventListener('scroll', updateScrollChange1);
+        }else{
+            
+            if(jumpM!=''){
+                new WOW().init();
+                let jj=$(jumpM).offset().top;
+                $('html, body').animate({
+                    scrollTop: jj
+                }, 'slow');
+            }
         }
         
         //弹框资质荣誉

src/pages/intoZz/index.html

@@ -19,8 +19,8 @@
     <%= require('../common/tpl/header.tpl') %>
     
     <div class="main">
-      <div class="intoCon">
-        <div class="intoTop" id="jtjj">
+      <div class="intoCon" id="jtjj">
+        <div class="intoTop">
           <div class="wow fadeInUp title">集团简介</div>
           <div class="wow fadeInUp">
             <div class="text">中泽控股集团股份有限公司（简称中泽集团）是以投资并购和企业运营为核心业务的大型民营集团，创建于1995年，总部位于北京。</div>