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

hotfix/paypal-note
赵鹏 4 years ago
commit 33c2f5ab9f

@ -717,17 +717,15 @@ class Information extends CI_Controller
//非产品页面
/*
if (empty(get_meta($information->ic_id, 'meta_product_code'))) {
//信息推荐 暂时不用,未来用广告系统替代
$template_NEXT = $this->call_mobile_template_NEXT($template_path, $information->is_id);
$template = str_replace('<!--@ARTICLENEXT@-->', $template_NEXT, $template);
//$template_NEXT = $this->call_mobile_template_NEXT($template_path, $information->is_id);
//$template = str_replace('<!--@ARTICLENEXT@-->', $template_NEXT, $template);
$addthis_widget = $this->load->view($template_path . '-add-this', false, true);
$template = str_replace('<!--@ADDTHIS-WIDGET@-->', $addthis_widget, $template);
} else {
$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);
}
*/
//主样式表,内联模式
$main_css_string = compress_css(GET_HTTP('https://proxy-data.asiahighlights.com/css/mobile-first.css'));

@ -2268,7 +2268,7 @@
<?php } ?>
<?php } ?>
<?php if (in_array($this->config->item('site_code'), array('cht', 'ah', 'gm'))) { ?>
<?php if (in_array($this->config->item('site_code'), array('cht', 'gm'))) { ?>
<label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
<input type="checkbox" name="auto_update_amp"
id="auto_update_amp" <?php if ($information->amp_status === '2') {

@ -0,0 +1 @@
<script>document.addEventListener("DOMContentLoaded",()=>{setTimeout(function(){loadScriptByAsync("https://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-598408c3e2fb90c3")},5e3)});</script>

@ -144,7 +144,7 @@
<div class="siteSearch">
<form class="searchtextbox" id="searchbox_001281624266240652297:cl1fy1cxepi"
name="googlesreach" action="https://secure.chinahighlights.com/result.asp">
name="googlesreach" action="https://www.asiahighlights.com/sitesearch">
<input type="hidden" value="001281624266240652297:cl1fy1cxepi" name="cx">
<input type="hidden" value="FORID:9" name="cof">
<input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search"

@ -31,7 +31,7 @@
<noscript> <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-56CMWN3" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) -->
<header class="headerbar flex justify-start items-center top-0 left-0 right-0 pl2 pr4 pt2 md-pt0" id="header">
<div role="button" tabindex="0">
<div>
<i class="fa fa-bars navimenu topnaviarrowdown action--open"></i>
<a href="/"> <img src="https://data.asiahighlights.com/pic/ah-bottom-logo-mobile.png" alt="chinahighlights logo"
class="chinahighlightslogo img-responsive"></a>
@ -49,7 +49,7 @@
<div class="siteSearch">
<form id="searchbox_001281624266240652297:cl1fy1cxepi" name="googlesreach"
action="https://secure.chinahighlights.com/result.asp">
action="https://www.asiahighlights.com/sitesearch">
<input type="hidden" value="001281624266240652297:cl1fy1cxepi" name="cx">
<input type="hidden" value="FORID:9" name="cof">
<input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search" name="q">

Loading…
Cancel
Save