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

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

@ -961,6 +961,12 @@ class Information extends CI_Controller
}
}
//顶部全屏大图
if ($device == 'mobile') { //移动端读取移动大图
$meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture_mobile');
} else {
$meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture');
}
//非产品页面
$meta_product_code = get_meta($information->ic_id, 'meta_product_code');
@ -973,7 +979,7 @@ class Information extends CI_Controller
$author = $this->Operator_model->get_author_nikename($information->ic_author);
$data_H1['author'] = $author; //获取作者信息
$data_H1['ic_title'] = $information->ic_title;
$data_H1['ic_photo'] = $information->ic_photo;
$data_H1['ic_photo'] = $meta_addon_picture;//$information->ic_photo; 用额外设置的图片替代
$data_H1['breadcrumb_data'] = $breadcrumb_data;
$data_H1['ads_by_google'] = $ads_by_google;
$template_H1 = $this->load->view($template_path . '-h1', $data_H1, TRUE);
@ -998,7 +1004,7 @@ class Information extends CI_Controller
//信息推荐
$template_recommand = $recommand_information; //$this->recommand_information($information); 从外面传进来pc和移动只需要查一次减少数据库负担
// $template = str_replace('<!--@ARTICLENEXT@-->', $this->load->view($template_path . '-next', array('recommands' => $template_recommand), TRUE), $template);
$template = str_replace('<!--@ARTICLENEXT@-->', $this->load->view($template_path . '-next', array('recommands' => $template_recommand), TRUE), $template);
// //广告改叫tips防止被插件屏蔽
if (!empty($template_recommand['Tips Right TOP'])) {
// $template = str_replace('<!--@TIPS-RIGHT-TOP@-->', "<div class='right_brand_info'><aside>" . $template_recommand['Tips Right TOP']->it_content . "</aside></div>", $template);
@ -1027,33 +1033,12 @@ class Information extends CI_Controller
}
}
//顶部全屏大图
if ($device == 'mobile') { //移动端读取移动大图
$meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture_mobile');
} else {
$meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture');
}
$meta_addon_picture_url = get_meta($information->ic_id, 'meta_addon_picture_url');
if (!empty($meta_addon_picture)) {
if (!empty($meta_addon_picture_url)) {
// $template = str_replace('<!--@TOP-BANNER@-->', '<div class="detailtopbanner"><a href="' . $meta_addon_picture_url . '"> <img class="img-responsive" alt="' . $information->ic_title . '" src="' . $meta_addon_picture . '"></a></div>', $template);
} else {
// $template = str_replace('<!--@TOP-BANNER@-->', '<div class="detailtopbanner"><img class="img-responsive" alt="' . $information->ic_title . '" src="' . $meta_addon_picture . '">' . $template_TrainSearch . '</div>', $template);
}
}
//顶部视频
// $meta_news_video = get_meta($information->ic_id, 'meta_news_video');
// $meta_video_picture = get_meta($information->ic_id, 'meta_video_picture');
// if (!empty($meta_news_video) && !empty($meta_video_picture)) {
// $template = str_replace('<!--@TOP-VIDEO@-->', '<div class="detailtopbanner"><video autoplay="" controls="controls" id="bgvid" poster="' . $meta_video_picture . '" src="' . $meta_news_video . '" style="position: inherit;"> </video></div>', $template);
// }
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'));
} else {
$main_css_string = compress_css(GET_HTTP('https://origin-www.globalhighlights.com/css/gh-global.css'));
$main_css_string = compress_css(GET_HTTP('https://www.globalhighlights.com/css/gh-global.css'));
}
$template = str_replace('<!--@MAIN-CSS@-->', '<style type="text/css">' . $main_css_string . '</style>', $template);
//额外样式

