From 58604e364afcf72b05a1a91cb9276ea7987e6739 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Thu, 8 Jun 2023 16:23:14 +0800 Subject: [PATCH 01/43] add gm hw meta --- .../views/bootstrap3/information_edit.php | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 23aebf64..f7c809ca 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1718,6 +1718,29 @@ $meta_subnavi_arr = array( + config->item('site_code') == 'gm') {?> +
+ + +
+ + ic_ht_area_type == 'g') {?>
From 35b0a20423a169572b93c2118519b397743f5a7d Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Thu, 8 Jun 2023 16:45:56 +0800 Subject: [PATCH 02/43] =?UTF-8?q?=E6=8C=8912=E4=B8=AA=E6=AF=8F=E7=BB=84?= =?UTF-8?q?=E5=88=92=E5=88=86=E6=8E=A8=E8=8D=90=E5=B9=BF=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/application/controllers/information.php b/application/controllers/information.php index a9231e06..435bf8ef 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -994,7 +994,14 @@ class Information extends CI_Controller $tipsRightList[] = $recommand_information[$key]; } } + + $firstList = array_slice($tipsRightList, 0, 12); + $secondList = array_slice($tipsRightList, 12, 12); + $thirdList = array_slice($tipsRightList, 24, 12); var_dump($tipsRightList); + var_dump($firstList); + var_dump($secondList); + var_dump($thirdList); } public function test_feedback() From a0106af21b7b40db60afedd1a8b050f06bc08d57 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 9 Jun 2023 09:51:22 +0800 Subject: [PATCH 03/43] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AAconta?= =?UTF-8?q?ct=20us=E6=8C=89=E9=92=AE=E5=92=8C=E5=B7=A6=E4=B8=8B=E8=A7=92TM?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BA=92=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 4 ++-- application/views/mobile_first/ch.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index ff3007e0..91eecb7b 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -209,7 +209,7 @@
  • - Create my trip + Contact us
  • @@ -240,7 +240,7 @@ -
    Contact us
    +
    Create my trip
    diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index a72d51ec..c10172fd 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -46,7 +46,7 @@
    - Create My Trip + Contact Us
    @@ -274,7 +274,7 @@ -
    Contact Us +
    Create My Trip
    From 32a20ef4153cdce786f948b489a248362911bae9 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 9 Jun 2023 09:58:43 +0800 Subject: [PATCH 04/43] 11 --- application/views/mobile_first/ch.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index c10172fd..53df6124 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -46,7 +46,7 @@
    - Contact Us + Contact Us
    @@ -274,7 +274,7 @@ -
    Create My Trip +
    From 5d1d5908cf947deb9809bf60ec721e653eb07c42 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Fri, 9 Jun 2023 10:59:43 +0800 Subject: [PATCH 05/43] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=B9=BF=E5=91=8A=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 12 +++++++++- .../views/mobile_first/ah-list-tips-right.php | 24 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 application/views/mobile_first/ah-list-tips-right.php diff --git a/application/controllers/information.php b/application/controllers/information.php index 435bf8ef..33281573 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -988,7 +988,7 @@ class Information extends CI_Controller $information = $this->Information_model->Detail($this->input->get('is_id')); $recommand_information = $this->recommand_information($information); $tipsRightList = []; - for ($i=0; $i < 36; $i++) { + for ($i=1; $i <= 36; $i++) { $key = 'List Tips Right '.$i; if (array_key_exists($key, $recommand_information)) { $tipsRightList[] = $recommand_information[$key]; @@ -1002,6 +1002,16 @@ class Information extends CI_Controller var_dump($firstList); var_dump($secondList); var_dump($thirdList); + + $tips_right_list_content = $this->load->view( + 'ah-list-tips-right', + array( + 'tips_right_first' => $firstList, + 'tips_right_second' => $secondList, + 'tips_right_third' => $thirdList), + true + ); + echo $tips_right_list_content; } public function test_feedback() diff --git a/application/views/mobile_first/ah-list-tips-right.php b/application/views/mobile_first/ah-list-tips-right.php new file mode 100644 index 00000000..45fb2901 --- /dev/null +++ b/application/views/mobile_first/ah-list-tips-right.php @@ -0,0 +1,24 @@ +
    Choose best time to visit
    +
    + +
    +
    Popular Asia tours
    +
    + +
    +
    Make the most of Your Time
    +
    + +
    \ No newline at end of file From 98e72fb483b537b54745d8c98b6be59065784123 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Fri, 9 Jun 2023 11:01:21 +0800 Subject: [PATCH 06/43] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 33281573..f4e9c065 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1004,7 +1004,7 @@ class Information extends CI_Controller var_dump($thirdList); $tips_right_list_content = $this->load->view( - 'ah-list-tips-right', + 'mobile_first/ah-list-tips-right', array( 'tips_right_first' => $firstList, 'tips_right_second' => $secondList, From 378fa4364a73875cb44f45387452ef99b7ae11d4 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 9 Jun 2023 11:02:10 +0800 Subject: [PATCH 07/43] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=8A=A0GH=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 20 ++++++++++++++++++++ application/views/mobile_first/ch.php | 16 +++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 91eecb7b..de5bbf0c 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -390,6 +390,25 @@ + +
    + + + +
    +
    @@ -471,6 +490,7 @@
    • Asia
    • +
    • Global
    • Deutsch
    • Français
    • Español
    • diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 53df6124..793f6741 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -336,7 +336,7 @@
    -
    +
    @@ -400,6 +400,20 @@
    +
    + + + +
    From b4a346c5d173f783145bb5734881b8055228d02a Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Fri, 9 Jun 2023 11:04:35 +0800 Subject: [PATCH 08/43] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-list-tips-right.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/mobile_first/ah-list-tips-right.php b/application/views/mobile_first/ah-list-tips-right.php index 45fb2901..e23391ec 100644 --- a/application/views/mobile_first/ah-list-tips-right.php +++ b/application/views/mobile_first/ah-list-tips-right.php @@ -2,7 +2,7 @@
    @@ -10,7 +10,7 @@
    @@ -18,7 +18,7 @@
    \ No newline at end of file From 44b504ae0198aef3b97f0b99e92c99e3a71f7ff2 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 9 Jun 2023 11:09:39 +0800 Subject: [PATCH 09/43] 11 --- application/views/mobile_first/ch-pc.php | 313 +++++++++++++---------- application/views/mobile_first/ch.php | 1 - 2 files changed, 176 insertions(+), 138 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index de5bbf0c..e196f298 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -88,21 +88,34 @@ id="china_destinations_2021">Destinations @@ -124,20 +137,27 @@
  • China Weather
  • -
  • 3 Weeks in China
  • -
  • 17 Days in China
  • -
  • 2 Weeks in China
  • -
  • 12 Days in China
  • -
  • 10 Days in China
  • -
  • 8 Days in China
  • -
  • 5 Days in China
  • +
  • 3 Weeks in + China
  • +
  • 17 Days in + China
  • +
  • 2 Weeks in + China
  • +
  • 12 Days in + China
  • +
  • 10 Days in + China
  • +
  • 8 Days in + China
  • +
  • 5 Days in + China
  • @@ -171,7 +191,8 @@ Schedules
  • Train Travel
  • Flight
  • -
  • Train App +
  • Train App Download
  • @@ -179,13 +200,23 @@ - +
  • - Contact us -
  • - + Contact us + +
    - +
    -
    + - - + +
    -
    Top 10 China tours 2023/2024 for first visits and returns: embark on a lifetime experience. Learn +
    @@ -240,7 +274,8 @@ - +
    @@ -258,7 +293,8 @@ We are here to help you...
    start planning your tailor-made tour with 1-1 help from our travel advisors. - Create Your Trip + Create Your Trip
    @@ -312,105 +348,108 @@
    -
    -
    + - + + +
    + + + +
    -
    - - -
    - -
    -
    diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 793f6741..bd53980f 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -339,7 +339,6 @@
    - +
    diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index bd53980f..991aa8b1 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -414,8 +414,8 @@
    -
    +
    China Highlights Logo
    China Highlights tailor-makes China tours to help travelers discover China From 7cd965fc645ea8d0b33e5f62ad7865fe7e68cead Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 9 Jun 2023 11:21:24 +0800 Subject: [PATCH 11/43] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0GH=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-pc.php | 26 ++++++++++++++++++++++++ application/views/mobile_first/ah.php | 16 +++++++++++++++ application/views/mobile_first/ch.php | 2 ++ 3 files changed, 44 insertions(+) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index fddd3712..bf01d096 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -398,6 +398,32 @@
    +
    + + + + +
    diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index e8a64bf1..1998a40a 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -317,6 +317,22 @@ +
    + + + +
    diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 991aa8b1..f27629a8 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -410,6 +410,8 @@ From b249a3fc3d3eb688c43314b5929999136c1bc97f Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 9 Jun 2023 11:56:54 +0800 Subject: [PATCH 12/43] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-pc.php | 13 ++++++++----- application/views/mobile_first/ah.php | 19 ++++++++++++++++--- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index bf01d096..988653c1 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -71,6 +71,7 @@ @@ -190,10 +191,12 @@ @@ -219,6 +222,7 @@ - + + + + diff --git a/application/views/mobile_first/ah-list-tips-right.php b/application/views/mobile_first/ah-tips-right-list.php similarity index 100% rename from application/views/mobile_first/ah-list-tips-right.php rename to application/views/mobile_first/ah-tips-right-list.php From e8c66314b1f34ee0dc0940171c4036e489d14b0f Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Mon, 12 Jun 2023 10:00:25 +0800 Subject: [PATCH 16/43] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 6ec879a5..0616d217 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1004,7 +1004,7 @@ class Information extends CI_Controller var_dump($thirdList); $tips_right_list_content = $this->load->view( - 'mobile_first/ah-list-tips-right', + 'mobile_first/ah-tips-right-list', array( 'tips_right_first' => $firstList, 'tips_right_second' => $secondList, From fb323556f51cca8495948993be52bc615e8edeae Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Mon, 12 Jun 2023 10:06:14 +0800 Subject: [PATCH 17/43] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=B9=BF=E5=91=8A=E6=97=B6=E4=B8=8D=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 0616d217..d0301f55 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1518,16 +1518,18 @@ class Information extends CI_Controller } } - $tips_right_list_content = $this->load->view( - 'mobile_first/ah-tips-right-list', - array( - 'tips_right_first' => array_slice($tipsRightList, 0, 12), - 'tips_right_second' => array_slice($tipsRightList, 12, 12), - 'tips_right_third' => array_slice($tipsRightList, 24, 12)), - true - ); - - $template = str_replace('', $tips_right_list_content, $template); + if (!empty($tipsRightList)) { + $tips_right_list_content = $this->load->view( + 'mobile_first/ah-tips-right-list', + array( + 'tips_right_first' => array_slice($tipsRightList, 0, 12), + 'tips_right_second' => array_slice($tipsRightList, 12, 12), + 'tips_right_third' => array_slice($tipsRightList, 24, 12)), + true + ); + + $template = str_replace('', $tips_right_list_content, $template); + } //文中的信息推荐 if (strpos($information->ic_content, '') !== false) { From 188103ad52b42b14090e78f40a9d6ae63ea36d93 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Mon, 12 Jun 2023 10:13:45 +0800 Subject: [PATCH 18/43] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=B9=BF=E5=91=8A=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index d0301f55..2a613e05 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -990,7 +990,7 @@ class Information extends CI_Controller $tipsRightList = []; for ($i=1; $i <= 36; $i++) { $key = 'List Tips Right '.$i; - if (array_key_exists($key, $recommand_information)) { + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { $tipsRightList[] = $recommand_information[$key]; } } From 5bc6baeebf945b782207c8d020134b8b0c22cc99 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Mon, 12 Jun 2023 10:16:56 +0800 Subject: [PATCH 19/43] =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E4=B8=BA=E5=88=99=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 2a613e05..5c506f9c 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1513,7 +1513,7 @@ class Information extends CI_Controller $tipsRightList = []; for ($i=1; $i <= 36; $i++) { $key = 'List Tips Right '.$i; - if (array_key_exists($key, $recommand_information)) { + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { $tipsRightList[] = $recommand_information[$key]; } } From dc0a2b1f05b640a6424a425f92b8ecdb54076382 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 12 Jun 2023 14:25:27 +0800 Subject: [PATCH 20/43] =?UTF-8?q?=E6=A0=87=E9=A2=98=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-tips-right-list.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/mobile_first/ah-tips-right-list.php b/application/views/mobile_first/ah-tips-right-list.php index e23391ec..b2eae25f 100644 --- a/application/views/mobile_first/ah-tips-right-list.php +++ b/application/views/mobile_first/ah-tips-right-list.php @@ -1,4 +1,4 @@ -
    Choose best time to visit
    +
    Popular tours
      $info) {?> @@ -6,7 +6,7 @@
    -
    Popular Asia tours
    +
    Make the most of your time
      $info) {?> @@ -14,7 +14,7 @@
    -
    Make the most of Your Time
    +
    Choose best time to visit
      $info) {?> From 61c4650c07670e52d2213f98da936c5d29d56d87 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 12 Jun 2023 14:30:57 +0800 Subject: [PATCH 21/43] 11 --- application/views/mobile_first/ah-tips-right-list.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/views/mobile_first/ah-tips-right-list.php b/application/views/mobile_first/ah-tips-right-list.php index b2eae25f..7bd7c4fc 100644 --- a/application/views/mobile_first/ah-tips-right-list.php +++ b/application/views/mobile_first/ah-tips-right-list.php @@ -1,3 +1,4 @@ +
      Popular tours
      +
      \ No newline at end of file From 29bb030ff0c2c4cadf00ba0234012a15b59839f2 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Mon, 12 Jun 2023 15:21:22 +0800 Subject: [PATCH 22/43] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 5c506f9c..6485d026 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -990,7 +990,8 @@ class Information extends CI_Controller $tipsRightList = []; for ($i=1; $i <= 36; $i++) { $key = 'List Tips Right '.$i; - if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + if (array_key_exists($key, $recommand_information)) { + echo 'Rule: '.$recommand_information[$key]; $tipsRightList[] = $recommand_information[$key]; } } From 3ae6cdcc0723efe60aa83d110e87959c6e5e0ac9 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Mon, 12 Jun 2023 15:23:50 +0800 Subject: [PATCH 23/43] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 6485d026..ab86f2be 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -991,7 +991,7 @@ class Information extends CI_Controller for ($i=1; $i <= 36; $i++) { $key = 'List Tips Right '.$i; if (array_key_exists($key, $recommand_information)) { - echo 'Rule: '.$recommand_information[$key]; + var_dump($recommand_information[$key]); $tipsRightList[] = $recommand_information[$key]; } } @@ -999,10 +999,7 @@ class Information extends CI_Controller $firstList = array_slice($tipsRightList, 0, 12); $secondList = array_slice($tipsRightList, 12, 12); $thirdList = array_slice($tipsRightList, 24, 12); - var_dump($tipsRightList); - var_dump($firstList); - var_dump($secondList); - var_dump($thirdList); + echo 'COUNT: '.COUNT($tipsRightList); $tips_right_list_content = $this->load->view( 'mobile_first/ah-tips-right-list', From 7799241196bae790d12b6b4aba3be2d9a8d4fdf9 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Mon, 12 Jun 2023 15:31:43 +0800 Subject: [PATCH 24/43] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=8E=A8=E8=8D=90=E4=BF=A1=E6=81=AF=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index ab86f2be..7ae7c04d 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -990,7 +990,9 @@ class Information extends CI_Controller $tipsRightList = []; for ($i=1; $i <= 36; $i++) { $key = 'List Tips Right '.$i; - if (array_key_exists($key, $recommand_information)) { + if (array_key_exists($key, $recommand_information) && + $recommand_information[$key] != 'rule_no_show' && + $recommand_information[$key] != false) { var_dump($recommand_information[$key]); $tipsRightList[] = $recommand_information[$key]; } From 3ceeeefeaaaa3b267ad497d6dd990fb6505dab82 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Mon, 12 Jun 2023 15:35:22 +0800 Subject: [PATCH 25/43] =?UTF-8?q?=E6=8E=92=E9=99=A4=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=8E=A8=E8=8D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 7ae7c04d..816419ad 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -990,9 +990,8 @@ class Information extends CI_Controller $tipsRightList = []; for ($i=1; $i <= 36; $i++) { $key = 'List Tips Right '.$i; - if (array_key_exists($key, $recommand_information) && - $recommand_information[$key] != 'rule_no_show' && - $recommand_information[$key] != false) { + if (array_key_exists($key, $recommand_information) && + $recommand_information[$key] != false) { var_dump($recommand_information[$key]); $tipsRightList[] = $recommand_information[$key]; } From cebc4de0d26bbf32c1ab6c2ef100522dc43e222b Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Mon, 12 Jun 2023 15:50:32 +0800 Subject: [PATCH 26/43] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 816419ad..969479ee 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -990,9 +990,7 @@ class Information extends CI_Controller $tipsRightList = []; for ($i=1; $i <= 36; $i++) { $key = 'List Tips Right '.$i; - if (array_key_exists($key, $recommand_information) && - $recommand_information[$key] != false) { - var_dump($recommand_information[$key]); + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { $tipsRightList[] = $recommand_information[$key]; } } @@ -1001,6 +999,9 @@ class Information extends CI_Controller $secondList = array_slice($tipsRightList, 12, 12); $thirdList = array_slice($tipsRightList, 24, 12); echo 'COUNT: '.COUNT($tipsRightList); + echo '1 COUNT: '.COUNT($firstList); + echo '2 COUNT: '.COUNT($secondList); + echo '3 COUNT: '.COUNT($thirdList); $tips_right_list_content = $this->load->view( 'mobile_first/ah-tips-right-list', From bb603ed36e4f9b21b45edc1db02f6646e9b4f396 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Mon, 12 Jun 2023 15:54:09 +0800 Subject: [PATCH 27/43] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 969479ee..2f62c692 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -999,9 +999,9 @@ class Information extends CI_Controller $secondList = array_slice($tipsRightList, 12, 12); $thirdList = array_slice($tipsRightList, 24, 12); echo 'COUNT: '.COUNT($tipsRightList); - echo '1 COUNT: '.COUNT($firstList); - echo '2 COUNT: '.COUNT($secondList); - echo '3 COUNT: '.COUNT($thirdList); + echo '; 1 COUNT: '.COUNT($firstList); + echo '; 2 COUNT: '.COUNT($secondList); + echo '; 3 COUNT: '.COUNT($thirdList); $tips_right_list_content = $this->load->view( 'mobile_first/ah-tips-right-list', From 89ecc32523a021d8265de6eec1d9121d8f4b474b Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 12 Jun 2023 17:03:44 +0800 Subject: [PATCH 28/43] =?UTF-8?q?=E5=BA=95=E9=83=A8=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=9C=B0404=E9=94=99=E8=AF=AF=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/gh-pc.php | 2 +- application/views/mobile_first/gh.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 20bc771f..96236f98 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -728,7 +728,7 @@ diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index d72c8a89..cdb1c137 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -587,7 +587,7 @@ aria-label="festival">
    • Peru
    • China Tours
    • Vietnam Tours
    • -
    • Myanmar Tours
    • +
    • Myanmar Tours
    From ac7c2375d3b48aeca2aeff4111a692377c922f04 Mon Sep 17 00:00:00 2001 From: YCC Date: Tue, 13 Jun 2023 09:54:40 +0800 Subject: [PATCH 29/43] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/recommend/views/bind.php | 50 ++++++++++++++++--- 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/application/third_party/recommend/views/bind.php b/application/third_party/recommend/views/bind.php index e572dfa4..389f82e7 100644 --- a/application/third_party/recommend/views/bind.php +++ b/application/third_party/recommend/views/bind.php @@ -348,22 +348,58 @@
    -
    右侧列表广告
    +
    右侧列表广告 A
    +
    + + +
    +
    右侧列表广告 B
    + +
    + + +
    +
    右侧列表广告 C
    +
    From d139cec52e3abdd1b4b79725afa455485153c493 Mon Sep 17 00:00:00 2001 From: YCC Date: Tue, 13 Jun 2023 09:56:37 +0800 Subject: [PATCH 30/43] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=86=E7=BB=84?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/recommend/views/bind.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/third_party/recommend/views/bind.php b/application/third_party/recommend/views/bind.php index 389f82e7..44abdcde 100644 --- a/application/third_party/recommend/views/bind.php +++ b/application/third_party/recommend/views/bind.php @@ -357,7 +357,7 @@ href="javascript:void(0);" onclick="show_bind_info(is_id; ?>,'List Tips Right A_')" > - List Tips Right ir_rule; ?> + List Tips Right A_ ir_rule; ?> @@ -376,7 +376,7 @@ href="javascript:void(0);" onclick="show_bind_info(is_id; ?>,'List Tips Right B_')" > - List Tips Right ir_rule; ?> + List Tips Right B_ ir_rule; ?> @@ -395,7 +395,7 @@ href="javascript:void(0);" onclick="show_bind_info(is_id; ?>,'List Tips Right C_')" > - List Tips Right ir_rule; ?> + List Tips Right C_ ir_rule; ?> From e33eb2bc94da05b640e804df8f92011f859ace8e Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Tue, 13 Jun 2023 10:10:57 +0800 Subject: [PATCH 31/43] =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/information.php b/application/controllers/information.php index 2f62c692..ce8fcca1 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -987,6 +987,7 @@ class Information extends CI_Controller { $information = $this->Information_model->Detail($this->input->get('is_id')); $recommand_information = $this->recommand_information($information); + var_dump($recommand_information); $tipsRightList = []; for ($i=1; $i <= 36; $i++) { $key = 'List Tips Right '.$i; From c15317f1815719c2a1e52b21ec316f419c972eb1 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Tue, 13 Jun 2023 10:18:46 +0800 Subject: [PATCH 32/43] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=8E=A8=E8=8D=90=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 32 ++++++++++++++++--------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index ce8fcca1..5d6dec11 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -988,21 +988,31 @@ class Information extends CI_Controller $information = $this->Information_model->Detail($this->input->get('is_id')); $recommand_information = $this->recommand_information($information); var_dump($recommand_information); - $tipsRightList = []; - for ($i=1; $i <= 36; $i++) { - $key = 'List Tips Right '.$i; + $tips_right_first = []; + $tips_right_second = []; + $tips_right_third = []; + for ($i=1; $i <= 12; $i++) { + $key = 'List Tips Right A_'.$i; if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { - $tipsRightList[] = $recommand_information[$key]; + $tips_right_first[] = $recommand_information[$key]; + } + } + for ($i=1; $i <= 12; $i++) { + $key = 'List Tips Right B_'.$i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_second[] = $recommand_information[$key]; + } + } + for ($i=1; $i <= 12; $i++) { + $key = 'List Tips Right C_'.$i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_third[] = $recommand_information[$key]; } } - $firstList = array_slice($tipsRightList, 0, 12); - $secondList = array_slice($tipsRightList, 12, 12); - $thirdList = array_slice($tipsRightList, 24, 12); - echo 'COUNT: '.COUNT($tipsRightList); - echo '; 1 COUNT: '.COUNT($firstList); - echo '; 2 COUNT: '.COUNT($secondList); - echo '; 3 COUNT: '.COUNT($thirdList); + echo 'List Tips Right A: '.COUNT($tips_right_first); + echo '; List Tips Right B: '.COUNT($tips_right_second); + echo '; List Tips Right C: '.COUNT($tips_right_third); $tips_right_list_content = $this->load->view( 'mobile_first/ah-tips-right-list', From a5f85155c1fbbe79d7f21b466739d5c3de9414b3 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Tue, 13 Jun 2023 10:22:33 +0800 Subject: [PATCH 33/43] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 24 +++++++++---------- .../views/mobile_first/ah-tips-right-list.php | 6 ++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 5d6dec11..caa3be4a 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -988,38 +988,38 @@ class Information extends CI_Controller $information = $this->Information_model->Detail($this->input->get('is_id')); $recommand_information = $this->recommand_information($information); var_dump($recommand_information); - $tips_right_first = []; - $tips_right_second = []; - $tips_right_third = []; + $tips_right_a = []; + $tips_right_b = []; + $tips_right_c = []; for ($i=1; $i <= 12; $i++) { $key = 'List Tips Right A_'.$i; if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { - $tips_right_first[] = $recommand_information[$key]; + $tips_right_a[] = $recommand_information[$key]; } } for ($i=1; $i <= 12; $i++) { $key = 'List Tips Right B_'.$i; if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { - $tips_right_second[] = $recommand_information[$key]; + $tips_right_b[] = $recommand_information[$key]; } } for ($i=1; $i <= 12; $i++) { $key = 'List Tips Right C_'.$i; if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { - $tips_right_third[] = $recommand_information[$key]; + $tips_right_c[] = $recommand_information[$key]; } } - echo 'List Tips Right A: '.COUNT($tips_right_first); - echo '; List Tips Right B: '.COUNT($tips_right_second); - echo '; List Tips Right C: '.COUNT($tips_right_third); + echo 'List Tips Right A: '.COUNT($tips_right_a); + echo '; List Tips Right B: '.COUNT($tips_right_b); + echo '; List Tips Right C: '.COUNT($tips_right_c); $tips_right_list_content = $this->load->view( 'mobile_first/ah-tips-right-list', array( - 'tips_right_first' => $firstList, - 'tips_right_second' => $secondList, - 'tips_right_third' => $thirdList), + 'tips_right_a' => $tips_right_a, + 'tips_right_b' => $tips_right_b, + 'tips_right_c' => $tips_right_c), true ); echo $tips_right_list_content; diff --git a/application/views/mobile_first/ah-tips-right-list.php b/application/views/mobile_first/ah-tips-right-list.php index 7bd7c4fc..56434149 100644 --- a/application/views/mobile_first/ah-tips-right-list.php +++ b/application/views/mobile_first/ah-tips-right-list.php @@ -2,7 +2,7 @@
    Popular tours
    @@ -10,7 +10,7 @@
    Make the most of your time
    @@ -18,7 +18,7 @@
    Choose best time to visit
    From 1c8fcdb727494771a255461c0487eec5edfb5a61 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Tue, 13 Jun 2023 10:31:13 +0800 Subject: [PATCH 34/43] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=88=97=E8=A1=A8=E6=8E=A8=E8=8D=90=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 44 ++++++++++++++++--------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index caa3be4a..b6a6dc99 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -987,7 +987,7 @@ class Information extends CI_Controller { $information = $this->Information_model->Detail($this->input->get('is_id')); $recommand_information = $this->recommand_information($information); - var_dump($recommand_information); + // var_dump($recommand_information); $tips_right_a = []; $tips_right_b = []; $tips_right_c = []; @@ -1521,26 +1521,38 @@ class Information extends CI_Controller $template = str_replace('', "
    " . $template_recommand['Tips Right']->it_content . "
    ", $template); } // 右侧列表广告 - $tipsRightList = []; - for ($i=1; $i <= 36; $i++) { - $key = 'List Tips Right '.$i; + $tips_right_a = []; + $tips_right_b = []; + $tips_right_c = []; + for ($i=1; $i <= 12; $i++) { + $key = 'List Tips Right A_'.$i; if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { - $tipsRightList[] = $recommand_information[$key]; + $tips_right_a[] = $recommand_information[$key]; + } + } + for ($i=1; $i <= 12; $i++) { + $key = 'List Tips Right B_'.$i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_b[] = $recommand_information[$key]; + } + } + for ($i=1; $i <= 12; $i++) { + $key = 'List Tips Right C_'.$i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_c[] = $recommand_information[$key]; } } - if (!empty($tipsRightList)) { - $tips_right_list_content = $this->load->view( - 'mobile_first/ah-tips-right-list', - array( - 'tips_right_first' => array_slice($tipsRightList, 0, 12), - 'tips_right_second' => array_slice($tipsRightList, 12, 12), - 'tips_right_third' => array_slice($tipsRightList, 24, 12)), - true - ); + $tips_right_list_content = $this->load->view( + 'mobile_first/ah-tips-right-list', + array( + 'tips_right_a' => $tips_right_a, + 'tips_right_b' => $tips_right_b, + 'tips_right_c' => $tips_right_c), + true + ); - $template = str_replace('', $tips_right_list_content, $template); - } + $template = str_replace('', $tips_right_list_content, $template); //文中的信息推荐 if (strpos($information->ic_content, '') !== false) { From 945ff8e72ac1aa9acd705df72db55432700bd349 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 13 Jun 2023 10:55:52 +0800 Subject: [PATCH 35/43] 11 --- application/views/mobile_first/ah-tips-right-list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/ah-tips-right-list.php b/application/views/mobile_first/ah-tips-right-list.php index 56434149..08dee9e2 100644 --- a/application/views/mobile_first/ah-tips-right-list.php +++ b/application/views/mobile_first/ah-tips-right-list.php @@ -15,7 +15,7 @@
    -
    Choose best time to visit
    +
    Choose the best time to visit