From 671fdf978559c3129a2cc358167d464300102713 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 8 Apr 2024 09:38:37 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=A4=96=E9=93=BE=E6=B7=BB=E5=8A=A0nofol?= =?UTF-8?q?low?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-pc.php | 32 ++++++------ application/views/mobile_first/ah.php | 32 ++++++------ application/views/mobile_first/ch-pc.php | 40 +++++++------- application/views/mobile_first/ch.php | 42 +++++++-------- application/views/mobile_first/gh-pc.php | 66 ++++++++++++------------ application/views/mobile_first/gh.php | 66 ++++++++++++------------ 6 files changed, 139 insertions(+), 139 deletions(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 7b4e79ba..4a1c25b6 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -150,7 +150,7 @@ @@ -370,11 +370,11 @@
@@ -402,13 +402,13 @@
Company
@@ -416,13 +416,13 @@
Language
diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index cfdf1c98..358d91a5 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -96,7 +96,7 @@ - + @@ -254,15 +254,15 @@
@@ -312,15 +312,15 @@
- About Us + About Us
@@ -329,17 +329,17 @@
diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 5f5aef6d..eb1e9739 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -131,7 +131,7 @@
  • Hong Kong
  • Asia Tours
    • + id="asia_tours_2021" target="blank" rel="nofollow">Asia Tours
    @@ -176,7 +176,7 @@
    @@ -417,13 +417,13 @@
    @@ -447,14 +447,14 @@
    Company
    @@ -462,12 +462,12 @@
    Language
    diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 035cf21e..75c95620 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -314,18 +314,18 @@ @@ -440,18 +440,18 @@
    @@ -471,7 +471,7 @@ Travel Service Co., LTD Follow Us
    @@ -325,13 +325,13 @@
    @@ -357,26 +357,26 @@
    Company
    Language
    @@ -395,7 +395,7 @@
  • + style="fill: #fff;"> diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index 0226dc0d..2b6d91ec 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -124,39 +124,39 @@ @@ -284,11 +284,11 @@
    • @@ -305,18 +305,18 @@
    Follow Us
    -
    Create my trip
    From 46457a8785477415aebed6845f0bbccdce965361 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Mon, 8 Apr 2024 10:55:30 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E7=B2=BE=E7=AE=80AH=E7=BD=91=E7=AB=99rev?= =?UTF-8?q?iews=E4=B8=AA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 30 +++---------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index f69e48f2..47782fb0 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -2176,19 +2176,6 @@ class Information extends CI_Controller $template = str_replace('', $tips_right_list_content, $template); - // - $feedback_newest_10 = $this->Feedback_model->get_feedback_newest(10); - $feedback_newest_10_content = $this->load->view( - 'mobile_first/ah-feedback-newest-10', - array('feedback_list' => $feedback_newest_10), - true - ); - $template = str_replace( - '', - $feedback_newest_10_content, - $template - ); - //文中的信息推荐 if (strpos($information->ic_content, '') !== false) { $information->ic_content = str_replace('', $this->load->view($template_path . '-recommends-article', array('recommands' => $template_recommand), true), $information->ic_content); @@ -2296,7 +2283,9 @@ class Information extends CI_Controller foreach ($feedback_array[0] as $index => $tag_name) { $city_name_string = $feedback_array[1][$index]; $city_name_list = explode(',', $city_name_string); - $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list); + $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list); + // 防止触发 Google 网络垃圾政策只返回前三条 + $top3_feedback_list = array_slice($feedback_list, 0, 3); $feedback_content = $this->load->view( $template_path . '-feedback-list', array('feedback_list' => $feedback_list), @@ -2359,19 +2348,6 @@ class Information extends CI_Controller } } - // - $feedback_newest = $this->Feedback_model->get_feedback_newest(); - $feedback_newest_content = $this->load->view( - 'mobile_first/ah-feedback-newest', - array('feedback_list' => $feedback_newest), - true - ); - $information->ic_content = str_replace( - '', - $feedback_newest_content, - $information->ic_content - ); - //主样式表，内联模式 if (is_file('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')); From 840f7e5b9f0737c5ebfbe63cccb2f1ca4c2509e1 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Mon, 8 Apr 2024 11:37:48 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAH=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=9C=B0Review=E4=B8=BA=E4=B8=89=E4=B8=AA?= 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 47782fb0..6db8fd7e 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -2288,7 +2288,7 @@ class Information extends CI_Controller $top3_feedback_list = array_slice($feedback_list, 0, 3); $feedback_content = $this->load->view( $template_path . '-feedback-list', - array('feedback_list' => $feedback_list), + array('feedback_list' => $top3_feedback_list), true ); $information->ic_content = str_replace( From f36babb1fb0cfdf1d7c1dca00b524b01ac02121f Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 8 Apr 2024 13:38:33 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=8F=AA=E4=BF=9D=E7=95=994=E4=B8=AA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ah-next-mobile.php | 126 +----------------- application/views/mobile_first/ah-next.php | 123 ----------------- 2 files changed, 1 insertion(+), 248 deletions(-) diff --git a/application/views/mobile_first/ah-next-mobile.php b/application/views/mobile_first/ah-next-mobile.php index 351c79a5..a4923bfd 100644 --- a/application/views/mobile_first/ah-next-mobile.php +++ b/application/views/mobile_first/ah-next-mobile.php @@ -49,65 +49,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -178,72 +120,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/application/views/mobile_first/ah-next.php b/application/views/mobile_first/ah-next.php index 72201719..872eaccb 100644 --- a/application/views/mobile_first/ah-next.php +++ b/application/views/mobile_first/ah-next.php @@ -54,64 +54,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -190,71 +132,6 @@ - - - - - - - - - - - - - - - - - - - - - - - From 3889c6ea01da75881fa086507fafb78ec56808c5 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 8 Apr 2024 13:39:15 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=8F=AA=E4=BF=9D=E7=95=994=E4=B8=AA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-next-mobile.php | 1 - application/views/mobile_first/ah-next.php | 1 - 2 files changed, 2 deletions(-) diff --git a/application/views/mobile_first/ah-next-mobile.php b/application/views/mobile_first/ah-next-mobile.php index a4923bfd..5023f40a 100644 --- a/application/views/mobile_first/ah-next-mobile.php +++ b/application/views/mobile_first/ah-next-mobile.php @@ -116,7 +116,6 @@ ic_title; ?> - diff --git a/application/views/mobile_first/ah-next.php b/application/views/mobile_first/ah-next.php index 872eaccb..1a75bff0 100644 --- a/application/views/mobile_first/ah-next.php +++ b/application/views/mobile_first/ah-next.php @@ -127,7 +127,6 @@ ic_title; ?> - From 638ede80d4973a5bb06d285086db28c1831fe32f Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Mon, 8 Apr 2024 14:21:03 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=90=AF=E7=94=A8meta=20robots=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 15 +++++++++++++++ application/views/mobile_first/ah-pc.php | 1 + application/views/mobile_first/ah.php | 1 + application/views/mobile_first/ch-pc.php | 1 + application/views/mobile_first/ch.php | 1 + application/views/mobile_first/gh-pc.php | 1 + application/views/mobile_first/gh.php | 1 + 7 files changed, 21 insertions(+) diff --git a/application/controllers/information.php b/application/controllers/information.php index 6db8fd7e..5834ca66 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1380,6 +1380,11 @@ class Information extends CI_Controller if (!empty ($meta_addon_js)) { $template = str_replace('', '', $template); } + + $meta_index_set = get_meta($information->ic_id, 'meta_index_set'); + if (!empty ($meta_index_set)) { + $template = str_replace('', '', $template); + } //设置内容图片缓加载 $lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.chinahighlights.com/grey.gif'); $template = str_replace('', $lazy_content, $template); @@ -2004,6 +2009,11 @@ class Information extends CI_Controller if (!empty ($meta_addon_js)) { $template = str_replace('', '', $template); } + + $meta_index_set = get_meta($information->ic_id, 'meta_index_set'); + if (!empty ($meta_index_set)) { + $template = str_replace('', '', $template); + } //设置内容图片缓加载 $lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.chinahighlights.com/grey.gif'); $template = str_replace('', $lazy_content, $template); @@ -2367,6 +2377,11 @@ class Information extends CI_Controller if (!empty ($meta_addon_js)) { $template = str_replace('', '', $template); } + + $meta_index_set = get_meta($information->ic_id, 'meta_index_set'); + if (!empty ($meta_index_set)) { + $template = str_replace('', '', $template); + } //设置内容图片缓加载 $lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.asiahighlights.com/grey.gif'); $template = str_replace('', $lazy_content, $template); diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 7f6fe4b8..6fad423d 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -12,6 +12,7 @@ + diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index 358d91a5..1d71a763 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -9,6 +9,7 @@ + diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index eb1e9739..30bd8e49 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -12,6 +12,7 @@ + diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 75c95620..2896d402 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -8,6 +8,7 @@ + diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 4831556c..9d85677a 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -12,6 +12,7 @@ + diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index 2b6d91ec..ffa3fe0c 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -8,6 +8,7 @@ + From f774e8d5a9191cf01be01365a3f176d6471d9931 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 8 Apr 2024 14:21:06 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=8F=AA=E4=BF=9D=E7=95=994=E4=B8=AA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-next.php | 124 +-------------------- 1 file changed, 2 insertions(+), 122 deletions(-) diff --git a/application/views/mobile_first/gh-next.php b/application/views/mobile_first/gh-next.php index f532e917..82efe7a8 100644 --- a/application/views/mobile_first/gh-next.php +++ b/application/views/mobile_first/gh-next.php @@ -73,69 +73,7 @@ - - - - - <?php echo $recommands['Tour E']->ic_title; ?> - - - - - - - - - - - <?php echo $recommands['Tour F']->ic_title; ?> - - - - - - - - - - - <?php echo $recommands['Tour G']->ic_title; ?> - - - - - - - - - - - <?php echo $recommands['Tour H']->ic_title; ?> - - - - - + @@ -215,65 +153,7 @@ - - - - - <?php echo $recommands['Article E']->ic_title; ?> - - - - - - - - - - - <?php echo $recommands['Article F']->ic_title; ?> - - - - - - - - - - - <?php echo $recommands['Article G']->ic_title; ?> - - - - - - - - - - - <?php echo $recommands['Article H']->ic_title; ?> - - - - - + From 734f11ab184803269f35b928f29652d7fa222bdf Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 8 Apr 2024 14:24:27 +0800 Subject: [PATCH 09/17] 11 --- application/views/mobile_first/gh-pc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 4831556c..0e1730fa 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -221,11 +221,11 @@
    Create my trip -
    + - + - + From d4dc052240862538b2cb5db565b7ece522b9ca5a Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 8 Apr 2024 14:25:03 +0800 Subject: [PATCH 10/17] 11 --- application/views/mobile_first/gh-pc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 87981d0b..93139c87 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -229,7 +229,6 @@ -
    We are here to help you...
    start planning your tailor-made trip with 1-1 help from our travel advisors.
    Create Your Trip
    From 328871f456e37f8674bb208c28bf0f880f03b4ea Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Mon, 8 Apr 2024 15:45:47 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E5=BF=BD=E7=95=A5info.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6f1c4033..91e29286 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .idea -.phpintel -.*.json.bak +.phpintel +info.php +.*.json.bak .ftp-deploy-sync-state.json .svn/* */logs/log* @@ -17,4 +18,4 @@ /application/config/database.php - + From d14fc3dc49233975ac33bdbf2b70a4d8828624c6 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 8 Apr 2024 16:13:07 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=8F=AA=E4=BF=9D=E7=95=994=E4=B8=AA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-next.php | 131 +-------------------- 1 file changed, 2 insertions(+), 129 deletions(-) diff --git a/application/views/mobile_first/ch-next.php b/application/views/mobile_first/ch-next.php index dadf6f69..9a9dc092 100644 --- a/application/views/mobile_first/ch-next.php +++ b/application/views/mobile_first/ch-next.php @@ -66,68 +66,7 @@ - - -
    - - <?php echo $recommands['Tour E']->ic_title; ?> - - ic_title; ?> - -
    - - - - - - -
    - - <?php echo $recommands['Tour F']->ic_title; ?> - - ic_title; ?> - -
    - - - - - - -
    - - <?php echo $recommands['Tour G']->ic_title; ?> - - ic_title; ?> - -
    - - - - - - -
    - - <?php echo $recommands['Tour H']->ic_title; ?> - ic_title; ?> - -
    - - - + @@ -212,73 +151,7 @@
    - ic_url)) { ?> - -
    - <?php echo $recommands['Article E']->ic_title; ?> - - ic_title; ?> -
    - - -
    - - - ic_url)) { ?> - -
    - <?php echo $recommands['Article F']->ic_title; ?> - - - ic_title; ?> - -
    - - -
    - - - ic_url)) { ?> - -
    - <?php echo $recommands['Article G']->ic_title; ?> - - ic_title; ?> - -
    - - -
    - - - ic_url)) { ?> - -
    - <?php echo $recommands['Article H']->ic_title; ?> - - ic_title; ?> - -
    - - -
    - + From 9da5fe82c59f2f87f788862c0fb70496aae6d4c5 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 8 Apr 2024 16:17:57 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=9B=B4=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 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 30bd8e49..b560d460 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -317,16 +317,17 @@ +
    +
    + + +
    +
    -
    -
    - - -
    -
    +
    Start planning your tailor-made tour with 1-1 From bc14f704bb957968e9ca81b8877c05f324f2274d Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 8 Apr 2024 16:43:26 +0800 Subject: [PATCH 14/17] =?UTF-8?q?TP=E5=88=86=E6=95=B0=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/ah-pc.php | 2 +- application/views/mobile_first/ah.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 6fad423d..b7542883 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -393,7 +393,7 @@
    - Rated 5 out of 5 | 98.8% Excellence
    + Rated 4.9 out of 5 | 98.8% Excellence
    China Highlights International
    Travel Service Co., LTD
    diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index 1d71a763..902a61a6 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -277,7 +277,7 @@ - Rated 5 out of 5 | 98.8% Excellence
    + Rated 4.9 out of 5 | 98.8% Excellence
    China Highlights International
    Travel Service Co., LTD
    From 14e3d0e7cb62745e2a46a8b7b3b356886eafe99c Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Tue, 9 Apr 2024 09:12:38 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E5=BF=BD=E7=95=A5=20/info.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 91e29286..72a5dd56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .idea .phpintel -info.php +/info.php .*.json.bak .ftp-deploy-sync-state.json .svn/* From cfc08936bc688d0673da0d7587c8d5377ee7998c Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Tue, 9 Apr 2024 09:32:50 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E7=B2=BE=E7=AE=80CH=E3=80=81GH=E7=BD=91?= =?UTF-8?q?=E7=AB=99reviews=E4=B8=AA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 155 +++++++----------- .../views/mobile_first/gh-feedback-list.php | 40 +++++ 2 files changed, 101 insertions(+), 94 deletions(-) create mode 100644 application/views/mobile_first/gh-feedback-list.php diff --git a/application/controllers/information.php b/application/controllers/information.php index 5834ca66..5754cf89 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -931,9 +931,11 @@ class Information extends CI_Controller $city_name_string = $feedback_array[1][$index]; $city_name_list = explode(',', $city_name_string); $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list); + // 防止触发 Google 网络垃圾政策只返回前三条 + $top3_feedback_list = array_slice($feedback_list, 0, 3); $feedback_content = $this->load->view( - $template_path . '-feedback-list', - array('feedback_list' => $feedback_list), + 'mobile_first/ch-feedback-list', + array('feedback_list' => $top3_feedback_list), true ); $information->ic_content = str_replace( @@ -993,18 +995,6 @@ class Information extends CI_Controller } } - $feedback_newest = $this->Feedback_model->get_feedback_newest(); - $feedback_newest_content = $this->load->view( - $template_path . '-feedback-newest', - array('feedback_list' => $feedback_newest), - true - ); - $information->ic_content = str_replace( - '', - $feedback_newest_content, - $information->ic_content - ); - // 天气预报模板 $weather_forecast_content = $this->load->view( $template_path . '-weather-forecast', @@ -1017,7 +1007,6 @@ class Information extends CI_Controller $information->ic_content ); - // 火车票首页搜索框 --zp $template_TrainSearch = ""; if ($information->ic_url == "/china-trains/hometest.htm" || $information->ic_url == "/china-trains/") { @@ -1050,43 +1039,41 @@ class Information extends CI_Controller $meta_product_code = get_meta($information->ic_id, 'meta_product_code'); $meta_google_ad_article = get_meta($information->ic_id, 'meta_google_ad_article'); - //非产品页面 - if (empty ($meta_product_code)) { - - $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']; + $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; } + } - $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); + // 检查图片地址格式 + $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']; + } - $addthis_widget = $this->load->view($template_path . '-add-this', false, true); - $template = str_replace('', $addthis_widget, $template); + $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); + + //非产品页面 + if (empty ($meta_product_code)) { $template = str_replace('?product_code=', '', $template); $article_structured_data_content = $this->load->view( @@ -1105,38 +1092,6 @@ class Information extends CI_Controller $inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code' => $meta_product_code), true); $template = str_replace('?product_code=', '?product_code=' . $meta_product_code, $template); $information->ic_content = str_replace('', $inquiry_form_template, $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 @@ -1341,7 +1296,6 @@ class Information extends CI_Controller $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture'); } - //顶部视频 $meta_news_video = get_meta($information->ic_id, 'meta_news_video'); $meta_video_picture = get_meta($information->ic_id, 'meta_video_picture'); @@ -1976,17 +1930,30 @@ class Information extends CI_Controller } } - $feedback_newest = $this->Feedback_model->get_feedback_newest(); - $feedback_newest_content = $this->load->view( - $template_path . '-feedback-newest', - array('feedback_list' => $feedback_newest), - true - ); - $information->ic_content = str_replace( - '', - $feedback_newest_content, - $information->ic_content - ); + // 动态加载反馈标签，第一个城市不足八条，使用第二城市数据。 + // HTLM:
    + // 解析结果：; Siem Reap,Bangkok + $feedback_array = []; + preg_match_all('^^', $information->ic_content, $feedback_array); + if (!empty ($feedback_array)) { + foreach ($feedback_array[0] as $index => $tag_name) { + $city_name_string = $feedback_array[1][$index]; + $city_name_list = explode(',', $city_name_string); + $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list); + // 防止触发 Google 网络垃圾政策只返回前三条 + $top3_feedback_list = array_slice($feedback_list, 0, 3); + $feedback_content = $this->load->view( + 'mobile_first/gh-feedback-list', + array('feedback_list' => $top3_feedback_list), + true + ); + $information->ic_content = str_replace( + $tag_name, + $feedback_content, + $information->ic_content + ); + } + } if (is_file('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')); @@ -2293,11 +2260,11 @@ class Information extends CI_Controller foreach ($feedback_array[0] as $index => $tag_name) { $city_name_string = $feedback_array[1][$index]; $city_name_list = explode(',', $city_name_string); - $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list); + $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list); // 防止触发 Google 网络垃圾政策只返回前三条 $top3_feedback_list = array_slice($feedback_list, 0, 3); $feedback_content = $this->load->view( - $template_path . '-feedback-list', + 'mobile_first/ah-feedback-list', array('feedback_list' => $top3_feedback_list), true ); diff --git a/application/views/mobile_first/gh-feedback-list.php b/application/views/mobile_first/gh-feedback-list.php new file mode 100644 index 00000000..45f6f280 --- /dev/null +++ b/application/views/mobile_first/gh-feedback-list.php @@ -0,0 +1,40 @@ + +

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

    +
    + + +
    +
    + + + + + $feedback) {?> + + + + +
    +
    + + +
    +
    +
    \ No newline at end of file From 0afde5af9e345fccb7f7e19094bbfae7ef4ceb48 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 9 Apr 2024 11:06:55 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=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-feedback-list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/gh-feedback-list.php b/application/views/mobile_first/gh-feedback-list.php index 45f6f280..aabde1fd 100644 --- a/application/views/mobile_first/gh-feedback-list.php +++ b/application/views/mobile_first/gh-feedback-list.php @@ -6,7 +6,7 @@ -
    +