Merge branch 'master' of github.com:hainatravel/information-system into master

2 years ago · 71c8811ed7
parent 2293d8a3dd c895b4ece1
commit 71c8811ed7
4 changed files with 99 additions and 51 deletions
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@ -42,7 +42,7 @@
        })(window, document, 'script', 'dataLayer', 'GTM-T75N4LL');</script>
    <!-- End Google Tag Manager -->

-    <!-- Hotjar Tracking Code for https://www.chinahighlights.com/ 
+    <!-- Hotjar Tracking Code for https://www.chinahighlights.com/
    <script>
    (function(h,o,t,j,a,r){
        h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
@ -93,7 +93,7 @@
                                                                id="china_yangtze_cruise_2021">Yangtze River Cruise</a></li>
                                <li class="start-nav-item"><a href="/tour/expats-tours.htm"
                                        id="china_expats_tours_2021">China Expats Tours</a></li>
-                                
+
                            </ul>
                        </div>
                    </li>
@ -602,20 +602,32 @@
    </div>

    <script>
-        (function (w, d, i) {
-            var navbar = d.getElementById(i);
-            var prevScrollpos = w.pageYOffset;
-            w.onscroll = function () {
-                var currentScrollPos = w.pageYOffset;
-                if (prevScrollpos > currentScrollPos) {
-                    navbar.style.top = '0';
-                } else {
-                    navbar.style.top = '-100px';
-                }
-                prevScrollpos = currentScrollPos;
-            }
-        })(window, document, 'header');
-    </script>
+    (function (w, d, i) {
+      function debounce(func, wait) {
+        let timeout;
+        return function() {
+          const context = this;
+          const args = arguments;
+          clearTimeout(timeout);
+          timeout = setTimeout(() => func.apply(context, args), wait);
+        };
+      }
+
+      var navbar = d.getElementById(i);
+      var prevScrollpos = w.pageYOffset;
+      w.onscroll = debounce(function () {
+        var currentScrollPos = w.pageYOffset;
+        if (Math.abs(currentScrollPos - prevScrollpos) > 5) { // 滚动阈值
+          if (prevScrollpos > currentScrollPos) {
+            navbar.style.top = '0';
+          } else {
+            navbar.style.top = '-100px';
+          }
+          prevScrollpos = currentScrollPos;
+        }
+      }, 25) // 防止快速滚动时频繁触发
+    })(window, document, 'header');
+  </script>

    <!--@PRODUCT-JS@-->
    <!--@ADDON-JS@-->
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@ -34,7 +34,7 @@
    })(window, document, 'script', 'dataLayer', 'GTM-T75N4LL');</script>
  <!-- End Google Tag Manager -->