@ -125,8 +125,8 @@ class html_optimize_lib
$file_path = $imagesPath . $img_src_urls['path'];
}
if (is_file($file_path)) {
$properties = getimagesize($file_path);//获取图片属性
if (!empty($properties[0]) && !empty($properties[1])) {
$properties = getimagesize($file_path);//获取图片属性读取失败返回false
if ($properties && !empty($properties[0]) && !empty($properties[1])) {
$image->width = $properties[0];
$image->height = $properties[1];
}

@ -1,10 +1,11 @@
<H3>完整的文中广告代码:</H3>
<h3>CH完整的文中广告代码</h3>
<div class="righttour"><a href="/beijing/"><img alt="Beijing trip" class="img-responsive" src="https://images.chinahighlights.com/allpicture/2015/10/0737277da892436db2906dd5_cut_800x500_10.jpg" width="800" height="500"></a>
<div class="info_reco_tours"><em>Recommended</em> Tour</div>
<div class="righttour"><a href="/tour/jiuzhaigoutour/jzg-1/"><img alt="Jiuzhaigou" class="img-responsive" src="//images.chinahighlights.com/allpicture/2020/08/826a518ea9fc46d4b5adcc38_cut_600x550_77.jpg" /></a>
<div class="rightinfo">
<h4><a href="/tour/jiuzhaigoutour/jzg-1/">Time-Smart Jiuzhaigou Discovery</a></h4>
<span class="rightdestination">3-Day Jiuzhaigou and Huanglong Highlights Tour</span> <span class="tourbutton"> <a href="/tour/jiuzhaigoutour/jzg-1/">View more <i class="fa fa-angle-right"></i></a></span></div>
<div class="rightname" style="
font-size: 25px;
"><a href="/beijing/">Beijing Travel Guide</a></div>
<span class="rightdestination">All things you need to know</span> <span class="tourbutton"> <a href="/beijing/">Read more <i class="fa fa-angle-right"></i></a></span></div>
</div>
<hr/>

@ -54,6 +54,16 @@
});
}
</script>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</head>
<body>

@ -22,6 +22,15 @@
-->
<link rel="shortcut icon" href="/bootstrap/img/glyphicons_290_skull.png">
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</head>
<body>

@ -103,6 +103,16 @@
}
</script>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</head>
<body>

@ -36,6 +36,15 @@
}
</script>
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</head>
<body>

@ -13,6 +13,15 @@
<script type="text/javascript" src="/js/modaldialog/jquery.modaldialog.js"></script>
<script type="text/javascript" src="/js/basic.js"></script>
<link rel="shortcut icon" href="/bootstrap/img/glyphicons_290_skull.png">
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?57ab7a81de0914994d5f2cf7986124f8";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</head>
<body>

@ -45,7 +45,7 @@
alt="Asiahighlights logo" class="asiahighlightslogo img-responsive"></a>
<div class="p_topnavigation">
<ul class="pctopnavi">
<li class="dropdown"><a class="p_topnavilink">Destinations<i aria-hidden="true" class="fa fa-caret-down"></i></a>
<li class="dropdown"><a class="p_topnavilink">Destinations</a>
<div class="chinatourspc dropdown-content">
<div class="inspirationinfo">
@ -70,7 +70,7 @@
</div>
</div>
</li>
<li class="dropdown"><a class="p_topnavilink">Inspiration<i aria-hidden="true" class="fa fa-caret-down"></i></a>
<li class="dropdown"><a class="p_topnavilink">Inspiration</a>
<div class="destinationspc dropdown-content">
<div class="inspirationinfo">
<div class="inspirationlist besttime">

@ -4,7 +4,7 @@
<div class="photoBlock300" style="
margin-bottom: 0;
margin-top: -10px;"><img alt="travelers' choice 2021" src="https://data.chinahighlights.com/image/aboutus/ta-travelers-choice-2021-150.jpg" loader="lazy" width="128" height="150" class="img-responsive" ></div>
<p>Since 1959 we've guided everyone ranging from US presidents, Australian Geographic and retired backpackers. Our goal is to create unique trips that take you off-the-beaten path, helping you discover China in a more authentic way. Our motto: "Discovery Your Way!"</p></div>
<p>Since 1998 we've guided everyone ranging from US presidents, Australian Geographic and retired backpackers. Our goal is to create unique trips that take you off-the-beaten path, helping you discover China in a more authentic way. Our motto: "Discovery Your Way!"</p></div>
<div class="feedback_content_right" style="width: 100%;">
<div class="feedback_content" style="box-shadow: 0px 0px 8px 2px #d1d1d1;">
<p><strong><?php echo $feedback_data['title'] ?></strong></p>

