From 0f7969af7ebe2031ac912a2c40f727a86720c883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=96=87=E5=BC=BA=40HWQ-PC?= Date: Fri, 19 Jul 2024 15:29:08 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ah=EF=BC=8Cch=EF=BC=8Cgh?= =?UTF-8?q?=E5=AF=B9$OPI=5FCode=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 +- application/views/mobile_first/ah-h1.php | 1 + application/views/mobile_first/ch-h1.php | 31 ++++++++++++------------ application/views/mobile_first/gh-h1.php | 1 + 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index d65c987b..eb09082e 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1047,7 +1047,7 @@ class Information extends CI_Controller $author = $this->Operator_model->get_author_nikename($information->ic_author); if (!empty($author)) { $data_H1['author'] = $author->OPI_FirstName; - $data_H1['OPI_Code'] = $author->OPI_Code; + $data_H1['OPI_Code'] = $author->OPI_Code; } else { $author_web = $this->Infoauthors_model->detail_by_id($information->ic_author); //原始作者，可能是在线作者等 if (!empty($author_web)) { diff --git a/application/views/mobile_first/ah-h1.php b/application/views/mobile_first/ah-h1.php index 403de8f8..da3cea40 100644 --- a/application/views/mobile_first/ah-h1.php +++ b/application/views/mobile_first/ah-h1.php @@ -31,6 +31,7 @@ 'LXW' => 'https://www.globalhighlights.com/aboutus/team/carper-li', 'zzyGH' => 'https://www.globalhighlights.com/aboutus/team/ruru-zhou', ]; + $OPI_Code = empty($OPI_Code) ? '' : $OPI_Code; if (!empty($meta_news_createdate)) {?>
Written by diff --git a/application/views/mobile_first/ch-h1.php b/application/views/mobile_first/ch-h1.php index 80f4558f..660f9a4b 100644 --- a/application/views/mobile_first/ch-h1.php +++ b/application/views/mobile_first/ch-h1.php @@ -28,20 +28,21 @@ 'LXW' => 'https://www.globalhighlights.com/aboutus/team/carper-li', 'zzyGH' => 'https://www.globalhighlights.com/aboutus/team/ruru-zhou', ]; - if (!empty($meta_news_createdate)) {?> -
- Written by - - - - - - Updated -
- - - - + $OPI_Code = empty($OPI_Code) ? '' : $OPI_Code; + if (!empty($meta_news_createdate)) {?> +
+ Written by + + + + + + Updated +
+ + + +
\ No newline at end of file diff --git a/application/views/mobile_first/gh-h1.php b/application/views/mobile_first/gh-h1.php index c594d032..0d503ccc 100644 --- a/application/views/mobile_first/gh-h1.php +++ b/application/views/mobile_first/gh-h1.php @@ -28,6 +28,7 @@ 'LXW' => 'https://www.globalhighlights.com/aboutus/team/carper-li', 'zzyGH' => 'https://www.globalhighlights.com/aboutus/team/ruru-zhou', ]; + $OPI_Code = empty($OPI_Code) ? '' : $OPI_Code; if (!empty($meta_news_createdate)) {?>
Written by From be8c909d51fcafd9da8145492b11517758b2b6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=96=87=E5=BC=BA=40HWQ-PC?= Date: Mon, 22 Jul 2024 11:30:49 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A025=E5=B9=B4=E6=B0=B4?= =?UTF-8?q?=E7=81=AF=E8=8A=82=E8=A1=A8=E5=8D=95=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 9 + .../mobile_first/ah-lantern-form-2025.php | 572 ++++++++++++++++++ 2 files changed, 581 insertions(+) create mode 100644 application/views/mobile_first/ah-lantern-form-2025.php diff --git a/application/controllers/information.php b/application/controllers/information.php index eb09082e..8c5436a7 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -2276,6 +2276,15 @@ class Information extends CI_Controller ); $information->ic_content = str_replace('', $lantern_form_content, $information->ic_content); + // 水灯节2025表单 + $lantern_form_content_2025 = $this->load->view( + 'mobile_first/ah-lantern-form-2025', + array('information' => $information), + true + ); + $information->ic_content = str_replace('', $lantern_form_content_2025, $information->ic_content); + + // CAD 跨年表单 $new_year_countdown_form_content = $this->load->view( 'mobile_first/ah-new-year-countdown', diff --git a/application/views/mobile_first/ah-lantern-form-2025.php b/application/views/mobile_first/ah-lantern-form-2025.php new file mode 100644 index 00000000..f0593614 --- /dev/null +++ b/application/views/mobile_first/ah-lantern-form-2025.php @@ -0,0 +1,572 @@ + +
+

Chiang Mai CAD Yi Peng Festival 2024

+
+ +

Select Date:

+
+
+ + +
+ +
+ + +
+
+ +

Select a Ticket Type:

+
+
+ + +
+
+ + +
+
+ + +
+ + +
+ +

Select Ticket Quantity

+
+ + Adults and older children (8+ years old) + +
+ + + +
+
+
Total price: $129
+ +

Please provide correct personal info. Double check.

+ + + + + + + + + + + + + + + +

Once we receive your payment, our travel advisor will contact you within 24 hours and send you your e-ticket.

+
+
+ + \ No newline at end of file From edbe59fc97b10752ad1fb4e33c48efda0c748776 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Mon, 22 Jul 2024 11:33:12 +0800 Subject: [PATCH 3/9] =?UTF-8?q?CH=E4=BF=A1=E6=81=AF=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 27 ++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index eb09082e..b23f609a 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -900,7 +900,32 @@ class Information extends CI_Controller break; default: } - $breadcrumb_data = $this->Information_model->get_path_exclude_self($information->is_id, $information->is_path); + + // CH Home 下层节点名称和链接映射 + $group_map = [ + 278008010 => [ + 'ic_url' => '/travelguide/culture/', + 'ic_url_title' => 'Chinese Culture' + ], + 278008011 => [ + 'ic_url' => '/citytour/', + 'ic_url_title' => 'Destinations' + ], + 278008012 => [ + 'ic_url' => '/aboutus/', + 'ic_url_title' => 'About Us' + ], + 278008013 => [ + 'ic_url' => '/citytour/', + 'ic_url_title' => 'City Tours' + ], + 278008014 => [ + 'ic_url' => '/tour/', + 'ic_url_title' => 'China Tours' + ] + ]; + + $breadcrumb_data = $this->Information_model->get_breadcrumb_data($information->is_id, $information->is_path, $group_map); $breadcrumb_structured_data_content = $this->load->view( $template_path . '-structured-data-breadcrumb', From 3f21ab7a504267d6dd4adc2a097755d9c02dc5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=96=87=E5=BC=BA=40HWQ-PC?= Date: Mon, 22 Jul 2024 11:40:36 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=B0=B4=E7=81=AF=E8=8A=82=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E4=BF=AE=E6=94=B9?= 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 8c5436a7..2b620398 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -2282,7 +2282,7 @@ class Information extends CI_Controller array('information' => $information), true ); - $information->ic_content = str_replace('', $lantern_form_content_2025, $information->ic_content); + $information->ic_content = str_replace('', $lantern_form_content_2025, $information->ic_content); // CAD 跨年表单 From 16cfad4a5ee2c9cf0b27359448bc5fd6e52a9478 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 22 Jul 2024 14:25:00 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=88=A0=E9=99=A4china=20tours=202024/2025?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 2 -- application/views/mobile_first/ch.php | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 7d840c05..a044a835 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -74,8 +74,6 @@
  • China Tours