From 188bf8edfa1aaa0ecfe2880ff0b274a2a1a03a87 Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 26 Jan 2022 11:48:29 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-h1.php | 6 ++++++ application/views/mobile_first/ch-pc.php | 2 +- application/views/mobile_first/ch.php | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ch-h1.php b/application/views/mobile_first/ch-h1.php index c72e0ea9..823b9c03 100644 --- a/application/views/mobile_first/ch-h1.php +++ b/application/views/mobile_first/ch-h1.php @@ -1,6 +1,12 @@
+ +
+ <?php echo !empty($ic_title)?$ic_title:'H1 title Chinahighlights mobile first template'; ?> +
+
Home $item) {?> diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 13d6d158..dc1b3c85 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -187,7 +187,7 @@
- +
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 0c3bbdda..a5840424 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -198,7 +198,7 @@ - +
From 7d3944f4fe1dc73038215c9f3fa09f52916ec44d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Thu, 27 Jan 2022 13:50:47 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E6=97=A0=E5=BD=93=E5=89=8D=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E4=BB=B7=E6=A0=BC=E6=97=B6=EF=BC=8C=E5=BE=80=E5=89=8D?= =?UTF-8?q?=E6=89=BE=E4=BB=B7=E6=A0=BC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/ctmobilefirst/models/api_model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/third_party/ctmobilefirst/models/api_model.php b/application/third_party/ctmobilefirst/models/api_model.php index d7a59679..4e0c306b 100644 --- a/application/third_party/ctmobilefirst/models/api_model.php +++ b/application/third_party/ctmobilefirst/models/api_model.php @@ -70,6 +70,7 @@ class Api_model extends CI_Model { where (BIZ_PackageInfo.PAG_Code = ? ) AND (pag_dei_sn= ? ) and ? between PKP_PersonStart and PKP_PersonStop order by pkp_invaliddate desc,PKP_PriceGrade "; + $query = $this->HT->query($sql, $param); if ($query->num_rows() > 0) { return $query->row(); }else { From f9e86ade626991f60973c3b8503dfd75df9d58b2 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 10 Feb 2022 14:35:38 +0800 Subject: [PATCH 03/27] 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 dc1b3c85..fc33cef3 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -180,7 +180,7 @@
-
Chinese New Year is just around the corner! Happy Year of the Tiger! Learn more
+
Live updates on China travel restrictions for 2022. Learn more
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index a5840424..d6116127 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -43,7 +43,7 @@
-
Chinese New Year is just around the corner! Happy Year of the Tiger! Learn more
+
Live updates on China travel restrictions for 2022. Learn more
From 6134a588521803461a4497d44c28832f14b835c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Fri, 11 Feb 2022 10:27:25 +0800 Subject: [PATCH 05/27] fix --- application/views/mobile_first/ch-train-index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/ch-train-index.php b/application/views/mobile_first/ch-train-index.php index dcc6259c..d008376c 100644 --- a/application/views/mobile_first/ch-train-index.php +++ b/application/views/mobile_first/ch-train-index.php @@ -77,7 +77,7 @@
From cc06f8165fa43cb2eecb2d8279180c71faf743ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Fri, 11 Feb 2022 11:19:32 +0800 Subject: [PATCH 06/27] fix --- application/views/mobile_first/ch-train-index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/ch-train-index.php b/application/views/mobile_first/ch-train-index.php index d008376c..fd153286 100644 --- a/application/views/mobile_first/ch-train-index.php +++ b/application/views/mobile_first/ch-train-index.php @@ -77,7 +77,7 @@ From 1b34c0fbe7bf5b9b87f6c33ba1a52779656f9489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Fri, 11 Feb 2022 11:25:03 +0800 Subject: [PATCH 07/27] fix --- application/views/mobile_first/ch-train-index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/ch-train-index.php b/application/views/mobile_first/ch-train-index.php index fd153286..e3493b72 100644 --- a/application/views/mobile_first/ch-train-index.php +++ b/application/views/mobile_first/ch-train-index.php @@ -77,7 +77,7 @@ From cccdafe84494c2ceaf1623ba0239c7ce023384da Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 11 Feb 2022 15:14:51 +0800 Subject: [PATCH 08/27] 11 --- application/views/mobile_first/ah-pc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index e2a9a12b..58339034 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -137,7 +137,7 @@
  • About Us
    • -
  • Contact Us
    • +
  • Contact Us
  • Date: Fri, 11 Feb 2022 15:16:15 +0800 Subject: [PATCH 09/27] 11 --- application/views/mobile_first/ah-pc.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 58339034..15531da1 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -41,14 +41,12 @@ +
    Holi in India, the Festival of Colors, falls on March 18th, 2022. Know what it is and how to celebrate it.
    From 7bd271058193b1dca981de9db708ee8e746853eb Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 14 Feb 2022 14:22:07 +0800 Subject: [PATCH 11/27] 11 --- application/views/mobile_first/ah-pc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 7c62186c..b54f8fd4 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -156,7 +156,7 @@
    -
    Holi in India, the Festival of Colors, falls on March 18th, 2022. Know what it is and how to celebrate it.
    +
    Holi in India, the Festival of Colors, falls on March 18th, 2022. Know what it is and how to celebrate it.
    From e2d86954de8025a06daa301b97d24d796398f50e Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 14 Feb 2022 14:35:31 +0800 Subject: [PATCH 12/27] 11 --- application/views/mobile_first/ah.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index 6f654a03..766c7491 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -155,7 +155,7 @@ - +
    Holi in India, the Festival of Colors, falls on March 18th, 2022. Know what it is and how to celebrate it.
    From 824346469c3b2387b1c70dabd70915c8b875a623 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 14 Feb 2022 14:37:58 +0800 Subject: [PATCH 13/27] 11 --- application/views/mobile_first/ah.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index 766c7491..64e5c119 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -42,7 +42,7 @@ - +
    Holi in India, the Festival of Colors, falls on March 18th, 2022. Know what it is and how to celebrate it.
  • Trains @@ -136,10 +126,8 @@
  • Flight
  • Train App Download
    • - -
  • Asia Tours
  • Day Tours
    @@ -161,12 +149,8 @@
    -
    - Contact Us - -
    +
    Contact Us
    - @@ -176,9 +160,6 @@ src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png" width="25px">
    - - -
    @@ -188,8 +169,7 @@
    -
    - +
    @@ -199,7 +179,6 @@
    -
    @@ -213,10 +192,10 @@

    Why Travel with China Highlights

      -
    • Your wellbeing is our priority:1-to-1 travel expert, vaccinated guides, private rides
      • -
    • Your trip is perfectly planned:No crowds, exclusive exciting experiences +
    • Your wellbeing is our priority:1-to-1 travel expert, vaccinated guides, private rides
      • +
    • Your trip is perfectly planned:No crowds, exclusive exciting experiences
      • -
    • Your booking is risk-free: No cancellation fee, free changes
      • +
    • Your booking is risk-free: No cancellation fee, free changes
    We are here to help you...
    start planning your tailor-made China tour with 1-1 help from our travel advisors. @@ -224,11 +203,9 @@
    -
    -
    China Highlights tailor-makes China tours to help travelers discover China their way. We're a passionate team of one hundred avid travelers who love to share our knowledge of China with those looking for a more authentic travel experience, more - ...
    - - -
    - + ...
    Follow Us
    - -
    - -
    -
    Featured on
    - - - -
    - +
    @@ -325,29 +278,18 @@
    - +
    - - +