Merge remote-tracking branch 'origin/master'

hotfix/paypal-note
尹诚诚 4 years ago
commit 1eee5dad9f

@ -626,6 +626,9 @@ class Information extends CI_Controller
$template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.chinahighlights.com/js/flatpickr.js"></script>', $template); $template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.chinahighlights.com/js/flatpickr.js"></script>', $template);
$inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code'=>$meta_product_code), true); $inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code'=>$meta_product_code), true);
$information->ic_content = str_replace('<!--@INQUIRY-FORM@-->', $inquiry_form_template, $information->ic_content); $information->ic_content = str_replace('<!--@INQUIRY-FORM@-->', $inquiry_form_template, $information->ic_content);
$breadcrumb_content = $this->load->view($template_path . '-breadcrumb', array('breadcrumb_data'=>$breadcrumb_data), true);
$information->ic_content = str_replace('<!--@BREADCRUMB-BLOCK@-->', $breadcrumb_content, $information->ic_content);
} }
//顶部全屏大图 //顶部全屏大图
if ($device == 'mobile') { //移动端读取移动大图 if ($device == 'mobile') { //移动端读取移动大图

@ -140,34 +140,69 @@ class Information_model extends CI_Model {
} }
/** /**
* 获取当前节点的到最顶层的路径,不包括当前节点 * 获取当前页面的面包屑,不包括当前节点
*/ */
function get_path_exclude_self($is_id, $path) { function get_path_exclude_self($is_id, $path) {
$site_code = $this->config->item('site_code'); $site_code = $this->config->item('site_code');
$path_query = $this->HT->query("select ic_id, is_id, ic_url,ic_url_title,ic_title,is_path $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 from infoStructures a inner join infoContents b on a.is_ic_id=b.ic_id
where is_id in ($path 0) and is_id <> ? and is_siteCode = ? order by is_level asc", array($is_id, $site_code)); where is_id in ($path 0) and is_id <> ? and is_siteCode = ? order by is_level asc", array($is_id, $site_code));
$path_result = $path_query->result(); $path_result = $path_query->result();
$path_list = []; $path_list = [];
$group_map = [
27800801 => [
'ic_url' => '/travelguide/culture/',
'ic_url_title' => 'Chinese Culture'
],
278008011 => [
'ic_url' => '/travelguide/',
'ic_url_title' => 'Travel Guide'
],
278008012 => [
'ic_url' => '/aboutus/',
'ic_url_title' => 'About Us'
],
278008013 => [
'ic_url' => '/citytour/',
'ic_url_title' => 'City Tours'
],
278008014 => [
'ic_url' => '/tour/',
'ic_url_title' => 'China Tours'
]
];
foreach ($path_result as $path_row) { foreach ($path_result as $path_row) {
$ic_url = $path_row->ic_url; $ic_url = $path_row->ic_url;
$ic_url_title = $path_row->ic_url_title; $ic_url_title = $path_row->ic_url_title;
if ($path_row->is_id === 278008010) { if ($path_row->is_level === 0) {
$ic_url = '/inspiration'; if (array_key_exists($path_row->is_id, $group_map)) {
$ic_url_title = 'inspiration title'; $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;
} }
$path_array = [
'ic_id' => $path_row->ic_id,
'is_id' => $path_row->is_id,
'ic_title' => $path_row->ic_title,
'ic_url' => $ic_url,
'ic_url_title' => $ic_url_title
];
$path_list[] = $path_array;
} }
return $path_list; return $path_list;

@ -0,0 +1,6 @@
<div class="infocategory">
<a href="/">Home</a>
<?php foreach ($breadcrumb_data as $index => $item) {?>
<a href="<?php echo $item['ic_url'] ?>" data-index="<?php echo $index ?>" data-is-id="<?php echo $item['is_id'] ?>"><?php echo $item['ic_url_title'] ?></a>
<?php }?>
</div>

@ -7,14 +7,12 @@
</div> </div>
<?php } ?> <?php } ?>
<div class="infocategory" style="display: none"> <div class="infocategory">
<a href="/">Home</a> <a href="/">Home</a>
<?php foreach ($breadcrumb_data as $item) {?> <?php foreach ($breadcrumb_data as $index => $item) {?>
<a href="<?php echo $item['ic_url'] ?>" data-is-id="<?php echo $item['is_id'] ?>"><?php echo $item['ic_url_title'] ?></a> <a href="<?php echo $item['ic_url'] ?>" data-index="<?php echo $index ?>" data-is-id="<?php echo $item['is_id'] ?>"><?php echo $item['ic_url_title'] ?></a>
<?php }?> <?php }?>
</div> </div>
<div class="infocategory"><?php echo !empty($infocategory)?$infocategory->ic_url_title:'infocategory'; ?></div>
<h1><?php echo !empty($ic_title)?$ic_title:'H1 title Chinahighlights mobile first template'; ?></h1> <h1><?php echo !empty($ic_title)?$ic_title:'H1 title Chinahighlights mobile first template'; ?></h1>
<!--<p class="subheadline">to do</p> --> <!--<p class="subheadline">to do</p> -->
<div class="authorupdate">By <strong><?php echo !empty($author)?$author->OPI_FirstName:'author nickname'; ?></strong>Updated <?php echo date("M. j, Y",time()); ?></div> <div class="authorupdate">By <strong><?php echo !empty($author)?$author->OPI_FirstName:'author nickname'; ?></strong>Updated <?php echo date("M. j, Y",time()); ?></div>

@ -182,7 +182,26 @@
</div> </div>
<div class="right_brand_info"> <div class="right_brand_info">
<a href="/aboutus/travel-with-confidence.htm"><img src="https://data.chinahighlights.com/image/tour-list/china-tour/ch-why-us-right-info.jpg" class="img-responsive" alt="Why choose China Highlights"></a> <div class="risk-free" style="background: #f6f6f6;width: calc(100% - 30px); margin: 70px 0 0 0;">
<div class="risk_free_tag"><img alt="Your Wellbeing is Our Priority" src="https://data.chinahighlights.com/image/tour-list/tour-detail-why-choose-us-tag-3.png" loader="lazy" originalsrc="https://data.chinahighlights.com/image/tour-list/tour-detail-why-choose-us-tag-3.png" width="100" height="100" style="opacity: 1; transition: opacity 0.5s ease-in-out 0s;"></div>
<div class="expatstourname">Your Wellbeing is Our Priority.</div>
<ul class="infolist">
<li>1-to-1 travel expert</li>
<li>Vaccinated guides</li>
<li>Private Rides</li>
</ul>
<div class="expatstourname">Your Trip is Perfectly Planned.</div>
<ul class="infolist">
<li>No crowds</li>
<li>Exclusive Exciting Experiences</li>
</ul>
<div class="expatstourname">Your Booking is Risk-Free.</div>
<ul class="infolist">
<li>No cancellation fee</li>
<li>Free changes</li>
</ul>
</div>
</div> </div>
<!-- <!--
<div class="right_tour"> <div class="right_tour">

Loading…
Cancel
Save