Merge remote-tracking branch 'origin/master'

application/views/mobile_first/ah-pc.php

@@ -367,8 +367,9 @@
     <!--PC底部-->
     <div class="infotailor">
 
-        <span class="infotailorword">We are here to help you...<br> Start planning your tailor-made tour with 1-1 help
+        <span class="infotailorword">
-            from our travel advisors.
+        <span class="bottomtailor">Start planning your tailor-made tour with 1-1 help
+            from our travel advisors.</span>
             <span class="infotailormade"><a href="/forms/tailormade?product_code=">Create My Trip</a></span>
 
         </span>
@@ -653,6 +654,21 @@
             }, 10000);
         }
     </script>
+  <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>
 
  <!--newsletter表单 JS-->
 <script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>

application/views/mobile_first/ah.php

@@ -352,7 +352,7 @@
   <!--移动底部-->
   <footer>
     <div class="infotailor">
-      <span class="infotailorword">We are here to help you...<br> Start planning your tailor-made tour with 1-1 help
+      <span class="infotailorword">Start planning your tailor-made tour with 1-1 help
         from our travel advisors.
         <span class="infotailormade"><a href="/forms/tailormade?product_code=">Create My Trip</a></span>
       </span>

application/views/mobile_first/ch-pc.php

@@ -351,7 +351,7 @@
         </div>
         <div class="infotailor">
 
-            <span class="infotailorword">We are here to help you...<br> start planning your tailor-made tour with 1-1
+            <span class="infotailorword">Start planning your tailor-made tour with 1-1
                 help from our travel advisors.
                 <span class="bottom_tourbutton"><a href="/tour/create-my-trip.htm?product_code="
                         id="bottom_tailormade_pc">Create Your Trip
@@ -707,7 +707,21 @@
             }, 10000);
         }
     </script>
-
+  <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>
 <!--newsletter表单 JS-->
 <script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
 <script>

application/views/mobile_first/ch.php

@@ -354,7 +354,7 @@
 
   <footer>
     <div class="infotailor">
-      <span class="infotailorword">We are here to help you...<br> start planning your tailor-made tour with 1-1 help
+      <span class="infotailorword">Start planning your tailor-made tour with 1-1 help
         from our travel advisors.
         <span class="tourbutton"><a href="/tour/create-my-trip.htm?product_code=">Create Your Trip</a></span>
       </span>

application/views/mobile_first/gh-pc.php

@@ -480,6 +480,21 @@
             }, 10000);
         }
     </script>
+  <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>
 
     <!--PC底部 结束-->