-  <!-- Hotjar Tracking Code for https://www.chinahighlights.com/ 
+  <!-- Hotjar Tracking Code for https://www.chinahighlights.com/
  <script>
    (function(h,o,t,j,a,r){
        h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
@ -593,17 +593,29 @@

  <script>
    (function (w, d, i) {
+      function debounce(func, wait) {
+        let timeout;
+        return function() {
+          const context = this;
+          const args = arguments;
+          clearTimeout(timeout);
+          timeout = setTimeout(() => func.apply(context, args), wait);
+        };
+      }
+
      var navbar = d.getElementById(i);
      var prevScrollpos = w.pageYOffset;
-      w.onscroll = function () {
+      w.onscroll = debounce(function () {
        var currentScrollPos = w.pageYOffset;
-        if (prevScrollpos > currentScrollPos) {
-          navbar.style.top = '0';
-        } else {
-          navbar.style.top = '-100px';
+        if (Math.abs(currentScrollPos - prevScrollpos) > 5) { // 滚动阈值
+          if (prevScrollpos > currentScrollPos) {
+            navbar.style.top = '0';
+          } else {
+            navbar.style.top = '-100px';
+          }
+          prevScrollpos = currentScrollPos;
        }
-        prevScrollpos = currentScrollPos;
-      }
+      }, 25) // 防止快速滚动时频繁触发
    })(window, document, 'header');
  </script>
  <script>/* memu js https://data.chinahighlights.com/js/mobile-menu.js */
@ -673,8 +685,8 @@
    },
    "geo": {
      "@type": "GeoCoordinates",
-      "latitude": 25.241375,   
-      "longitude": 110.33852  
+      "latitude": 25.241375,
+      "longitude": 110.33852
    },
    "url": "https://www.chinahighlights.com/",
    "telephone": "+86 773 2831999",
--- a/application/views/mobile_first/gh-pc.php
+++ b/application/views/mobile_first/gh-pc.php
@ -215,11 +215,11 @@
            </aside>
            <div class="info_tm_button"><a href="/forms/tailormade?product_code=" id="create_my_trip_button_pc">Create
                    my trip</a>
-            </div>  
+            </div>
        </div>
        <!--PC正文 结束--><!--@ARTICLENEXT@-->
    </div>
-    
+
    <!--PC底部-->

    <div class="infotailor">
@ -277,7 +277,7 @@
                                            height="100"></div>
                                    <h3>Ensure Your Satisfactory</h3>
                                    <ul class="infolist">
-                                        <li>The Top 20% nationwide guides at your service.</li> 
+                                        <li>The Top 20% nationwide guides at your service.</li>
                                        <li>20% more space on your group's transportation.</li>
                                        <li> 24/7 emergency support.</li>
                                    </ul>
@ -420,20 +420,32 @@
    </div>

    <script>
-        (function (w, d, i) {
-            var navbar = d.getElementById(i);
-            var prevScrollpos = w.pageYOffset;
-            w.onscroll = function () {
-                var currentScrollPos = w.pageYOffset;
-                if (prevScrollpos > currentScrollPos) {
-                    navbar.style.top = '0';
-                } else {
-                    navbar.style.top = '-100px';
-                }
-                prevScrollpos = currentScrollPos;
-            }
-        })(window, document, 'header');
-    </script>
+    (function (w, d, i) {
+      function debounce(func, wait) {
+        let timeout;
+        return function() {
+          const context = this;
+          const args = arguments;
+          clearTimeout(timeout);
+          timeout = setTimeout(() => func.apply(context, args), wait);
+        };
+      }
+
+      var navbar = d.getElementById(i);
+      var prevScrollpos = w.pageYOffset;
+      w.onscroll = debounce(function () {
+        var currentScrollPos = w.pageYOffset;
+        if (Math.abs(currentScrollPos - prevScrollpos) > 5) { // 滚动阈值
+          if (prevScrollpos > currentScrollPos) {
+            navbar.style.top = '0';
+          } else {
+            navbar.style.top = '-100px';
+          }
+          prevScrollpos = currentScrollPos;
+        }
+      }, 25) // 防止快速滚动时频繁触发
+    })(window, document, 'header');
+  </script>

    <!--PC底部 结束-->

--- a/application/views/mobile_first/gh.php
+++ b/application/views/mobile_first/gh.php
@ -448,19 +448,31 @@
    }
  </script>

-  <script>
+<script>
    (function (w, d, i) {
+      function debounce(func, wait) {
+        let timeout;
+        return function() {
+          const context = this;
+          const args = arguments;
+          clearTimeout(timeout);
+          timeout = setTimeout(() => func.apply(context, args), wait);
+        };
+      }
+
      var navbar = d.getElementById(i);
      var prevScrollpos = w.pageYOffset;
-      w.onscroll = function () {
+      w.onscroll = debounce(function () {
        var currentScrollPos = w.pageYOffset;
-        if (prevScrollpos > currentScrollPos) {
-          navbar.style.top = '0';
-        } else {
-          navbar.style.top = '-100px';
+        if (Math.abs(currentScrollPos - prevScrollpos) > 5) { // 滚动阈值
+          if (prevScrollpos > currentScrollPos) {
+            navbar.style.top = '0';
+          } else {
+            navbar.style.top = '-100px';
+          }
+          prevScrollpos = currentScrollPos;
        }
-        prevScrollpos = currentScrollPos;
-      }
+      }, 25) // 防止快速滚动时频繁触发
    })(window, document, 'header');
  </script>
  <!--移动底部 结束-->