diff --git a/application/controllers/information.php b/application/controllers/information.php index fa0db104..4def86fb 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1042,6 +1042,13 @@ class Information extends CI_Controller } } } + + $why_us_covid_list_pc = $this->load->view( + $template_path . '-why-us-covid-list-pc', array(), true); + $information->ic_content = str_replace('', $why_us_covid_list_pc, $information->ic_content); + $why_us_covid_list_mobile = $this->load->view( + $template_path . '-why-us-covid-mobile', array(), true); + $information->ic_content = str_replace('', $why_us_covid_list_mobile, $information->ic_content); if (is_file('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')) {//主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 @@ -1068,15 +1075,7 @@ class Information extends CI_Controller //设置内容图片缓加载 $lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.chinahighlights.com/grey.gif'); $template = str_replace('', $lazy_content, $template); - - //替换内容中各种标签 - //$tag_why_us = $this->load->view($template_path . '-why-us', false, true); - // $template = str_replace('', $tag_why_us, $template); - - //Google广告代码 - //if (!empty(get_meta($information->ic_id, 'meta_google_ad_content'))) { - //$template = str_replace('', '', $template); - //} + //社媒分享图片 $full_ic_photo = ''; if (!empty($information->ic_photo)) { @@ -1223,6 +1222,39 @@ class Information extends CI_Controller true); $information->ic_content = str_replace('', $inquiry_form_template, $information->ic_content); } + // why-us 相关的标签 + $why_us_mobile = $this->load->view($template_path . '-why-us-mobile', false, true); + $information->ic_content = str_replace('', $why_us_mobile, $information->ic_content); + + $why_us_tour_detail_pc = $this->load->view($template_path . '-why-us-tour-detail-pc', false, true); + $information->ic_content = str_replace('', $why_us_tour_detail_pc, $information->ic_content); + + $why_us_tour_list_pc = $this->load->view($template_path . '-why-us-tour-list-pc', false, true); + $information->ic_content = str_replace('', $why_us_tour_list_pc, $information->ic_content); + + $breadcrumb_content = $this->load->view($template_path . '-breadcrumb', array('breadcrumb_data' => $breadcrumb_data), true); + $information->ic_content = str_replace('', $breadcrumb_content, $information->ic_content); + + // 动态加载反馈标签，第一个城市不足八条，使用第二城市数据。 + // HTLM:
+ // 解析结果：; Siem Reap,Bangkok + $feedback_array = []; + preg_match_all('^^', $information->ic_content, $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); + $feedback_content = $this->load->view( + $template_path . '-feedback-list', + array('feedback_list' => $feedback_list), + true); + $information->ic_content = str_replace( + $tag_name, + $feedback_content, + $information->ic_content); + } + } //主样式表，内联模式 if (is_file('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')) {//主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 @@ -1281,6 +1313,28 @@ 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' @@ -1501,6 +1555,18 @@ class Information extends CI_Controller } + //游船详细页 + if ($meta_ct_page_type == "cruisedetails"){ + $productType = $meta_ct_page_type; + $meta_ct_page_value = get_meta($information->ic_id, 'meta_ct_page_value'); + if (!empty($meta_ct_page_value)) { + $productCode = $meta_ct_page_value; + } + $dataCruise["shipname"]=$productCode; + $template_curisedetails = $this->load->view($template_path . '-cruisedetails-form', $dataCruise, TRUE); + $data["template_curisedetails"] = $template_curisedetails; + } + //表单页 if (in_array($meta_ct_page_type, array("customize", "contactus", "pagewithform","tourdetail"))) { $productType = $meta_ct_page_type; diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php index 3defcc51..a488d08a 100644 --- a/application/models/feedback_model.php +++ b/application/models/feedback_model.php @@ -7,6 +7,74 @@ class Feedback_model extends CI_Model { $this->HT = $this->load->database('HT', TRUE); } + /** + * 根据城市英文名查找最新八条反馈信息 + */ + function get_feedback_by_city_list($city_name_list) { + + $feedback_query = + $this->HT->query(" + select top 8 + 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 + left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 + where TAD_Content is not null and vci.cii2_name = ? + order by tai_getdate desc", + array($city_name_list[0])); + + $first_city_num = $feedback_query->num_rows(); + $feedback_result = $feedback_query->result(); + $feedback_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; + } + + $enough_count = 8 - $first_city_num; + + if ($enough_count > 0 && count($city_name_list) > 1) { + + $feedback_query = + $this->HT->query(" + select top ? + 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 + left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 + where TAD_Content is not null and vci.cii2_name = ? + order by tai_getdate desc", + array($enough_count, $city_name_list[1])); + $feedback_result = $feedback_query->result(); + + 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; + } + } + + return $feedback_list; + } + /** * 根据城市英文名查找最新一条反馈信息 */ diff --git a/application/third_party/train/models/BIZ_intel_train_model.php b/application/third_party/train/models/BIZ_intel_train_model.php index 07892940..e9a9c140 100644 --- a/application/third_party/train/models/BIZ_intel_train_model.php +++ b/application/third_party/train/models/BIZ_intel_train_model.php @@ -120,7 +120,11 @@ class BIZ_intel_train_model extends CI_Model { } public function get_allstations(){ - $sql = "SELECT * FROM TrainStation_intel where station_id != 1"; + // $sql = "SELECT * FROM TrainStation_intel where station_id != 1"; + //2022-4-20 zp 上面所有站点由于印度有8335个站点，循环读取系统吃不消，用下面的限制有车次的才显示。 + $sql = "SELECT * FROM TrainStation_intel + inner join TrainSearch_intel on tsi_ToStation = station_id + where station_id <> 1"; $query = $this->HT->query($sql); return $query->result(); } diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 757c6f4c..40dbbaab 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1,4 +1,5 @@ - +
@@ -555,17 +576,11 @@ @@ -575,8 +590,7 @@
-
+
@@ -585,10 +599,8 @@
-
- +
+ @@ -609,7 +621,8 @@ } else { $PcAmpChecked = ''; } ?> - + } + | | - amp_status === '1') { ?> - + amp_status === '2') { ?> - + amp_status === '0') { ?> - +
+ if ($embody == 1) { + echo 'border-color:green;'; + } + ?>" name="ic_title" value="ic_title; ?>">
链接标题
- +
链接地址 - + - + ic_sitecode == 'ch') { ?> - + ic_sitecode == 'gm') { ?> - + ic_sitecode == 'ah') { ?> - +
- +
- ic_sitecode == 'ct' || $information->ic_sitecode == 'chinatravel' ) { ?> + ic_sitecode == 'ct' || $information->ic_sitecode == 'chinatravel') { ?>
- +
@@ -728,27 +715,22 @@
- + - +
- +
- +
- +
@@ -757,50 +739,30 @@
- +
- +
- +
- +
-
+
+
+ + +
-
- - -
+
+ + +
-
- - +
+ + +
-
ic_sitecode == 'chinatravel') { - ?> -
-
- - -
-
- - +
+
+ + -
-
- - -
- -
- - -
- -
- - - - - - - - - - - - - - - - - +
+
+ + +
+ +
+ + +
+ +
+
+
+ + 1.点击生成游船总数据文件  2.点击生成当前页面游船数据文件 + +
+
+ + + + + + + + + + + + + + + + +

@@ -1002,32 +947,21 @@ - +
@@ -1036,158 +970,103 @@
- +
- +
- +
ic_sitecode == 'cht' || $information->ic_sitecode == "ct") { - ?> + ?>
"> + if ($information->ic_ht_area_type != 'c' && $information->ic_sitecode != "ct") { + echo 'hidden'; + } ?>"> - +
- -
+ if ($information->ic_ht_area_type == 'c') { + echo 'col-sm-4'; + } else { + echo 'col-sm-9'; + } ?>">
@@ -1195,28 +1074,24 @@
$vin) { - if (in_array($information->is_id, explode(",", $vin->is_path)) && $vin->status == 1 && $vin->id != $information->is_id + if ( + in_array($information->is_id, explode(",", $vin->is_path)) && $vin->status == 1 && $vin->id != $information->is_id ) { $children_cnt++; } } echo ""; if ($children_cnt > 0) { - ?> + ?>
+
- - + - +
- +
- +
- -
@@ -1341,87 +1178,54 @@
- +
- +
-
- +
@@ -1434,18 +1238,11 @@
- +
'实用信息', 'culture' => '文化', 'top10' => 'TOP10', + 'lifestyle' => '生活方式', ); ?>
+
ic_ht_area_type == 'err') { ?>
- +
@@ -1587,66 +1354,38 @@
- +
- +
- +
- +
@@ -1654,14 +1393,9 @@
+
- +
+ + + +
- +
- +
- +
- +
-
+
+ - + - ic_photo, '//') === false) { - $list_picture = $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg'; - } else { - $list_picture = $information->ic_photo; - } + ic_photo, '//') === false) { + $list_picture = $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg'; + } else { + $list_picture = $information->ic_photo; + } ?> - +
- +
-
+
- - 绑定 - + + 绑定 +
@@ -2204,18 +1826,15 @@ }
-
+
-
@@ -2223,10 +1842,8 @@
-
@@ -2239,9 +1856,8 @@ $value) { $value == $information->ic_type ? $select_str = 'selected' : $select_str = ''; ?> - - value=""> + @@ -2250,19 +1866,16 @@ $value) { $value == $information->ic_template ? $select_str = 'selected' : $select_str = ''; ?> - - value=""> + @@ -2284,17 +1897,15 @@ $select_str = 'selected'; } } ?> - - value="OPI_Code; ?>">OPI_Name; ?> + a_id == $information->ic_author) ? $select_str = 'selected' : $select_str = ''; ?> - - value="a_id; ?>">a_name; ?> + @@ -2307,36 +1918,32 @@
- config->item('site_code'), array('ch', 'cht', 'gm', 'ah', 'gh', 'ct','chinatravel'))) { ?> + config->item('site_code'), array('ch', 'cht', 'gm', 'ah', 'gh', 'ct', 'chinatravel'))) { ?> -
- + \ No newline at end of file diff --git a/application/views/mobile_first/ah-feedback-list.php b/application/views/mobile_first/ah-feedback-list.php new file mode 100644 index 00000000..62723006 --- /dev/null +++ b/application/views/mobile_first/ah-feedback-list.php @@ -0,0 +1,19 @@ +
+

What Our Customers Said

+
+
+ + + + $feedback) {?> + + + + +
+
+ +
,
+
+
+
\ No newline at end of file diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index 01f7e72d..7a5c4a2a 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -1,12 +1,16 @@
-

For a quick conversation, simply reach us via WhatsApp:

-
asia highlights' wechat code +

For a quick conversation, simply reach us via WhatsApp:

+
asia highlights' wechat code
+86 15807734776
Email: contact@asiahighlights.com
-

Send Us an Inquiry Now

+

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

  • About Us
    • -
  • Contact Us
    • +
  • Contact Us
  • -
    Yi Peng Festival inThailand will be observed on November 8th-9th, 2022. Reserve the tickets...
    +
    Yi Peng Festival in Thailand will be observed on November 8th-9th, 2022. Reserve the tickets...
    @@ -180,6 +187,8 @@
    • +
    Create My Trip +
    @@ -187,11 +196,10 @@ -
    - We are here to help you...
    Start planning your tailor-made Asia tour with 1-1 + We are here to help you...
    Start planning your tailor-made tour with 1-1 help from our travel advisors. Create My Trip @@ -199,6 +207,48 @@
    + +
    +

    The Asia Highlights Experience

    + +
    + + + + + + + + + +
    +
    + 1-to-1 Expert Planning +

    1-to-1 Expert Planning

    +

    Your tour will be tailor-made to suit you by a destination expert. Your personal travel advisor will always reply within 24 hours.

    +
    +     		+
    + Personal Journeys +

    Personal Journeys

    +

    Enjoy having your own personal local guide and ride. Explore destinations at your own pace. Have as much flexibility as possible.

    +
    +     		+
    + Authentic Experiences +

    Authentic Experiences

    +

    Go beyond the sightseeing. Understand the destinations by practicing the local culture and interacting with local people.

    +
    +     		+
    + One-Stop Service +

    One-Stop Service

    +

    Leave all the booking work to us, including international and internal transportation, visas, hotels, meals, and activities.

    +
    +
    +
    + +
    diff --git a/application/views/mobile_first/ah-why-us-mobile.php b/application/views/mobile_first/ah-why-us-mobile.php new file mode 100644 index 00000000..812d897b --- /dev/null +++ b/application/views/mobile_first/ah-why-us-mobile.php @@ -0,0 +1,3 @@ +
    +travel with confidence despite covid-19 +
    \ No newline at end of file diff --git a/application/views/mobile_first/ah-why-us-tour-detail-pc.php b/application/views/mobile_first/ah-why-us-tour-detail-pc.php new file mode 100644 index 00000000..74636ccf --- /dev/null +++ b/application/views/mobile_first/ah-why-us-tour-detail-pc.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/application/views/mobile_first/ah-why-us-tour-list-pc.php b/application/views/mobile_first/ah-why-us-tour-list-pc.php new file mode 100644 index 00000000..de29484f --- /dev/null +++ b/application/views/mobile_first/ah-why-us-tour-list-pc.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index 9d7e804e..4eef44b3 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -24,7 +24,14 @@ f.parentNode.insertBefore(j, f); })(window, document, 'script', 'dataLayer', 'GTM-56CMWN3'); + + @@ -42,7 +49,7 @@
    -
    Yi Peng Festival inThailand will be observed on November 8th-9th, 2022. Reserve the tickets...
    +
    Yi Peng Festival in Thailand will be observed on November 8th-9th, 2022. Reserve the tickets...