@ -59,7 +59,7 @@
<ul class="list-reset sidebar">
<li class="start-nav-item"><a href="/tour/top-china-tours/">Top 10 Tours</a></li>
<li class="start-nav-item"><a href="/tour/family-tours/">Family Tours</a></li>
<li class="start-nav-item"><a href="/tour/year.htm">China Tours 2021/2022</a></li>
<li class="start-nav-item"><a href="/tour/year.htm">China Tours 2022/2023</a></li>
<li class="start-nav-item"><a href="/tour/china-panda-tours/">Panda Tours</a></li>
<li class="start-nav-item"><a href="/greatwall/hiking.htm">Great Wall Hiking</a></li>
<li class="start-nav-item"><a href="/greatwall/tours/">Great Wall of China Tours</a></li>

@ -93,7 +93,7 @@
</li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/family-tours/">Family Tours</a>
</li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/year.htm">China Tours 2021/2022</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/year.htm">China Tours 2022/2023</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/china-panda-tours/">Panda Tours</a>
</li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/greatwall/hiking.htm">Great Wall

@ -1,6 +1,6 @@
<div class="pagetop">
<?php if (!empty($ic_photo)) { ?>
<img src="<?php echo 'https://images.globalhighlights.com'.$ic_photo; ?>"
<img src="<?php echo $ic_photo; ?>"
alt="<?php echo !empty($ic_title)?$ic_title:'H1 title globalhighlights mobile first template'; ?>" class="img-responsive">
<?php } ?>

