From 5a38c499676a0c239ff780af9b6328da4f7f60c8 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 19 Sep 2024 11:58:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=AA=92=E4=BD=93=E6=8E=A8=E8=8D=90=E5=9B=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 2 +- application/views/mobile_first/ch.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index ffe8ba0f..929d625b 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -583,7 +583,7 @@
Featured on
China Highlights was featured on these medias. diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 9532b280..d42b48af 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -579,9 +579,8 @@
Featured on China Higlights is recommended by this social medias. + originalsrc="https://images.chinahighlights.com/allpicture/2024/09/6f2ffdf0229843649e8df2b5efb17574_cut_600x181_241_1726747002.jpg" + alt="China Higlights is recommended by this social medias." class="img-responsive">
From c895b4ece1688c00bdd9b88daf6493eb20fc48e8 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Thu, 19 Sep 2024 14:14:50 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E8=AE=BE=E7=BD=AE=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E9=98=88=E5=80=BC=E5=92=8C=E9=98=B2=E6=8A=96=E5=A4=84=E7=90=86?= =?UTF-8?q?=20iPhone=20=E5=AF=BC=E8=88=AA=E5=81=B6=E5=B0=94=E4=BC=9A?= =?UTF-8?q?=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 44 ++++++++++++++--------- application/views/mobile_first/ch.php | 32 +++++++++++------ application/views/mobile_first/gh-pc.php | 46 +++++++++++++++--------- application/views/mobile_first/gh.php | 28 ++++++++++----- 4 files changed, 99 insertions(+), 51 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 929d625b..0b6281ee 100644 --- 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'); - diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index d42b48af..868396e6 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -34,7 +34,7 @@ })(window, document, 'script', 'dataLayer', 'GTM-T75N4LL'); -
- +
@@ -277,7 +277,7 @@ height="100">

Ensure Your Satisfactory

@@ -420,20 +420,32 @@ + (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'); + diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index f085b966..e543c4d0 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -448,19 +448,31 @@ } - From 2293d8a3ddcc66879b272bd9c771cd5b68f8cd37 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 19 Sep 2024 15:09:17 +0800 Subject: [PATCH 3/7] 11 --- application/views/mobile_first/ch-pc.php | 2 +- application/views/mobile_first/ch.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 929d625b..873f2e50 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -583,7 +583,7 @@
Featured on
China Highlights was featured on these medias. diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index d42b48af..b32b70dc 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -579,7 +579,7 @@
Featured on China Higlights is recommended by this social medias.
From 98247d3b90baabe4bebfb8b416ced62f1622a956 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 19 Sep 2024 15:09:58 +0800 Subject: [PATCH 4/7] 11 --- application/views/mobile_first/ch-pc.php | 1 - application/views/mobile_first/ch.php | 1 - 2 files changed, 2 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 384b0959..bf4d23b4 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -766,5 +766,4 @@ - \ No newline at end of file diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 3bac11da..2e92cc53 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -567,7 +567,6 @@
    -
  • Italiano
  • Русский
  • 日本語
    • From 26f1833ce152544286ac94ffef1cbdb4a279f5bf Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Thu, 19 Sep 2024 16:41:34 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat:=20heritage=20P=20=E7=A5=A8=E5=8D=96?= =?UTF-8?q?=E5=AE=8C=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-lantern-form.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index d3be68b7..da977b9e 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -436,6 +436,7 @@ var premium_khomloy_radio = document.getElementById("premium_khomloy"); var premium_heritage_radio = document.getElementById("premium_heritage"); + var vip_heritage_radio = document.getElementById("vip_heritage"); var khomloy_ticket_date_november15th = document.getElementById("khomloy_ticket_date_november15th"); var khomloy_ticket_date_november16th = document.getElementById("khomloy_ticket_date_november16th"); @@ -557,8 +558,10 @@ ticket_type_premium_heritage_div.style.display = 'none'; ticket_type_vip_heritage_div.style.display = 'none'; - premium_khomloy_radio.checked = true; - currentTicketPrice = parseInt(premium_khomloy_radio.getAttribute('data-price')); + premium_heritage_radio.disabled = true; + + vip_heritage_radio.checked = true; + currentTicketPrice = parseInt(vip_heritage_radio.getAttribute('data-price')); adultNumberValue = parseInt(adultNumberNode.value); calcTotalPrice(currentTicketPrice, adultNumberValue); } From 09f5db9d370cc69b9cd548e7822d882974391007 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Thu, 19 Sep 2024 16:45:06 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20heritage=20=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-lantern-form.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index da977b9e..5a89e344 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -584,8 +584,10 @@ ticket_type_premium_heritage_div.style.display = ''; ticket_type_vip_heritage_div.style.display = ''; - premium_heritage_radio.checked = true; - currentTicketPrice = parseInt(premium_heritage_radio.getAttribute('data-price')); + premium_heritage_radio.disabled = true; + + vip_heritage_radio.checked = true; + currentTicketPrice = parseInt(vip_heritage_radio.getAttribute('data-price')); adultNumberValue = parseInt(adultNumberNode.value); calcTotalPrice(currentTicketPrice, adultNumberValue); } From 2a1e4fb09351fedbc35b6352f8b3d9a544f31da7 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Thu, 19 Sep 2024 16:47:45 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20premium=5Fkhomloy=20=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-lantern-form.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index 5a89e344..91171fbd 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -558,10 +558,8 @@ ticket_type_premium_heritage_div.style.display = 'none'; ticket_type_vip_heritage_div.style.display = 'none'; - premium_heritage_radio.disabled = true; - - vip_heritage_radio.checked = true; - currentTicketPrice = parseInt(vip_heritage_radio.getAttribute('data-price')); + premium_khomloy_radio.checked = true; + currentTicketPrice = parseInt(premium_khomloy_radio.getAttribute('data-price')); adultNumberValue = parseInt(adultNumberNode.value); calcTotalPrice(currentTicketPrice, adultNumberValue); }