From 9561e0b60a9d2b1769ff3d1da990ac977764da54 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Mon, 26 Sep 2022 11:39:31 +0800 Subject: [PATCH 01/17] =?UTF-8?q?CH=20=E5=8F=8D=E9=A6=88=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 15 +++++++------ .../views/mobile_first/ch-feedback-list.php | 22 +++++++++++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 application/views/mobile_first/ch-feedback-list.php diff --git a/application/controllers/information.php b/application/controllers/information.php index 74134625..b7c1e072 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -626,18 +626,19 @@ 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 + // 动态加载反馈标签，第一个城市不足八条，使用第二城市数据。 + // HTLM:
+ // 解析结果：; Shanghai,Beijing $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); + $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_content = $this->load->view( - $template_path . '-feedback', - array('feedback_data' => $feedback_data), + $template_path . '-feedback-list', + array('feedback_list' => $feedback_list), true); $information->ic_content = str_replace( $tag_name, diff --git a/application/views/mobile_first/ch-feedback-list.php b/application/views/mobile_first/ch-feedback-list.php new file mode 100644 index 00000000..483c1813 --- /dev/null +++ b/application/views/mobile_first/ch-feedback-list.php @@ -0,0 +1,22 @@ +

About China Highlights

+

Since 1998 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!"

+

+
+ + + + $feedback) {?> + + + + +
+
+ +
,
+
+
+
\ No newline at end of file From ce4f7e46419d2bce09de2e66eac569fa73dbc389 Mon Sep 17 00:00:00 2001 From: candice Date: Sun, 9 Oct 2022 10:15:22 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A08=E5=8F=B7=E7=A5=A8?= =?UTF-8?q?=E5=94=AE=E7=BD=84=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-lantern-form-info-page.php | 1 + application/views/mobile_first/ah-lantern-form.php | 1 + 2 files changed, 2 insertions(+) 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 c7fd8897..ab2e8709 100644 --- a/application/views/mobile_first/ah-lantern-form-info-page.php +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -18,6 +18,7 @@ +

The premium tickets for Nov. 8 are sold out, but for the Nov. 9th are still available.

Select Ticket Type

diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index 131b03bf..327a7da5 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -18,6 +18,7 @@
+

The premium tickets for Nov. 8 are sold out, but for the Nov. 9th are still available.

Select Ticket Type

From a2ac670e57709392115dec7f0642b5f5a2cc20c5 Mon Sep 17 00:00:00 2001 From: candice Date: Sun, 9 Oct 2022 10:37:00 +0800 Subject: [PATCH 03/17] 11 --- application/views/mobile_first/ah-lantern-form-info-page.php | 2 +- application/views/mobile_first/ah-lantern-form.php | 2 +- 2 files changed, 2 insertions(+), 2 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 ab2e8709..538a246c 100644 --- a/application/views/mobile_first/ah-lantern-form-info-page.php +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -18,7 +18,7 @@
-

The premium tickets for Nov. 8 are sold out, but for the Nov. 9th are still available.

+

The premium tickets for Nov. 8 are sold out, but for the Nov. 9 are still available.

Select Ticket Type

diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index 327a7da5..fe0ba43e 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -18,7 +18,7 @@
-

The premium tickets for Nov. 8 are sold out, but for the Nov. 9th are still available.

+

The premium tickets for Nov. 8 are sold out, but for the Nov. 9 are still available.

Select Ticket Type

From 8944d33a3507bbeac2f35945c9b838ffbd7408e2 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Sun, 9 Oct 2022 14:33:58 +0800 Subject: [PATCH 04/17] =?UTF-8?q?8=20=E5=8F=B7=E7=9A=84=20premium=20?= =?UTF-8?q?=E7=A5=A8=E5=8D=96=E5=AE=8C=E4=BA=86=EF=BC=8C=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=AF=A5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ah-lantern-form-info-page.php | 26 +++++++++++++---- .../views/mobile_first/ah-lantern-form.php | 29 ++++++++++++++----- 2 files changed, 43 insertions(+), 12 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 538a246c..57d7d6f5 100644 --- a/application/views/mobile_first/ah-lantern-form-info-page.php +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -6,14 +6,14 @@

Select Date

- -
- -
@@ -21,7 +21,7 @@

The premium tickets for Nov. 8 are sold out, but for the Nov. 9 are still available.

Select Ticket Type

-
+