diff --git a/application/controllers/information.php b/application/controllers/information.php index 1e5133eb..ec0fafad 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() @@ -1094,7 +1088,7 @@ class Information extends CI_Controller } } } - $site_money = $this->currency->calc_show_price($site_money); + $site_money = $this->currency->calc_show_price($price_number); //把金额格式化为带有逗号(,)方便阅读，如 12,345 $price_number = is_numeric($price_number) ? number_format($site_money) : $price_number; if (!empty($price_number)) { @@ -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..e270ad81 100644 --- a/application/models/feedback_model.php +++ b/application/models/feedback_model.php @@ -14,7 +14,7 @@ class Feedback_model extends CI_Model { $feedback_query = $this->HT->query(" - select top 20 + 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 @@ -23,24 +23,63 @@ class Feedback_model extends CI_Model { $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 = [ + $feedback_count = COUNT($feedback_list); + if (!in_array($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; + ]; + $feedback_list[] = $feedback; + $customer_id_list[] = $feedback_row->tai_customerid; + } } 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 (!in_array($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; + } + /** * 根据城市英文名查找最新八条反馈信息 */ @@ -48,7 +87,7 @@ class Feedback_model extends CI_Model { $feedback_query = $this->HT->query(" - select top 20 + select top 40 tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name from Eva_TAInfo left join Eva_TADetail on TAD_TAI_SN=TAI_SN @@ -60,22 +99,27 @@ class Feedback_model extends CI_Model { $first_city_num = $feedback_query->num_rows(); $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 = [ - '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; + $feedback_count = COUNT($feedback_list); + + if (!in_array($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; + } } - $enough_count = 20 - $first_city_num; + $enough_count = 40 - $first_city_num; if ($enough_count > 0 && count($city_name_list) > 1) { @@ -94,15 +138,19 @@ class Feedback_model extends CI_Model { foreach ($feedback_result as $feedback_row) { $createdOn = new DateTime($feedback_row->tai_getdate); $createdOnString = $createdOn->format('M Y'); - - $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; + $feedback_count = COUNT($feedback_list); + + if (!in_array($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; + } } } diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php index 217ecf92..d5c7f9ec 100644 --- a/application/views/mobile_first/ah-info-page-form.php +++ b/application/views/mobile_first/ah-info-page-form.php @@ -6,13 +6,15 @@

Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.

- - + +
+

+ When would you travel? +

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