@ -0,0 +1,373 @@
<?php if (!empty($recommands['Article A']) || !empty($recommands['Article B']) || !empty($recommands['Article C']) || !empty($recommands['Article D'])) { ?>
<h2 style="text-align: center;">Recommended Articles</h2>
<div class="swiper" id='recommendedArticles'>
<div class="swiper-wrapper">
<?php if (!empty($recommands['Article A'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article A']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article A']->mobile_photo) ? $recommands['Article A']->ic_photo_img : $recommands['Article A']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article A']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article A']->ic_url; ?>"> <?php echo $recommands['Article A']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Article A'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article A']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article A']->mobile_photo) ? $recommands['Article A']->ic_photo_img : $recommands['Article A']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article A']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article A']->ic_url; ?>"> <?php echo $recommands['Article A']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Article A'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article A']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article A']->mobile_photo) ? $recommands['Article A']->ic_photo_img : $recommands['Article A']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article A']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article A']->ic_url; ?>"> <?php echo $recommands['Article A']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Article A'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article A']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article A']->mobile_photo) ? $recommands['Article A']->ic_photo_img : $recommands['Article A']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article A']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article A']->ic_url; ?>"> <?php echo $recommands['Article A']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Article A'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article A']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article A']->mobile_photo) ? $recommands['Article A']->ic_photo_img : $recommands['Article A']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article A']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article A']->ic_url; ?>"> <?php echo $recommands['Article A']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Article A'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article A']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article A']->mobile_photo) ? $recommands['Article A']->ic_photo_img : $recommands['Article A']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article A']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article A']->ic_url; ?>"> <?php echo $recommands['Article A']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Article B'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article B']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article B']->mobile_photo) ? $recommands['Article B']->ic_photo_img : $recommands['Article B']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article B']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article B']->ic_url; ?>"> <?php echo $recommands['Article B']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Article C'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article C']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article C']->mobile_photo) ? $recommands['Article C']->ic_photo_img : $recommands['Article C']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article C']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article C']->ic_url; ?>"> <?php echo $recommands['Article C']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Article D'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article D']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article D']->mobile_photo) ? $recommands['Article D']->ic_photo_img : $recommands['Article D']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article D']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article D']->ic_url; ?>"> <?php echo $recommands['Article D']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Article E'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article E']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article E']->mobile_photo) ? $recommands['Article E']->ic_photo_img : $recommands['Article E']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article E']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article E']->ic_url; ?>"> <?php echo $recommands['Article E']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Article F'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article F']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article F']->mobile_photo) ? $recommands['Article F']->ic_photo_img : $recommands['Article F']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article F']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article F']->ic_url; ?>"> <?php echo $recommands['Article F']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Article G'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article G']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article G']->mobile_photo) ? $recommands['Article G']->ic_photo_img : $recommands['Article G']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article G']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article G']->ic_url; ?>"> <?php echo $recommands['Article G']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Article H'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Article H']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo empty($recommands['Article H']->mobile_photo) ? $recommands['Article H']->ic_photo_img : $recommands['Article H']->mobile_photo; ?>"
class="img-responsive" alt="<?php echo $recommands['Article H']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Article H']->ic_url; ?>"> <?php echo $recommands['Article H']->ic_title; ?> </a>
</div>
</div>
</div>
<?php } ?>
</div>
<div class="swiper-button-next"></div>
<div class="swiper-button-prev"></div>
<div class="swiper-pagination"></div>
</div>
<?php } ?>
<?php if (!empty($recommands['Tour A']) || !empty($recommands['Tour B']) || !empty($recommands['Tour C']) || !empty($recommands['Tour D'])) { ?>
<h2 style="text-align: center;">Recommended Tours</h2>
<div class="swiper" id='recommendedArticles'>
<div class="swiper-wrapper">
<?php if (!empty($recommands['Tour A'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Tour A']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Tour A']->mobile_photo; ?>"
class="img-responsive"
alt="<?php echo $recommands['Tour A']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Tour A']->ic_url; ?>"><?php echo $recommands['Tour A']->ic_title; ?></a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Tour B'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Tour B']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Tour B']->mobile_photo; ?>"
class="img-responsive"
alt="<?php echo $recommands['Tour B']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Tour B']->ic_url; ?>"><?php echo $recommands['Tour B']->ic_title; ?></a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Tour C'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Tour C']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Tour C']->mobile_photo; ?>"
class="img-responsive"
alt="<?php echo $recommands['Tour C']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Tour C']->ic_url; ?>"><?php echo $recommands['Tour C']->ic_title; ?></a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Tour D'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Tour D']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Tour D']->mobile_photo; ?>"
class="img-responsive"
alt="<?php echo $recommands['Tour D']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Tour D']->ic_url; ?>"><?php echo $recommands['Tour D']->ic_title; ?></a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Tour E'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Tour E']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Tour E']->mobile_photo; ?>"
class="img-responsive"
alt="<?php echo $recommands['Tour E']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Tour E']->ic_url; ?>"><?php echo $recommands['Tour E']->ic_title; ?></a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Tour F'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Tour F']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Tour F']->mobile_photo; ?>"
class="img-responsive"
alt="<?php echo $recommands['Tour F']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Tour F']->ic_url; ?>"><?php echo $recommands['Tour F']->ic_title; ?></a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Tour G'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Tour G']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Tour G']->mobile_photo; ?>"
class="img-responsive"
alt="<?php echo $recommands['Tour G']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Tour G']->ic_url; ?>"><?php echo $recommands['Tour G']->ic_title; ?></a>
</div>
</div>
</div>
<?php } ?>
<?php if (!empty($recommands['Tour H'])) { ?>
<div class="swiper-slide">
<div class="nextarticle">
<a href="<?php echo $recommands['Tour H']->ic_url; ?>" rel="nofollow">
<img src="https://data.chinahighlights.com/grey.gif" loader="lazy"
originalsrc="<?php echo $recommands['Tour H']->mobile_photo; ?>"
class="img-responsive"
alt="<?php echo $recommands['Tour H']->ic_title; ?>">
</a>
<div class="nextarticlename">
<a href="<?php echo $recommands['Tour H']->ic_url; ?>"><?php echo $recommands['Tour H']->ic_title; ?></a>
</div>
</div>
</div>
<?php } ?>
</div>
<div class="swiper-button-next"></div>
<div class="swiper-button-prev"></div>
<div class="swiper-pagination"></div>
</div>
<?php } ?>
<!-- Swiper JS -->
<script src="https://data.globalhighlights.com/js/swiper-bundle-7.0.9.min.js"></script>
<!-- Initialize Swiper -->
<script>
var swiper = new Swiper("#recommendedArticles", {
cssMode: true,
keyboard: true,
slidesPerView: 4,
navigation: {
nextEl: ".swiper-button-next",
prevEl: ".swiper-button-prev"
},
pagination: {
el: ".swiper-pagination",
clickable: true
}
});
</script>

