From 26098a350be53c2c478a2e56b95566c3c8bdc70c Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 26 Mar 2024 16:15:40 +0800 Subject: [PATCH 01/22] 11 --- application/views/mobile_first/ch-pc.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 19125d18..f08a586f 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -454,11 +454,6 @@
  • Japan, South Korea
  • India, Nepal, Bhutan, and Sri lanka
  • Central Asia
  • - - - -
    More China reviews
    diff --git a/application/views/mobile_first/ah-feedback-list.php b/application/views/mobile_first/ah-feedback-list.php index fc79fcb8..2b0f2bd7 100644 --- a/application/views/mobile_first/ah-feedback-list.php +++ b/application/views/mobile_first/ah-feedback-list.php @@ -25,7 +25,7 @@

    - More + More
    ,
    diff --git a/application/views/mobile_first/ah-feedback-newest-10.php b/application/views/mobile_first/ah-feedback-newest-10.php index 46e7df8a..b99aba1b 100644 --- a/application/views/mobile_first/ah-feedback-newest-10.php +++ b/application/views/mobile_first/ah-feedback-newest-10.php @@ -17,7 +17,7 @@

    - more + more
    ,
    diff --git a/application/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/ah-feedback-newest.php index 0507299c..90d8a87d 100644 --- a/application/views/mobile_first/ah-feedback-newest.php +++ b/application/views/mobile_first/ah-feedback-newest.php @@ -26,7 +26,7 @@

    - More + More
    ,
    diff --git a/application/views/mobile_first/ah-feedback-right.php b/application/views/mobile_first/ah-feedback-right.php index a826d769..de183463 100644 --- a/application/views/mobile_first/ah-feedback-right.php +++ b/application/views/mobile_first/ah-feedback-right.php @@ -14,7 +14,7 @@

    - More + More
    ,
    From 38d6e033e89377148d661fd05e6d113025063895 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 28 Mar 2024 16:40:57 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20rel=3D"nofollow"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile_first/ch-feedback-30-list.php | 2 +- .../mobile_first/ch-feedback-city-list.php | 26 +++++++++---------- .../views/mobile_first/ch-feedback-list.php | 2 +- .../views/mobile_first/ch-feedback-newest.php | 2 +- .../views/mobile_first/ch-feedback.php | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/application/views/mobile_first/ch-feedback-30-list.php b/application/views/mobile_first/ch-feedback-30-list.php index 2510cbf5..c473548a 100644 --- a/application/views/mobile_first/ch-feedback-30-list.php +++ b/application/views/mobile_first/ch-feedback-30-list.php @@ -18,7 +18,7 @@ padding-bottom: 0;">Discover real reviews of

    -
    More + More
    ,
    diff --git a/application/views/mobile_first/ch-feedback-city-list.php b/application/views/mobile_first/ch-feedback-city-list.php index 8b76a970..e3a457d4 100644 --- a/application/views/mobile_first/ch-feedback-city-list.php +++ b/application/views/mobile_first/ch-feedback-city-list.php @@ -8,7 +8,7 @@

    - More + More
    ,
    @@ -23,7 +23,7 @@

    - More + More
    ,
    @@ -38,7 +38,7 @@

    - More + More
    ,
    @@ -53,7 +53,7 @@

    - More + More
    ,
    @@ -68,7 +68,7 @@

    - More + More
    ,
    @@ -83,7 +83,7 @@

    - More + More
    ,
    @@ -98,7 +98,7 @@

    - More + More
    ,
    @@ -113,7 +113,7 @@

    - More + More
    ,
    @@ -128,7 +128,7 @@

    - More + More
    ,
    @@ -143,7 +143,7 @@

    - More + More
    ,
    @@ -158,7 +158,7 @@

    - More + More
    ,
    @@ -173,7 +173,7 @@

    - More + More
    ,
    @@ -188,7 +188,7 @@

    - More + More
    ,
    diff --git a/application/views/mobile_first/ch-feedback-list.php b/application/views/mobile_first/ch-feedback-list.php index 94171187..7e07d6d8 100644 --- a/application/views/mobile_first/ch-feedback-list.php +++ b/application/views/mobile_first/ch-feedback-list.php @@ -26,7 +26,7 @@

    - more + more
    ,
    diff --git a/application/views/mobile_first/ch-feedback-newest.php b/application/views/mobile_first/ch-feedback-newest.php index 1847fb37..64f32b5d 100644 --- a/application/views/mobile_first/ch-feedback-newest.php +++ b/application/views/mobile_first/ch-feedback-newest.php @@ -23,7 +23,7 @@

    - more + more
    ,
    diff --git a/application/views/mobile_first/ch-feedback.php b/application/views/mobile_first/ch-feedback.php index 2a7b75a4..f3da1119 100644 --- a/application/views/mobile_first/ch-feedback.php +++ b/application/views/mobile_first/ch-feedback.php @@ -6,6 +6,6 @@
    Trip Advisor travelers' choice 2022

    reviewed ,
    -

     more

    +

     more

    \ No newline at end of file From 4700c8d0d0b68259d6989b600125da1475ab7154 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 28 Mar 2024 16:41:53 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E6=96=B0=E5=A2=9Erel=3D"nofollow"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/gh-feedback-30-list.php | 2 +- .../views/mobile_first/gh-feedback-city-list.php | 12 ++++++------ .../views/mobile_first/gh-feedback-newest.php | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/views/mobile_first/gh-feedback-30-list.php b/application/views/mobile_first/gh-feedback-30-list.php index 0e03b4ec..ec8224bf 100644 --- a/application/views/mobile_first/gh-feedback-30-list.php +++ b/application/views/mobile_first/gh-feedback-30-list.php @@ -20,7 +20,7 @@

    - More + More
    ,
    diff --git a/application/views/mobile_first/gh-feedback-city-list.php b/application/views/mobile_first/gh-feedback-city-list.php index 6987fab0..c606e8ad 100644 --- a/application/views/mobile_first/gh-feedback-city-list.php +++ b/application/views/mobile_first/gh-feedback-city-list.php @@ -7,7 +7,7 @@

    - More + More
    ,
    @@ -22,7 +22,7 @@

    - More + More
    ,
    @@ -37,7 +37,7 @@

    - More + More
    ,
    @@ -52,7 +52,7 @@

    - More + More
    ,
    @@ -68,7 +68,7 @@

    - More + More
    ,
    @@ -83,7 +83,7 @@

    - More + More
    ,
    diff --git a/application/views/mobile_first/gh-feedback-newest.php b/application/views/mobile_first/gh-feedback-newest.php index c0644c18..04a8b32f 100644 --- a/application/views/mobile_first/gh-feedback-newest.php +++ b/application/views/mobile_first/gh-feedback-newest.php @@ -25,7 +25,7 @@

    - More + More
    ,
    From 07f42b20514413db3bef1ba0d49b76527e7ca2df Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 29 Mar 2024 11:18:32 +0800 Subject: [PATCH 07/22] 11 --- .../mobile_first/ch-feedback-city-list.php | 41 +------------------ 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/application/views/mobile_first/ch-feedback-city-list.php b/application/views/mobile_first/ch-feedback-city-list.php index e3a457d4..e7b804e6 100644 --- a/application/views/mobile_first/ch-feedback-city-list.php +++ b/application/views/mobile_first/ch-feedback-city-list.php @@ -193,43 +193,4 @@ -

    Read more Hangzhou travel reviews.

    - -

    All Destinations' Feedbacks

    -
    -
    - -
    -
    - -
    -
    - -
    - - -
    \ No newline at end of file +

    Read more Hangzhou travel reviews.

    \ No newline at end of file From 8ee88e233bbb7afc3cf68198eb27cbb62cfa0736 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 29 Mar 2024 13:59:47 +0800 Subject: [PATCH 08/22] 11 --- application/views/mobile_first/ch-feedback-30-list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ch-feedback-30-list.php b/application/views/mobile_first/ch-feedback-30-list.php index c473548a..a8a1f839 100644 --- a/application/views/mobile_first/ch-feedback-30-list.php +++ b/application/views/mobile_first/ch-feedback-30-list.php @@ -1,9 +1,9 @@

    Discover real reviews of Highlights Travel Family's best-rated service across trusted platforms.

    +padding-bottom: 0;" class="city_feedback">Discover real reviews of Highlights Travel Family's best-rated service across trusted platforms.

    -
    +
    From 668658776ea263bbe9467fbb753c3ec4524640d5 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 29 Mar 2024 14:37:39 +0800 Subject: [PATCH 09/22] 11 --- application/views/mobile_first/ah-feedback-list.php | 2 +- application/views/mobile_first/ah-feedback-newest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ah-feedback-list.php b/application/views/mobile_first/ah-feedback-list.php index 2b0f2bd7..45f6f280 100644 --- a/application/views/mobile_first/ah-feedback-list.php +++ b/application/views/mobile_first/ah-feedback-list.php @@ -1,5 +1,5 @@ -

    Discover real reviews of Highlights Travel Family's best-rated service across trusted platforms.

    +

    Discover real reviews of Highlights Travel Family's best-rated service across trusted platforms.

    diff --git a/application/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/ah-feedback-newest.php index 90d8a87d..15b485cf 100644 --- a/application/views/mobile_first/ah-feedback-newest.php +++ b/application/views/mobile_first/ah-feedback-newest.php @@ -1,5 +1,5 @@ -

    Discover real reviews of Highlights Travel Family's best-rated service across trusted platforms.

    +

    Discover real reviews of Highlights Travel Family's best-rated service across trusted platforms.

    From 9057b6c6875161ea6b60cbef65b737728894c1e7 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Fri, 29 Mar 2024 14:51:44 +0800 Subject: [PATCH 10/22] =?UTF-8?q?AH=E3=80=81CH=E3=80=81GH=20=E6=92=A4?= =?UTF-8?q?=E4=B8=8B=E9=A1=B5=E5=A4=B4=E7=9A=84=E5=8D=95=E5=85=83=E5=B9=BF?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-h1.php | 19 ------------------- application/views/mobile_first/ch-h1.php | 18 ------------------ 2 files changed, 37 deletions(-) diff --git a/application/views/mobile_first/ah-h1.php b/application/views/mobile_first/ah-h1.php index 4c8bbc99..9f8de67a 100644 --- a/application/views/mobile_first/ah-h1.php +++ b/application/views/mobile_first/ah-h1.php @@ -16,24 +16,5 @@
    - - - - - -
    diff --git a/application/views/mobile_first/ch-h1.php b/application/views/mobile_first/ch-h1.php index 11b7b02c..5dce5776 100644 --- a/application/views/mobile_first/ch-h1.php +++ b/application/views/mobile_first/ch-h1.php @@ -19,23 +19,5 @@

    Written by Updated
    - - - -
    -
    \ No newline at end of file From 4f8f5465b8b0f6e3af523312a2a68e86986fe5c0 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Mon, 1 Apr 2024 09:36:33 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Google=20Ad=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-h1.php | 4 ++++ application/views/mobile_first/ch-h1.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/application/views/mobile_first/ah-h1.php b/application/views/mobile_first/ah-h1.php index 9f8de67a..fd6aa71c 100644 --- a/application/views/mobile_first/ah-h1.php +++ b/application/views/mobile_first/ah-h1.php @@ -16,5 +16,9 @@ + + + diff --git a/application/views/mobile_first/ch-h1.php b/application/views/mobile_first/ch-h1.php index 5dce5776..aea0a4fa 100644 --- a/application/views/mobile_first/ch-h1.php +++ b/application/views/mobile_first/ch-h1.php @@ -19,5 +19,9 @@

    Written by Updated
    + + + \ No newline at end of file From cac450b43f6a012c7109457db98a2af3834dc1d6 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Tue, 2 Apr 2024 09:28:17 +0800 Subject: [PATCH 12/22] =?UTF-8?q?AH=20=E6=92=A4=E4=B8=8BGG=20Ads?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-h1.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application/views/mobile_first/ah-h1.php b/application/views/mobile_first/ah-h1.php index fd6aa71c..9f8de67a 100644 --- a/application/views/mobile_first/ah-h1.php +++ b/application/views/mobile_first/ah-h1.php @@ -16,9 +16,5 @@ - - - From 8594ba2400a2b1b2bfce57d62990aaf627c47c0d Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 2 Apr 2024 10:18:24 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E7=A5=A8=E4=BB=B7=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B3=B0=E9=93=A2=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ah-lantern-form-info-page.php | 8 ++++---- application/views/mobile_first/ah-lantern-form.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/views/mobile_first/ah-lantern-form-info-page.php b/application/views/mobile_first/ah-lantern-form-info-page.php index f067b643..26a0f985 100644 --- a/application/views/mobile_first/ah-lantern-form-info-page.php +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -25,7 +25,7 @@ @@ -35,7 +35,7 @@ @@ -45,7 +45,7 @@ @@ -415,7 +415,7 @@ var currentTarget = event.currentTarget; var adultNumberValue = parseInt(adultNumberNode.value); if (currentTarget.value === 'Premium+Transfer+Dinner') { - ticketPrice = 199; + ticketPrice = 179; } else if (currentTarget.value === 'Standard+Transfer+Dinner') { ticketPrice = 129; } else if (currentTarget.value === 'VIP+Transfer+Dinner') { diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index 86723a41..0e548eec 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -26,7 +26,7 @@ @@ -36,7 +36,7 @@ @@ -46,7 +46,7 @@ @@ -412,7 +412,7 @@ var currentTarget = event.currentTarget; var adultNumberValue = parseInt(adultNumberNode.value); if (currentTarget.value === 'Premium+Transfer+Dinner') { - ticketPrice = 199; + ticketPrice = 179; } else if (currentTarget.value === 'Standard+Transfer+Dinner') { ticketPrice = 129; } else if (currentTarget.value === 'VIP+Transfer+Dinner') { From 3da7745c6e7d3f5082d1510777ea9fa1bc3ffa79 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 2 Apr 2024 10:53:15 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=95=E9=83=A8newsl?= =?UTF-8?q?etter=E8=A1=A8=E5=8D=95=E5=92=8C=E7=9B=B8=E5=85=B3JS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 74 +----------------------- application/views/mobile_first/ch.php | 72 +---------------------- 2 files changed, 4 insertions(+), 142 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index f08a586f..17ef0b94 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -362,19 +362,9 @@

    Sign up to Our Newsletter

    Be the first to receive exciting updates, exclusive promotions, and valuable travel tips from our - team of experts.

    -
    - - - -
    + team of experts.

    + Click to Sign up +
    @@ -568,65 +558,7 @@ } })(window, document, 'header'); - - - diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index c2e6d85c..1ddea8af 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -366,18 +366,7 @@

    Sign up to Our Newsletter

    Be the first to receive exciting updates, exclusive promotions, and valuable travel tips from our team of experts.

    -
    - - - -
    + Click to Sign up
    @@ -560,65 +549,6 @@ Travel Service Co., LTD - - - - + diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index b2ec7eab..500a9a23 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -334,7 +334,6 @@ - From 6b2f5f0671c581e66e47f34740c91ca5c56f4e01 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Tue, 2 Apr 2024 14:42:02 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E9=A1=B5=E4=BF=A1=E6=81=AF=E9=A1=B5=E5=A4=B4=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 33 +++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index a905f94d..599b2b76 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1094,8 +1094,37 @@ class Information extends CI_Controller $template = str_replace('?product_code=', '?product_code=' . $meta_product_code, $template); $information->ic_content = str_replace('', $inquiry_form_template, $information->ic_content); - $breadcrumb_content = $this->load->view($template_path . '-breadcrumb', array('breadcrumb_data' => $breadcrumb_data), true); - $information->ic_content = str_replace('', $breadcrumb_content, $information->ic_content); + $ads_by_google = !empty ($meta_google_ad_article); + //H1模板替换 + $data_H1 = array(); + $data_H1['infocategory'] = $this->Information_model->get_detail_by_path($information->is_path, 1); //信息所属分类,获取信息顶级节点内容 + $data_H1['author'] = ''; //获取作者信息 + $author = $this->Operator_model->get_author_nikename($information->ic_author); + if (!empty ($author)) { + $data_H1['author'] = $author->OPI_FirstName; + } else { + $author_web = $this->Infoauthors_model->detail_by_id($information->ic_author); //原始作者,可能是在线作者等 + if (!empty ($author_web)) { + $data_H1['author'] = $author_web->a_name; + } + } + + // 检查图片地址格式 + $parsed_photo = $information->ic_photo; + $parsed_photo_url = parse_url($information->ic_photo); + if ( + (!isset ($parsed_photo_url['host']) || !isset ($parsed_photo_url['scheme'])) && isset ($parsed_photo_url['path']) + ) { + $parsed_photo = 'https://images.chinahighlights.com' . $parsed_photo_url['path']; + } + + $data_H1['ic_title'] = $information->ic_title; + $data_H1['ic_photo'] = $parsed_photo; + $data_H1['breadcrumb_data'] = $breadcrumb_data; + $data_H1['ads_by_google'] = $ads_by_google; + $data_H1['ic_datetime'] = $information->ic_datetime; + $template_H1 = $this->load->view($template_path . '-h1', $data_H1, true); + $template = str_replace('', $template_H1, $template); } // CH: 1; AH: 28; GH : 33 From 94574e015ddfd4352bf3cc048852658e615fd485 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 2 Apr 2024 18:35:49 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-h1.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application/views/mobile_first/gh-h1.php b/application/views/mobile_first/gh-h1.php index 5a279417..bc16ba63 100644 --- a/application/views/mobile_first/gh-h1.php +++ b/application/views/mobile_first/gh-h1.php @@ -1,8 +1,4 @@
    - - <?php echo !empty($ic_title)?$ic_title:'H1 title globalhighlights mobile first template'; ?> -
    From 08e87a38026c4170eccb608207f9d28b02d6c1ff Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 2 Apr 2024 19:08:35 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E5=BA=95=E9=83=A8newsletter=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E7=A7=BB=E8=87=B3=E4=BF=A1=E6=81=AF=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=EF=BC=8C=E6=9B=BF=E6=8D=A2=E4=B8=BA=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/gh-pc.php | 21 ++------------------- application/views/mobile_first/gh.php | 18 +----------------- 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index b4bf250e..a55feacb 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -231,7 +231,7 @@
    We are here to help you...
    start planning your tailor-made trip with 1-1 help from our travel advisors. - +