From d6b0503dc0cfa46a64dd4dee56aea46aa65a57db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=96=87=E5=BC=BA=40HWQ-PC?= Date: Tue, 23 Apr 2024 09:46:20 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B1=95=E7=A4=BA=E5=B9=BF=E5=91=8A=E5=BF=98?= =?UTF-8?q?=E8=AE=B0=E5=8A=A0empty($meta=5Fshow=5Fadvertise)=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 33ddc63b..98f9c4a7 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1203,10 +1203,10 @@ class Information extends CI_Controller $template = str_replace('', $this->load->view($template_path . '-next', array('recommands' => $template_recommand), true), $template); $meta_show_advertise = get_meta($information->ic_id, 'meta_show_advertise'); // //广告，改叫tips，防止被插件屏蔽 - if (!empty ($template_recommand['Tips Right TOP']) && $meta_show_advertise == 'yes') { + if (!empty ($template_recommand['Tips Right TOP']) && ($meta_show_advertise == 'yes' || empty($meta_show_advertise))) { $template = str_replace('', "
", $template); } - if (!empty ($template_recommand['Tips Right']) && $meta_show_advertise == 'yes') { + if (!empty ($template_recommand['Tips Right']) && ($meta_show_advertise == 'yes' || empty($meta_show_advertise))) { $template = str_replace('', "
" . $template_recommand['Tips Right']->it_content . "
", $template); } @@ -1246,7 +1246,7 @@ class Information extends CI_Controller ), true ); - if($meta_show_advertise == 'yes'){ + if(($meta_show_advertise == 'yes' || empty($meta_show_advertise))){ $template = str_replace('', $tips_right_list_content, $template); } } @@ -1772,7 +1772,7 @@ class Information extends CI_Controller if (!empty ($template_recommand['Tips Right TOP'])) { // $template = str_replace('', "
", $template); } - if (!empty ($template_recommand['Tips Right']) && $meta_show_advertise == 'yes') { + if (!empty ($template_recommand['Tips Right']) && ($meta_show_advertise == 'yes' || empty($meta_show_advertise))) { $template = str_replace('', "
" . $template_recommand['Tips Right']->it_content . "
", $template); } // 右侧列表广告 @@ -1807,7 +1807,7 @@ class Information extends CI_Controller ), true ); - if($meta_show_advertise == 'yes'){ + if(($meta_show_advertise == 'yes' || empty($meta_show_advertise))){ $template = str_replace('', $tips_right_list_content, $template); } //文中的信息推荐 @@ -2120,7 +2120,7 @@ class Information extends CI_Controller $template_recommand = $recommand_information; $template = str_replace('', $this->load->view($recommand_template, array('recommands' => $template_recommand), true), $template); //广告，改叫tips，防止被插件屏蔽 - if (!empty ($template_recommand['Tips Right']) && $meta_show_advertise == 'yes') { + if (!empty ($template_recommand['Tips Right']) && ($meta_show_advertise == 'yes' || empty($meta_show_advertise))) { $template = str_replace('', "
" . $template_recommand['Tips Right']->it_content . "
", $template); } // 右侧列表广告 @@ -2157,7 +2157,7 @@ class Information extends CI_Controller true ); - if($meta_show_advertise == 'yes'){ + if(($meta_show_advertise == 'yes' || empty($meta_show_advertise))){ $template = str_replace('', $tips_right_list_content, $template); } From 08bbf9666fada8ffeda6ed2554dae8f8d6229857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=96=87=E5=BC=BA=40HWQ-PC?= Date: Tue, 23 Apr 2024 09:55:23 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ah=E5=92=8Cph=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=98=BE=E7=A4=BA=E5=B9=BF=E5=91=8A=E9=87=8C=E9=9D=A2?= =?UTF-8?q?=E5=AF=B9=E7=A9=BA=E9=80=BB=E8=BE=91=E7=9A=84=E5=88=A4=E6=96=AD?= 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/gh-pc.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 22bfb565..5dbaed17 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -227,7 +227,7 @@
- +

Why Asia Highlights (10,000+ reviews & 98.8% 5-star rating)

diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index a07bf61d..3506eb19 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -190,7 +190,7 @@
- +

Why Global Highlights (10,000+ reviews & 98.8% 5-star rating)

From 4087e73ff5ef37aa6cdf95336772ea7f1ad1b97f Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Tue, 23 Apr 2024 10:05:25 +0800 Subject: [PATCH 3/7] =?UTF-8?q?AH=20CAD=20=E8=B7=A8=E5=B9=B4=E8=A1=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 15 +- .../mobile_first/ah-new-year-countdown.php | 577 ++++++++++++++++++ 2 files changed, 590 insertions(+), 2 deletions(-) create mode 100644 application/views/mobile_first/ah-new-year-countdown.php diff --git a/application/controllers/information.php b/application/controllers/information.php index 33ddc63b..924f13aa 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -2246,19 +2246,30 @@ class Information extends CI_Controller // 水灯节表单 $lantern_form_content = $this->load->view( - $template_path . '-lantern-form', + 'mobile_first/ah-lantern-form', array('information' => $information), true ); $information->ic_content = str_replace('', $lantern_form_content, $information->ic_content); // 水灯节在信息页面表单 $lantern_form_info_page_content = $this->load->view( - $template_path . '-lantern-form-info-page', + 'mobile_first/ah-lantern-form-info-page', array('information' => $information), true ); $information->ic_content = str_replace('', $lantern_form_info_page_content, $information->ic_content); + // CAD 跨年表单 + $new_year_countdown_form_content = $this->load->view( + 'mobile_first/ah-new-year-countdown', + array('information' => $information), + true + ); + $information->ic_content = str_replace( + '', + $new_year_countdown_form_content, + $information->ic_content); + // 动态加载反馈标签，第一个城市不足八条，使用第二城市数据。 // HTLM:
// 解析结果：; Siem Reap,Bangkok diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/ah-new-year-countdown.php new file mode 100644 index 00000000..dee0cc97 --- /dev/null +++ b/application/views/mobile_first/ah-new-year-countdown.php @@ -0,0 +1,577 @@ + +
+

Book Now for Chiang Mai CAD New Year Countdown to 2025 Festival Ticket

+
+

Select Date:

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

Select an Available Ticket Type

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

Select Ticket Quantity

+
+ + Adults and older children (8+ years old) + +
+ + + +
+
+

Children under 8 years old enter free; 8-year-olds and above are charged the same as adults. You can buy a ticket for your child under 8 if you would like her or him to enjoy the same provision.

+
Total price: $129
+ +

Please provide correct personal information for your ticket + booking. Double + check.

+ + + + + + + + + +

For Elite Ticket bookings on December 31th, please provide your Chiang Mai hotel name and address for pick-up and drop-off purposes.

+ + + + + + + +

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

+
+
+ + From 90dc5d9243960a620d14e5ad6715b48bab6e87fe Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 23 Apr 2024 10:33:33 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=A5=A8=E7=A7=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=96=87=E5=AD=97=E5=8A=A0=E7=B2=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ah-new-year-countdown.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/ah-new-year-countdown.php index dee0cc97..687f15d5 100644 --- a/application/views/mobile_first/ah-new-year-countdown.php +++ b/application/views/mobile_first/ah-new-year-countdown.php @@ -24,7 +24,7 @@