@ -136,6 +136,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!--PC和移动端头部图-->
<!--@HEAD_1@-->
<div class="main_content">
@ -149,7 +150,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<section>
<!--PC正文-->
<!--@CUSTOM-CONENT@-->
</section>

@ -1,179 +0,0 @@
<h2 style="text-align: center;">Recommended Articles</h2>
<div class="swiper" id='recommendedArticles'>
<div class="swiper-wrapper">
<div class="swiper-slide">
<div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="How to Plan a 2-Week Itinerary to Visit Thailand and Cambodia" >
<div class="nextarticlename">
<a href="/thailand/2-week-trip-to-thailand-and-cambodia"> How to Plan a 2-Week Itinerary to Visit Thailand and Cambodia </a>
</div>
</div>
</div>
<div class="swiper-slide">
<div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="Best (and Worst) Time to Visit Thailand &amp; When is the Rainy Season" >
<div class="nextarticlename">
<a href="/thailand/best-time-to-visit"> Best (and Worst) Time to Visit Thailand &amp; When is the Rainy Season </a>
</div>
</div>
</div>
<div class="swiper-slide">
<div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="Top Things to Do in Thailand" >
<div class="nextarticlename">
<a href="/thailand/top-things-to-do"> Top Things to Do in Thailand </a>
</div>
</div></div>
<div class="swiper-slide"><div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="Food and Drinks in Chiang Rai" >
<div class="nextarticlename">
<a href="/thailand/chiang-rai/food-and-drinks"> Food and Drinks in Chiang Rai </a>
</div>
</div></div>
<div class="swiper-slide"><div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="Top Thai Historical Places " >
<div class="nextarticlename">
<a href="/thailand/top-historical-places"> Top Thai Historical Places </a>
</div>
</div></div>
<div class="swiper-slide"><div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="30 Famous Southeast Asian Foods That You Must Try At Least Once" >
<div class="nextarticlename">
<a href="/southeast-asia/top-dishes"> 30 Famous Southeast Asian Foods That You Must Try At Least Once </a>
</div>
</div></div>
<div class="swiper-slide"><div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="Best Places to Visit in Southeast Asia for First-Timers" >
<div class="nextarticlename">
<a href="/southeast-asia/top-places-to-visit"> Best Places to Visit in Southeast Asia for First-Timers </a>
</div>
</div></div>
<div class="swiper-slide"><div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="The 30 Most Beautiful Places in Southeast Asia: Don't Miss These!" >
<div class="nextarticlename">
<a href="/southeast-asia/most-beautiful-places"> The 30 Most Beautiful Places in Southeast Asia: Don't Miss These! </a>
</div>
</div></div>
</div>
<div class="swiper-button-next"></div>
<div class="swiper-button-prev"></div>
<div class="swiper-pagination"></div>
</div>
<h2 style="text-align: center;">Recommended Tours</h2>
<div class="swiper" id='recommendedArticles'>
<div class="swiper-wrapper">
<div class="swiper-slide">
<div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="How to Plan a 2-Week Itinerary to Visit Thailand and Cambodia" >
<div class="nextarticlename">
<a href="/thailand/2-week-trip-to-thailand-and-cambodia"> How to Plan a 2-Week Itinerary to Visit Thailand and Cambodia </a>
</div>
</div>
</div>
<div class="swiper-slide">
<div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="Best (and Worst) Time to Visit Thailand &amp; When is the Rainy Season" >
<div class="nextarticlename">
<a href="/thailand/best-time-to-visit"> Best (and Worst) Time to Visit Thailand &amp; When is the Rainy Season </a>
</div>
</div>
</div>
<div class="swiper-slide">
<div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="Top Things to Do in Thailand" >
<div class="nextarticlename">
<a href="/thailand/top-things-to-do"> Top Things to Do in Thailand </a>
</div>
</div></div>
<div class="swiper-slide"><div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="Food and Drinks in Chiang Rai" >
<div class="nextarticlename">
<a href="/thailand/chiang-rai/food-and-drinks"> Food and Drinks in Chiang Rai </a>
</div>
</div></div>
<div class="swiper-slide"><div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="Top Thai Historical Places " >
<div class="nextarticlename">
<a href="/thailand/top-historical-places"> Top Thai Historical Places </a>
</div>
</div></div>
<div class="swiper-slide"><div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="30 Famous Southeast Asian Foods That You Must Try At Least Once" >
<div class="nextarticlename">
<a href="/southeast-asia/top-dishes"> 30 Famous Southeast Asian Foods That You Must Try At Least Once </a>
</div>
</div></div>
<div class="swiper-slide"><div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="Best Places to Visit in Southeast Asia for First-Timers" >
<div class="nextarticlename">
<a href="/southeast-asia/top-places-to-visit"> Best Places to Visit in Southeast Asia for First-Timers </a>
</div>
</div></div>
<div class="swiper-slide"><div class="nextarticle">
<img src="https://images.chinahighlights.com/allpicture/2014/08/6d9644d4ab1d466083923cea_cut_600x550_251.jpg" class="img-responsive" alt="The 30 Most Beautiful Places in Southeast Asia: Don't Miss These!" >
<div class="nextarticlename">
<a href="/southeast-asia/most-beautiful-places"> The 30 Most Beautiful Places in Southeast Asia: Don't Miss These! </a>
</div>
</div></div>
</div>
<div class="swiper-button-next"></div>
<div class="swiper-button-prev"></div>
<div class="swiper-pagination"></div>
</div>
<!-- Swiper JS -->
<script src="https://unpkg.com/swiper/swiper-bundle.min.js"></script>
<!-- Initialize Swiper -->
<script>
var swiper = new Swiper("#recommendedArticles", {
cssMode: true,
keyboard: true,
slidesPerView: 4,
navigation: {
nextEl: ".swiper-button-next",
prevEl: ".swiper-button-prev"
},
pagination: {
el: ".swiper-pagination",
clickable: true
}
});
</script>

