From 966ffb655cd1cf1a1dead7ff84ab3c366c9dad61 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Wed, 27 Oct 2021 14:32:16 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E8=BD=AE=E6=92=AD=E8=87=AA=E5=8A=A8=E5=88=87=E6=8D=A2=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=92=8C=E6=A1=8C=E9=9D=A2=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-next.php | 50 ++++++++++++++-------- application/views/mobile_first/gh-pc.php | 5 +++ application/views/mobile_first/gh.php | 6 ++- 3 files changed, 42 insertions(+), 19 deletions(-) diff --git a/application/views/mobile_first/gh-next.php b/application/views/mobile_first/gh-next.php index 7074e39c..519ea861 100644 --- a/application/views/mobile_first/gh-next.php +++ b/application/views/mobile_first/gh-next.php @@ -2,7 +2,7 @@

Recommended Articles

-
+
@@ -210,7 +210,7 @@

Recommended Tours

-
+
@@ -345,9 +345,9 @@
-
-
-
+
+
+
@@ -357,17 +357,31 @@ \ No newline at end of file diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index cf2d2b79..55d7fbed 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -29,6 +29,11 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','GTM-MNKHRM5'); + diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index 6ff600aa..61c9f8fa 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -23,7 +23,11 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','GTM-MNKHRM5'); - + From a7a718d399337995f56799efb7a7d6a4f312e33f Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Wed, 27 Oct 2021 14:35:37 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=AE=E6=92=AD=20ID?= =?UTF-8?q?=20=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-next.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/mobile_first/gh-next.php b/application/views/mobile_first/gh-next.php index 519ea861..b51af46a 100644 --- a/application/views/mobile_first/gh-next.php +++ b/application/views/mobile_first/gh-next.php @@ -198,9 +198,9 @@
-
-
-
+
+
+
From 0469e2918c4697a9dbd053c9c951994e79608bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Wed, 27 Oct 2021 14:45:48 +0800 Subject: [PATCH 3/8] fix --- application/views/bootstrap3/information_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 5ca1df42..bccbda89 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -921,7 +921,7 @@ - From 033bc81938f2f162b408a1c9e46819836ef9b3a7 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Wed, 27 Oct 2021 14:50:43 +0800 Subject: [PATCH 4/8] =?UTF-8?q?GH=20=E5=A2=9E=E5=8A=A0=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=8C=96=E6=A0=87=E7=AD=BE=20Article?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-pc.php | 3 +- .../gh-structured-data-article.php | 28 +++++++++++++++++++ application/views/mobile_first/gh.php | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 application/views/mobile_first/gh-structured-data-article.php diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 55d7fbed..66d0a87a 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -429,6 +429,7 @@ height="0" width="0" style="display:none;visibility:hidden"> ] } + + - \ No newline at end of file diff --git a/application/views/mobile_first/gh-structured-data-article.php b/application/views/mobile_first/gh-structured-data-article.php new file mode 100644 index 00000000..2b03ebbe --- /dev/null +++ b/application/views/mobile_first/gh-structured-data-article.php @@ -0,0 +1,28 @@ + \ No newline at end of file diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index 61c9f8fa..fb7ee727 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -379,5 +379,7 @@ height="0" width="0" style="display:none;visibility:hidden"> ] } + + \ No newline at end of file From e2c09a28d2865ad27929b0cb30af96e913059451 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Wed, 27 Oct 2021 14:52:29 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=20GH=20=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=20TA=20=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 | 30 +++++-------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index c4cce1ae..06738757 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -941,26 +941,6 @@ class Information extends CI_Controller $template = str_replace('', $information->ic_seo_keywords, $template); $template = str_replace('', $this->config->item('site_url') . $information->ic_url, $template); - // 动态加载反馈标签 - // HTLM:
- // 解析结果：, Shanghai - $feedback_array = []; - preg_match_all('^^', $information->ic_content, $feedback_array); - if (!empty($feedback_array)) { - foreach ($feedback_array[0] as $index => $tag_name) { - $city_name = $feedback_array[1][$index]; - $feedback_data = $this->Feedback_model->get_feedback_by_city($city_name); - $feedback_content = $this->load->view( - $template_path . '-feedback', - array('feedback_data' => $feedback_data), - true); - $information->ic_content = str_replace( - $tag_name, - $feedback_content, - $information->ic_content); - } - } - //顶部全屏大图 if ($device == 'mobile') { //移动端读取移动大图 $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture_mobile'); @@ -988,11 +968,11 @@ class Information extends CI_Controller // $addthis_widget = $this->load->view($template_path . '-add-this', false, true); // $template = str_replace('', $addthis_widget, $template); -// $article_structured_data_content = $this->load->view( -// $template_path . '-structured-data-article', -// array('information' => $information, 'author' => $author), -// true); -// $template = str_replace('', $article_structured_data_content, $template); + $article_structured_data_content = $this->load->view( + $template_path . '-structured-data-article', + array('information' => $information, 'author' => $author), + true); + $template = str_replace('', $article_structured_data_content, $template); } else { // $template = str_replace('', '', $template); // $inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code' => $meta_product_code), true); From 497297c20798b1588ba35b2ad3092cd44e034843 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Wed, 27 Oct 2021 15:16:59 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=20GH=20=E7=AB=99?= =?UTF-8?q?=E5=86=85=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-pc.php | 19 ++++++++++++++---- application/views/mobile_first/gh.php | 25 ++++++++++++++++++------ 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 66d0a87a..bcd94019 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -94,7 +94,6 @@ height="0" width="0" style="display:none;visibility:hidden">
  • About Us
  • Contact Us
    • -
    @@ -429,6 +425,21 @@ height="0" width="0" style="display:none;visibility:hidden"> ] } + diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index fb7ee727..d3ac8449 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -49,19 +49,17 @@ height="0" width="0" style="display:none;visibility:hidden">