diff --git a/application/controllers/information.php b/application/controllers/information.php index 4def86fb..0aa6358d 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -689,6 +689,9 @@ class Information extends CI_Controller array('information' => $information), true); $template = str_replace('', $article_top_image_content, $template); + + $info_page_form_content = $this->load->view($template_path . '-info-page-form', false, true); + $information->ic_content = str_replace('', $info_page_form_content, $information->ic_content); } else { $template = str_replace('', '', $template); $inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code' => $meta_product_code), true); @@ -1050,6 +1053,8 @@ class Information extends CI_Controller $template_path . '-why-us-covid-mobile', array(), true); $information->ic_content = str_replace('', $why_us_covid_list_mobile, $information->ic_content); + $info_page_form_content = $this->load->view($template_path . '-info-page-form', false, true); + $information->ic_content = str_replace('', $info_page_form_content, $information->ic_content); if (is_file('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')) {//主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')); @@ -1153,7 +1158,19 @@ class Information extends CI_Controller $data['meta_addon_picture_url'] = get_meta($information->ic_id, 'meta_addon_picture_url'); } - $breadcrumb_data = $this->Information_model->get_path_exclude_self($information->is_id, $information->is_path); + // AH Home 下层节点名称和链接映射 + $group_map = [ + 278002667 => [ + 'ic_url' => '/destinations', + 'ic_url_title' => 'Destinations' + ], + 278008885 => [ + 'ic_url' => '/about-us', + 'ic_url_title' => 'About us' + ] + ]; + + $breadcrumb_data = $this->Information_model->get_breadcrumb_data($information->is_id, $information->is_path, $group_map); $ads_by_google = !empty(get_meta($information->ic_id, 'meta_google_ad_article')); $data['ads_by_google'] = $ads_by_google; $author = $this->Operator_model->get_author_nikename($information->ic_author); //获取作者信息 @@ -1211,9 +1228,6 @@ class Information extends CI_Controller if (empty($meta_product_code)) { $addthis_widget = $this->load->view($template_path . '-add-this', false, true); $template = str_replace('', $addthis_widget, $template); - - $breadcrumb_content = $this->load->view($template_path . '-breadcrumb', array('breadcrumb_data' => $breadcrumb_data), true); - $information->ic_content = str_replace('', $breadcrumb_content, $information->ic_content); } else { $template = str_replace('', '', $template); $inquiry_form_template = $this->load->view( @@ -1232,8 +1246,8 @@ class Information extends CI_Controller $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); + $info_page_form_content = $this->load->view($template_path . '-info-page-form', false, true); + $information->ic_content = str_replace('', $info_page_form_content, $information->ic_content); // 动态加载反馈标签，第一个城市不足八条，使用第二城市数据。 // HTLM:
diff --git a/application/models/information_model.php b/application/models/information_model.php index e323cd20..706c9c04 100644 --- a/application/models/information_model.php +++ b/application/models/information_model.php @@ -221,6 +221,51 @@ class Information_model extends CI_Model return $path_list; } + /** + * 获取当前页面的面包屑，不包括当前节点 + */ + function get_breadcrumb_data($is_id, $path, $group_map) + { + $path_query = $this->HT->query("select + ic_id, is_id, ic_url,ic_url_title,ic_title,is_path,is_level,ic_status + from infoStructures a inner join infoContents b on a.is_ic_id=b.ic_id + where is_id in ($path 0) and is_id <> ? order by is_level asc", array($is_id)); + $path_result = $path_query->result(); + $path_list = []; + + foreach ($path_result as $path_row) { + + $ic_url = $path_row->ic_url; + $ic_url_title = $path_row->ic_url_title; + + if ($path_row->is_level === 0) { + if (array_key_exists($path_row->is_id, $group_map)) { + $top_group = $group_map[$path_row->is_id]; + $path_array = [ + 'ic_id' => $path_row->ic_id, + 'is_id' => $path_row->is_id, + 'ic_title' => $path_row->ic_title, + 'ic_url' => $top_group['ic_url'], + 'ic_url_title' => $top_group['ic_url_title'] + ]; + $path_list[] = $path_array; + } + } else if ($path_row->ic_status === 1) { + + $path_array = [ + 'ic_id' => $path_row->ic_id, + 'is_id' => $path_row->is_id, + 'ic_title' => $path_row->ic_title, + 'ic_url' => $path_row->ic_url, + 'ic_url_title' => $path_row->ic_url_title + ]; + $path_list[] = $path_array; + } + } + + return $path_list; + } + //根据路径获取某一级别节点详细页 function get_detail_by_path($path, $level) { diff --git a/application/third_party/order/controllers/confirm.php b/application/third_party/order/controllers/confirm.php index cd6937a9..7d2b4d90 100644 --- a/application/third_party/order/controllers/confirm.php +++ b/application/third_party/order/controllers/confirm.php @@ -10,7 +10,7 @@ class Confirm extends CI_Controller { $this->load->model('Order_model'); } - //site_code默认是空，ct的站点需要传值 + // site_code 默认是空，CT、AH 网站需要传值 public function index($COLI_SN = false, $visitor_link = false, $token = false,$site_code='') { $data = array(); if (empty($COLI_SN) || strtoupper(md5($visitor_link)) != strtoupper($token)) { diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php new file mode 100644 index 00000000..618949e2 --- /dev/null +++ b/application/third_party/order/views/ah/confirm_order.php @@ -0,0 +1,896 @@ + + + + + + + + Asia Highlights! Please complete and submit the information. + + + + + + + + + + +
+ +
+ +
+
+
+ +
+

