From af8ce2ee6d3f3c225664bb3e172d411f40212384 Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Fri, 19 May 2023 10:29:40 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=B8=8D=E9=87=8D=E5=A4=8D=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 32 +--------------------- application/models/feedback_model.php | 35 +++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 1e5133eb..665c9042 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -985,14 +985,8 @@ class Information extends CI_Controller public function test_feedback() { - $feedback_newest = $this->Feedback_model->get_feedback_newest(); + $feedback_newest = $this->Feedback_model->test_feedback_newest(); var_dump($feedback_newest); - - $feedback_newest_content = $this->load->view( - 'ch-feedback-newest', - array('feedback_list' => $feedback_newest), - true); - var_dump($feedback_newest_content); } public function test_price() @@ -1673,30 +1667,6 @@ class Information extends CI_Controller file_put_contents($html_path, $template, LOCK_EX); } - public function test_ah_feedback() - { - $feedback_array = []; - preg_match_all('^^', '
', $feedback_array); - if (!empty($feedback_array)) { - foreach ($feedback_array[0] as $index => $tag_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); - var_dump($feedback_list); - $feedback_content = $this->load->view( - 'mobile_first/ah' . '-feedback-list', - array('feedback_list' => $feedback_list), - true - ); - echo $feedback_content; - // $information->ic_content = str_replace( - // $tag_name, - // $feedback_content, - // $information->ic_content); - } - } - } - /** * @description: CT用的生成静态文件方法.有些内容的替换，CT这边不一样，需要单独处理 zp * @param {type} $device='mobile' or 'pc' diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php index df53d166..4f1939cc 100644 --- a/application/models/feedback_model.php +++ b/application/models/feedback_model.php @@ -41,6 +41,41 @@ class Feedback_model extends CI_Model { return $feedback_list; } + function test_feedback_newest() { + + $feedback_query = + $this->HT->query(" + select top 40 + tad_content, tai_customerid, tai_title, tai_getdate, tai_url + from Eva_TAInfo + left join Eva_TADetail on TAD_TAI_SN=TAI_SN + where TAD_Content is not null + order by tai_getdate desc"); + + $feedback_result = $feedback_query->result(); + $feedback_list = []; + $customer_id_list = []; + + foreach ($feedback_result as $feedback_row) { + $createdOn = new DateTime($feedback_row->tai_getdate); + $createdOnString = $createdOn->format('M Y'); + $feedback_count = COUNT($feedback_list); + if (!array_key_exists($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) { + $feedback = [ + // 'title' => $feedback_row->tai_title, + 'customer' => $feedback_row->tai_customerid, + // 'content' => $feedback_row->tad_content, + // 'url' => $feedback_row->tai_url, + // 'createdOn' => $createdOnString + ]; + $feedback_list[] = $feedback; + $customer_id_list[] = $feedback_row->tai_customerid; + } + } + + return $feedback_list; + } + /** * 根据城市英文名查找最新八条反馈信息 */ From ba7c4d239d53db0dd5a702efdd7a1b71362402d9 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 19 May 2023 11:20:53 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E6=96=87=E5=AD=97=20You=20are=20only=20allowed=20to=20remain?= =?UTF-8?q?=20within=20the=20city=20limits=20upon=20entry.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-visa-free-tester.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/views/mobile_first/ch-visa-free-tester.php b/application/views/mobile_first/ch-visa-free-tester.php index 4734b45c..2640e130 100644 --- a/application/views/mobile_first/ch-visa-free-tester.php +++ b/application/views/mobile_first/ch-visa-free-tester.php @@ -894,7 +894,8 @@ - - + - - - + \ No newline at end of file + $('input[name="trip_date"]').each((i, tripDateEle) => { + $(tripDateEle).click(function (e) { + $expectedDate.val(''); + $expectedMonth.val(''); + $tripDateBlock.show(); + var selectedTripDate = e.currentTarget; + selectedExpectedDate = selectedTripDate.id; + if (selectedTripDate.id === 'exact') { + $dateSelectionBlock.show(); + $expectedMonth.hide(); + $expectedDate.show(); + $tripDateTip.show(); + } else if (selectedTripDate.id === 'approximate') { + $dateSelectionBlock.show(); + $expectedDate.hide(); + $expectedMonth.show(); + $tripDateTip.show(); + } else if (selectedTripDate.id === 'yet') { + $dateSelectionBlock.hide(); + $tripDateTip.hide(); + } + }) + }); + + //成人 + $('#plusAdult').click(function () { + adultNumber++; + $adultNumberInput.val(adultNumber); + }); + $('#minusAdult').click(function () { + if (adultNumber > 1) { + adultNumber--; + $adultNumberInput.val(adultNumber); + } + }); + // 青少年 + $('#plusTeenager').click(function () { + teenagerNumber++; + $teenagerNumberInput.val(teenagerNumber); + }); + $('#minusTeenager').click(function () { + if (teenagerNumber > 0) { + teenagerNumber--; + $teenagerNumberInput.val(teenagerNumber); + } + }); + // 儿童 + $('#plusChildren').click(function () { + childrenNumber++; + $childrenNumberInput.val(childrenNumber); + }); + $('#minusChildren').click(function () { + if (childrenNumber > 0) { + childrenNumber--; + $childrenNumberInput.val(childrenNumber); + } + }); + // 婴儿 + $('#plusInfant').click(function () { + infantNumber++; + $infantNumberInput.val(infantNumber); + }); + $('#minusInfant').click(function () { + if (infantNumber > 0) { + infantNumber--; + $infantNumberInput.val(infantNumber); + } + }); + }) + + \ No newline at end of file From 27e09e327e2f468d72605c71c7485a200e7dffa8 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 25 May 2023 14:45:11 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E4=BA=BA=E6=95=B0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ah-info-page-form.php | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php index 2cabcd84..1f438369 100644 --- a/application/views/mobile_first/ah-info-page-form.php +++ b/application/views/mobile_first/ah-info-page-form.php @@ -10,9 +10,11 @@ Our must-dos/must-sees are…" style="height:80px;">
-

- Number in your group -

+

+ Number in your group +

@@ -42,14 +44,11 @@ Our must-dos/must-sees are…" style="height:80px;">