From 80fa82bd617809168fb1a6dab2c3fdfe83ec759a Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Tue, 24 Aug 2021 15:14:06 +0800 Subject: [PATCH 01/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=AF=BB=E5=8F=96=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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 43663464..85d4c0f7 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -610,7 +610,7 @@ class Information extends CI_Controller // HTLM:
// 解析结果:, Shanghai $feedback_array = []; - preg_match_all('^^', $template, $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]; @@ -619,10 +619,10 @@ class Information extends CI_Controller $template_path . '-feedback', array('feedback_data' => $feedback_data), true); - $template = str_replace( + $information->ic_content = str_replace( $tag_name, $feedback_content, - $template); + $information->ic_content); } } From 0ae4c7f9544102301fe841496d6aef116408775a Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Tue, 24 Aug 2021 15:27:46 +0800 Subject: [PATCH 02/51] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=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 +- application/models/feedback_model.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 85d4c0f7..95e91b83 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -614,7 +614,7 @@ class Information extends CI_Controller 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_data = $this->Feedback_model->get_feedback_by_city($city_name); $feedback_content = $this->load->view( $template_path . '-feedback', array('feedback_data' => $feedback_data), diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php index 11a0f8e8..3defcc51 100644 --- a/application/models/feedback_model.php +++ b/application/models/feedback_model.php @@ -7,6 +7,9 @@ class Feedback_model extends CI_Model { $this->HT = $this->load->database('HT', TRUE); } + /** + * 根据城市英文名查找最新一条反馈信息 + */ function get_feedback_by_city($city_name) { $feedback_query = From dc99f4b648cfefe3e6a48e08d3a28f691f8eb384 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Tue, 24 Aug 2021 15:34:08 +0800 Subject: [PATCH 03/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=90=8D=E6=B5=8B=E8=AF=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/test.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/controllers/test.php b/application/controllers/test.php index 7a7efa6b..fc7860b0 100644 --- a/application/controllers/test.php +++ b/application/controllers/test.php @@ -14,15 +14,15 @@ class Test extends CI_Controller } + // https://cht.mycht.cn/info.php/test/feedback/?tag=%3C!--%40FEEDBACK_(.*)%40--%3E public function feedback() { - $is_id = $this->input->get_post('is_id'); + $tag = $this->input->get_post('tag'); $template_path = 'mobile_first/ch'; - $information = $this->Information_model->Detail($is_id); $feedback_array = array(); - preg_match_all('^^', $information->ic_content, $feedback_array); + preg_match_all('^^', $tag, $feedback_array); if (!empty($feedback_array)) { foreach ($feedback_array[0] as $index => $tag_name) { $city_name = $feedback_array[1][$index]; From bb8c9227716c05ce0d873d2e1c6d902015afc794 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Tue, 24 Aug 2021 15:35:52 +0800 Subject: [PATCH 04/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/test.php b/application/controllers/test.php index fc7860b0..4db89632 100644 --- a/application/controllers/test.php +++ b/application/controllers/test.php @@ -26,10 +26,10 @@ class Test extends CI_Controller if (!empty($feedback_array)) { foreach ($feedback_array[0] as $index => $tag_name) { $city_name = $feedback_array[1][$index]; - echo $information->ic_title.'
'; echo $city_name.'
'; echo htmlentities($tag_name).'
'; $feedback_data = $this->feedback_model->get_feedback_by_city($city_name); + var_dump($feedback_data); $feedback_content = $this->load->view( $template_path . '-feedback', array('feedback_data' => $feedback_data), From a305a212a81c950a290ec397d191c77e4819e5e8 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 24 Aug 2021 15:39:53 +0800 Subject: [PATCH 05/51] 11 --- application/views/mobile_first/ch-feedback.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/mobile_first/ch-feedback.php b/application/views/mobile_first/ch-feedback.php index fc5c994f..4c18efcf 100644 --- a/application/views/mobile_first/ch-feedback.php +++ b/application/views/mobile_first/ch-feedback.php @@ -1,11 +1,11 @@ -
+

About China Highlights

Since 1959 we've guided everyone ranging from US presidents, Australian Geographic and retired backpackers. Our goal is to create unique trips that take you off-the-beaten path, helping you discover China in a more authentic way. Our motto: "Discovery Your Way!"

-
travelers' choice 2020 -
+
travelers' choice 2021 +