Merge branch 'master' of github.com:hainatravel/information-system

hotfix/paypal-note
赵鹏 4 years ago
commit e08504ee3e

@ -1223,6 +1223,18 @@ class Information extends CI_Controller
true);
$information->ic_content = str_replace('<!--@INQUIRY-FORM@-->', $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@-->', $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@-->', $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@-->', $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-BLOCK@-->', $breadcrumb_content, $information->ic_content);
//主样式表,内联模式
if (is_file('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')) {//主样式表,内联模式,优先读取本地,没有在从网络读取,为了加速

File diff suppressed because it is too large Load Diff

@ -146,7 +146,7 @@
</div>
</li>
<li class="dropdown"><a href="/about-us" class="p_topnavilink" >About Us</a></li>
<li class="dropdown" style=" padding-top: 15px"><a href="/contact-us" class="p_topnavilink contactbutton" >Contact Us</a></li>
<li class="dropdown" style=" padding-top: 18px"><a href="/contact-us" class="p_topnavilink contactbutton" >Contact Us</a></li>
<li class="dropdown" style=" margin-right: 0;">
<div class="siteSearch">
<form class="searchtextbox" id="searchbox_001281624266240652297:cl1fy1cxepi"

@ -0,0 +1,3 @@
<div class="infoimage visible-xs">
<img src="https://data.asiahighlights.com/image/about/covid-why-us-mobile.jpg" class="img-responsive" alt="travel with confidence despite covid-19">
</div>

@ -0,0 +1,3 @@
<div class="infoimage hidden-xs">
<img src="https://data.asiahighlights.com/image/about/covid-why-us-tour-detail-pc.jpg" class="img-responsive" alt="travel with confidence despite covid-19">
</div>

@ -0,0 +1,5 @@
<div class="all_width_content hidden-xs" style="height: 574px; background: #565656;">
<div class="all_width_content_1140">
<img src="https://data.asiahighlights.com/image/about/covid-why-us-tour-list-pc.jpg" alt="travel with confidence despite covid-19">
</div>
</div>

@ -269,7 +269,10 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
</div>
<div class="infotailor">
We are here to help you...<br> start planning your tailor-made global trip with 1-1 help from our travel advisors.
<div class="tourbutton"><a href="/forms/tailormade" >Create Your Trip </a></div>
</div>
<div id="footer">
<div class="footerContent">

@ -171,7 +171,7 @@ aria-label="festival">
<div class="contactwechat"> <a id="scrollAnchor"></a>
<img alt="global highlights' wechat code" height="100px" src="https://data.globalhighlights.com/image/aboutus/gh-whatsapp-qr-code.jpg" width="100px">
<div class="wechatinfo">Scan and add us on WhatsApp: <span class="wechatred">+86 15807734776</span>
Email: contact@globalhighlights.com
contact@globalhighlights.com
</div>
</div>
<p class="contactus">Or send an inquiry below</p>
@ -233,7 +233,10 @@ aria-label="festival">
})();
</script>
<div class="infotailor">
We are here to help you...<br> start planning your tailor-made China tour with 1-1 help from our travel advisors.
<div class="tourbutton"><a href="/forms/tailormade" >Create Your Trip </a></div>
</div>
<footer>
<div id="footer">

Loading…
Cancel
Save