From 64356b25e27037afb384442b6874dd9b46ea45ca Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 10 Jan 2022 11:30:40 +0800 Subject: [PATCH 01/23] 11 --- .../views/mobile_first/ch-weather-forecast.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/application/views/mobile_first/ch-weather-forecast.php b/application/views/mobile_first/ch-weather-forecast.php index f186f18f..33c79407 100644 --- a/application/views/mobile_first/ch-weather-forecast.php +++ b/application/views/mobile_first/ch-weather-forecast.php @@ -8,7 +8,7 @@

...

...

...

-

...

Humidity: ...

@@ -21,7 +21,7 @@

...

...

-

...

Humidity: ...

@@ -34,7 +34,7 @@

...

...

-

...

Humidity: ...

@@ -47,7 +47,7 @@

...

...

-

...

Humidity: ...

@@ -60,7 +60,7 @@

...

...

-

...

Humidity: ...

@@ -73,7 +73,7 @@

...

...

-

...

Humidity: ...

From 3e401869feffa368f105033446e778160197f785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Tue, 11 Jan 2022 09:28:24 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E6=99=AF=E7=82=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/ctmobilefirst/models/api_model.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/application/third_party/ctmobilefirst/models/api_model.php b/application/third_party/ctmobilefirst/models/api_model.php index 9125fcaf..b97491ef 100644 --- a/application/third_party/ctmobilefirst/models/api_model.php +++ b/application/third_party/ctmobilefirst/models/api_model.php @@ -314,6 +314,10 @@ class Api_model extends CI_Model { order by sortby "; + + echo ("url:".$url."/%".",pid:".$new_pid."
"); + echo ("sql:".$sql); + die(); $qurey = $this->InfoCT->query($sql,array($url."/%",$new_pid)); return $qurey->result(); } From 8bb849e82dba2390f16410ed437fac9c8fcb1c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Tue, 11 Jan 2022 09:30:42 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E6=99=AF=E7=82=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/ctmobilefirst/models/api_model.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/application/third_party/ctmobilefirst/models/api_model.php b/application/third_party/ctmobilefirst/models/api_model.php index b97491ef..afe522ab 100644 --- a/application/third_party/ctmobilefirst/models/api_model.php +++ b/application/third_party/ctmobilefirst/models/api_model.php @@ -268,7 +268,7 @@ class Api_model extends CI_Model { inner join infoStructures on ic_id=is_ic_id where is_id = ? "; - $query = $this->HT->query ($sql ,array($new_pid)); + $query = $this->InfoCT->query ($sql ,array($new_pid)); if ($query->num_rows()>0){ $url = $query->row()->ic_url; @@ -314,10 +314,7 @@ class Api_model extends CI_Model { order by sortby "; - - echo ("url:".$url."/%".",pid:".$new_pid."
"); - echo ("sql:".$sql); - die(); + $qurey = $this->InfoCT->query($sql,array($url."/%",$new_pid)); return $qurey->result(); } From c189d340bd040a6bd9781b26679c0ee2db5c1fdf Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 13 Jan 2022 13:46:54 +0800 Subject: [PATCH 04/23] 11 --- application/views/mobile_first/ch-pc.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 250fcb2d..9eb3bed5 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -57,18 +57,18 @@ From 7c194f6ad0eb5443e84ec549d06bd866ab820273 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 13 Jan 2022 13:54:21 +0800 Subject: [PATCH 05/23] 11 --- application/views/mobile_first/ch-pc.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 9eb3bed5..d5b82e95 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -68,7 +68,7 @@
  • Family Tours
  • Yangtze River Cruise
  • Hiking Tours
  • -
  • Great Wall of China Tours
  • +
  • Great Wall of China Tours
  • @@ -89,7 +89,7 @@
  • Huangshan
  • Beijing
  • Xi'an
  • -
  • Shanghai
  • +
  • Shanghai
  • @@ -109,7 +109,7 @@ Guide
  • China Top Attractions
  • -
  • China Weather
  • +
  • China Weather
  • @@ -130,7 +130,7 @@
  • Chinese New Year
  • Kung Fu
  • -
  • Chinese Tea
  • +
  • Chinese Tea
  • @@ -143,7 +143,7 @@ Schedules
  • Train Travel
  • Flight
  • -
  • Train App Download
  • +
  • Train App Download
  • @@ -163,7 +163,7 @@
  • Yunnan
  • Great Wall Tours
  • Food Tours
  • -
  • Fun Activities
  • +
  • Fun Activities
  • From 3fb57a2581bc702484a69cb477ce3ea8d4ec9567 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 13 Jan 2022 15:08:35 +0800 Subject: [PATCH 06/23] 11 --- application/views/mobile_first/ch-pc.php | 97 +++++++++++------------- 1 file changed, 43 insertions(+), 54 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index d5b82e95..e9bbebde 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -53,85 +53,74 @@ height="83" alt="chinahighlights logo" class="chinahighlightslogo img-responsive">
      - - - -
    We are here to help you...
    start planning your tailor-made China tour with 1-1 help from our travel advisors. - Create Your Trip -
    +
    From 6cb530b90fb1ab3cdce694c8feb706104264a7bd Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 19 Jan 2022 11:45:55 +0800 Subject: [PATCH 20/23] 11 --- application/views/mobile_first/ch-pc.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index d4db20a3..04430027 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -208,7 +208,6 @@
    -

    Why Travel with China Highlights

    @@ -223,7 +222,6 @@ We are here to help you...
    start planning your tailor-made China tour with 1-1 help from our travel advisors. Create Your Trip
    -
    From 02ea6cec73a5c92293aeef0a665dcac3fe1c4653 Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 19 Jan 2022 11:53:42 +0800 Subject: [PATCH 21/23] 11 --- application/views/mobile_first/ch-pc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 04430027..9ae8482b 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -218,10 +218,10 @@
  • 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. -Create Your Trip -
    + We are here to help you...
    start planning your tailor-made China tour with 1-1 help from our travel advisors. + Create Your Trip +
    +
    From 2434c92f28b94280827b6cc9230446ab53d4f734 Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 19 Jan 2022 14:01:01 +0800 Subject: [PATCH 22/23] 11 --- application/views/mobile_first/ch-pc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 9ae8482b..686ad0a4 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -212,10 +212,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. From 10f19aa42a03937c7b6073111ef6f42157135f8f Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 19 Jan 2022 14:02:07 +0800 Subject: [PATCH 23/23] 11 --- application/views/mobile_first/ch-pc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 686ad0a4..7624e520 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -219,7 +219,7 @@
    We are here to help you...
    start planning your tailor-made China tour with 1-1 help from our travel advisors. - Create Your Trip + Create Your Trip