@ -113,11 +113,6 @@
<!--@TOP-BANNER@-->
<!--@TOP-VIDEO@-->
<!--@HEAD_1@-->
<div id="main_content_mobile">
<!--MOBILE 头部图-->

@ -1107,6 +1107,9 @@ class AlipayTradeService extends CI_Controller
}
}
$data["paytext"] = $this->payment_status();
$order_sn = empty($data['order_info']) ? 0 : $data['order_info']->COLI_SN;
$data['group_accout_info'] =
$this->Alipay_model->get_group_accout_info($order_sn, $data['note']->ALI_dealId);
echo json_encode($this->load->view('alipay_note_setting', $data, true));
}

@ -462,6 +462,9 @@ class PaymentService extends CI_Controller {
$data['order_info'] = $this->account_model->get_order($neworder_id->orderid, true, $neworder_id->ordertype, true);
}
}
$order_sn = empty($data['order_info']) ? 0 : $data['order_info']->COLI_SN;
$data['group_accout_info'] =
$this->account_model->get_group_accout_info($order_sn, $pn_txn_id);
echo json_encode($this->load->view('payment_gai_setting', $data, true));
}

@ -81,6 +81,30 @@ class Alipay_model extends CI_Model {
return $result;
}
/**
* 查找付款记录,用于判断是否已经审核。
* 已经审核过得记录不能修改订单号。
*/
public function get_group_accout_info($coli_sn, $pn_txn_id) {
// select * from BIZ_GroupAccountInfo where GAI_COLI_SN = 559007281 and GAI_AccreditNo = '91R84932UM059045C'
$info_sql = "select GAI_SN, GAI_State from BIZ_GroupAccountInfo
where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'
union
select GAI_SN, GAI_State from GroupAccountInfo
where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'";
$info_query = $this->HT->query($info_sql);
$info_result = $info_query->result();
$group_accout_info = array(
'GAI_SN' => 0,
'GAI_State' => 0
);
if (!empty($info_empty)) {
$group_accout_info = $info_result[0];
}
return $group_accout_info;
}
//获取收款记录(商务订单)
public function get_money_list($GAI_COLI_ID, $GAI_SQJE, $GAI_SQJECurrency) {
$sql = "SELECT GAI_SN,GAI_CusEmail,GAI_Memo

@ -97,6 +97,29 @@ class Online_payment_account_model extends CI_Model {
return $result;
}
/**
* 查找付款记录,用于判断是否已经审核。
* 已经审核过得记录不能修改订单号。
*/
public function get_group_accout_info($coli_sn, $pn_txn_id) {
$info_sql = "select GAI_SN, GAI_State from BIZ_GroupAccountInfo
where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'
union
select GAI_SN, GAI_State from GroupAccountInfo
where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'";
$info_query = $this->HT->query($info_sql);
$info_result = $info_query->result();
$group_accout_info = array(
'GAI_SN' => 0,
'GAI_State' => 0
);
if (!empty($info_empty)) {
$group_accout_info = $info_result[0];
}
return $group_accout_info;
}
public function if_biz_gai_exists($GAI_AccreditNo, $is_app=false, $coli_sn=null, $je=null, $type=null)
{
if ($is_app===true && $coli_sn!==null) {

@ -33,10 +33,19 @@
<dl class="dl-horizontal">
<div class="input-group">
<input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php //echo!empty($ALI_orderId) ? $ALI_orderId : $note->ALI_orderId; ?><?php echo !empty($new_order) ? $new_order : $old_order; ?>">
<input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php //echo!empty($ALI_orderId) ? $ALI_orderId : $note->ALI_orderId; ?><?php echo !empty($new_order) ? $new_order : $old_order; ?>"
<?php
if ($group_accout_info['GAI_State'] > 0) { ?>
disabled="disabled"
<?php } ?>
>
<span class="input-group-addon search-btn" onclick="show_order_modal('<?php echo $note->ALI_dealId; ?>', $('#pn_invoice').val(),'<?php echo $note->ALI_noticeTime; ?>','<?php echo $note->ALI_orderId; ?>')"></span>
</div>
<label class="text-danger">订单号形如: 160414408_B , B商务订单JJ160321052_T,T传统订单请务必加上后缀</label>
<?php if ($group_accout_info['GAI_State'] > 0) { ?>
<label class="text-danger">此项记录财务已审核,请联系财务先取消收款审核。</label>
<?php } ?>
<div style='display: none'><?php var_dump($group_accout_info); ?></div>
</dl>
<dl class="dl-horizontal">

@ -31,10 +31,17 @@
</dl>
<?php } ?>
<div class="input-group">
<input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo !empty($new_order) ? $new_order : $old_order; ?>" placeholder="输入订单号搜索匹配" >
<input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo !empty($new_order) ? $new_order : $old_order; ?>" placeholder="输入订单号搜索匹配"
<?php
if ($group_accout_info['GAI_State'] > 0) { ?>
disabled="disabled"
<?php } ?>
>
<span class="input-group-addon search-btn" onclick="show_gai_modal('<?php echo $note->OPN_SN; ?>', $('#pn_invoice').val())"></span>
</div>
<label class="text-danger">订单号形如: 160414408_B , B商务订单JJ160321052_T,T传统订单请务必加上后缀</label>
<div style='display: none'><?php var_dump($group_accout_info); ?></div>
<div style='display: none'><?php var_dump($order_info); ?></div>
<div>订单详细内容: </div>
<p>
<?php

@ -1286,11 +1286,15 @@ class Index extends CI_Controller {
} else {
$orderid_info = $this->analysis_orderid($data['note']->pn_invoice);
}
$data['pn_invoice'] = $pn_invoice ? $pn_invoice : $data['note']->pn_invoice;
if (!empty($orderid_info)) {
$orderid_info = json_decode($orderid_info);
$data['order_info'] = $this->Paypal_model->get_order($orderid_info->orderid, true, $orderid_info->ordertype);
}
$data['pn_invoice'] = $pn_invoice ? $pn_invoice : $data['note']->pn_invoice ;
$order_sn = empty($data['order_info']) ? 0 : $data['order_info']->COLI_SN;
$data['group_accout_info'] =
$this->Paypal_model->get_group_accout_info($order_sn, $data['note']->pn_txn_id);
echo json_encode($this->load->view('note_setting', $data, true));
return true;
}

@ -86,6 +86,30 @@ class Paypal_model extends CI_Model {
return $result;
}
/**
* 查找付款记录,用于判断是否已经审核。
* 已经审核过得记录不能修改订单号。
*/
public function get_group_accout_info($coli_sn, $pn_txn_id) {
// select * from BIZ_GroupAccountInfo where GAI_COLI_SN = 559007281 and GAI_AccreditNo = '91R84932UM059045C'
$info_sql = "select GAI_SN, GAI_State from BIZ_GroupAccountInfo
where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'
union
select GAI_SN, GAI_State from GroupAccountInfo
where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'";
$info_query = $this->HT->query($info_sql);
$info_result = $info_query->result();
$group_accout_info = array(
'GAI_SN' => 0,
'GAI_State' => 0
);
if (!empty($info_empty)) {
$group_accout_info = $info_result[0];
}
return $group_accout_info;
}
//获取收款记录(商务订单)
public function get_money_list($GAI_COLI_ID, $GAI_SQJE=null, $GAI_SQJECurrency=null) {
$je_sql = $GAI_SQJE===null ? " " : " and GAI_SQJE=? ";

@ -43,12 +43,21 @@
<dt>订单号</dt>
<dd>
<div class="input-group">
<input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo !empty($pn_invoice) ? $pn_invoice : $note->pn_invoice; ?>">
<input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo !empty($pn_invoice) ? $pn_invoice : $note->pn_invoice; ?>"
<?php
if ($group_accout_info['GAI_State'] > 0) { ?>
disabled="disabled"
<?php } ?>
>
<span class="input-group-btn">
<button class="btn btn-default" type="button" onclick="show_order_modal('<?php echo $note->pn_txn_id; ?>', 0, $('#pn_invoice').val())"><span class="glyphicon glyphicon-search"></span></button>
</span>
</div>
<label class="text-danger">订单号形如: 160414408_B , B商务订单JJ160321052_T,T传统订单请务必加上后缀</label>
<label class="text-danger">订单号形如: 160414408_BB商务订单JJ160321052_TT传统订单请务必加上后缀</label>
<?php if ($group_accout_info['GAI_State'] > 0) { ?>
<label class="text-danger">此项记录财务已审核,请联系财务先取消收款审核。</label>
<?php } ?>
<div style='display: none'><?php var_dump($group_accout_info); ?></div>
</dd>
</dl>

Loading…
Cancel
Save