Thanks for booking with Asia Highlights!

+

Please complete and submit the information below.

+ +
+
+
+
+
+ +
+

Passenger Information (we need passport info for all the group members)
+ Please ensure the details you provide are correct, as stated in your passport. We use this information to book all your hotels and transportation. If the name you provide are incorrect, you would not be able to board your flight or trains in China, and therefore reissuing of tickets would be at your expense! +

+ +
+ + + +
+ +
+ +
+
+ +
+
+
+
+
+ +
+
/
+
+ +
+
+
+
+
+
+ +
+ + +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ + + +
+
+
+ + + + + +
+ + +
+
+ +
+ + Add a passenger + +
+
+ +
+
+ + Contact phone no.: + +
+
+ +
+
+ +
+
+
+
+ COLI_CustomerType != 44003) { ?> +
+
+ + Home Address: + + + +
+
+ + +
+
+
+ +
+
+
+ +
+

Flight Information (please skip this if your don’t need airport pick up and drop off service)

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

+ Special Request +

+
+ +
+
+
+ +
+
+
+
+ +
+
+
+ COLI_CustomerType != 44003) { ?> +
+
+
+ +
+

+ Emergency Contact Information + (in case an unlikely event happens when you are traveling) +

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

+ Insurance Information +

+
+ +
+
+
+ +
+
+
+
+ +
+
+
+ + +
+ + + + + + + +
+ +
+
Thanks,yours OPI_FirstName; ?>
+
+ +
+
+
+ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index 46ba22fc..bfeae234 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -15,11 +15,17 @@ class Index extends CI_Controller private $Log_Client; private $logstore=array('cht'=>'globalhoghlights' ,'ah'=>'asiahighlights' + ,'gh'=>'globalhighlights' ,'ct'=>'chinatravel' ,'yz'=>'yangtzeriver' ,'gl'=>'guilinchina' ,'sht'=>'shanghaihighlights' ,'gm'=>'chinarundreisen' + ,'jp'=>'arachina' + ,'ru'=>'chinahighlights_ru' + ,'it'=>'viaggio-in-cina' + ,'vac'=>'viaje-a-china' + ,'vc'=>'voyageschine' );//站点日志存储库，每个网站对应一个 diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 40dbbaab..f2e7fa5e 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -861,6 +861,9 @@ +
diff --git a/application/views/mobile_first/ah-h1.php b/application/views/mobile_first/ah-h1.php index 424939b7..35cf7385 100644 --- a/application/views/mobile_first/ah-h1.php +++ b/application/views/mobile_first/ah-h1.php @@ -7,7 +7,7 @@ alt="ic_title)?$information->ic_title:'H1 title asiahighlights mobile first template'; ?>" class="img-responsive">
- +
- Well-Selected Local Guides -

Well-Selected Local Guides

-

Knowledgeable, enthusiastic, and attentive — your personal local guides will share interesting stories, insider information, and even create unexpected highlights!

+ Authentic Experiences +

Authentic Experiences

+

Discover the hidden gems. Experience local culture by practicing it. Try new and exciting activities, and unveil the stories behind the sights and people.

- Authentic Experiences -

Authentic Experiences

-

Discover the hidden gems. Experience local culture by practicing it. Try new and exciting activities, and unveil the stories behind the sights and people.

+ Well-Selected Local Guides +

Well-Selected Local Guides

+

Knowledgeable, enthusiastic, and attentive — your personal local guides will share interesting stories, insider information, and even create unexpected highlights!

diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index cc0c19c0..c82de353 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -237,20 +237,21 @@

Enjoy your personal local guide and ride. Explore destinations at your own pace. Have unparalleled flexibility, which is impossible on a group tour.

+
- Well-Selected Local Guides -

Well-Selected Local Guides

-

Knowledgeable, enthusiastic, and attentive — your personal local guides will share interesting stories, insider information, and even create unexpected highlights!

-
- - -
- Authentic Experiences + Authentic Experiences

Authentic Experiences

Discover the hidden gems. Experience local culture by practicing it. Try new and exciting activities, and unveil the stories behind the sights and people.

+ +
+ Well-Selected Local Guides +

Well-Selected Local Guides

+

Knowledgeable, enthusiastic, and attentive — your personal local guides will share interesting stories, insider information, and even create unexpected highlights!

+
+ diff --git a/application/views/mobile_first/chinatravel-pc.php b/application/views/mobile_first/chinatravel-pc.php index 68873923..057e8b7a 100644 --- a/application/views/mobile_first/chinatravel-pc.php +++ b/application/views/mobile_first/chinatravel-pc.php @@ -7,7 +7,7 @@ - + @@ -70,13 +70,13 @@
  • Destinations