Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
hotfix/paypal-note
LiaoYijun 4 years ago
parent cf4640f5f9 c60ccebc20
commit 56c81240ab
5 changed files with 88 additions and 18 deletions
Show Stats Download Patch File Download Diff File

2
application/controllers/information.php
Unescape Escape View File

@ -940,12 +940,14 @@ class Information extends CI_Controller
//非产品页面
$data["PRODUCTJS"] = "";
$data["ISPRODUCT"] = "no"; //判断是否是产品页
$template_path = 'mobile_first/' . $this->config->item('site_code');
$data["addthis_widget"] = "";
if (empty(get_meta($information->ic_id, 'meta_product_code'))) {
$data["addthis_widget"] = $this->load->view($template_path . '-add-this', false, true); //社媒代码addthis
} else {
// $data["PRODUCTJS"] = '<script src="https://data.chinatravel.com/js/mobile-first/flatpickr.js"></script>';
$data["ISPRODUCT"] = "yes";
}
//顶部全屏大图

1
application/third_party/trainsystem/controllers/innerTrainSearch.php vendored
Unescape Escape View File

@ -597,6 +597,7 @@ class innerTrainSearch extends CI_Controller{
$return_data->result[$i]->SeatList[$j] = new StdClass();
$return_data->result[$i]->SeatList[$j]->SeatCode = $key;
$return_data->result[$i]->SeatList[$j]->SeatName = get_name($key);
$return_data->result[$i]->SeatList[$j]->SeatNameCn = get_name_cn($key); //中文名称
$value = str_replace('¥','',$value);
if(in_array($key, array('A3', 'A4', 'A5', 'A6', '3', '4', '5', '6', 'A', 'F', 'S','YDW','EDW'))){

50
application/third_party/trainsystem/helpers/train_helper.php vendored
Unescape Escape View File

@ -314,5 +314,55 @@ function get_name($seat_code){
}
}
function get_name_cn($seat_code){
if($seat_code){
switch($seat_code){
case 'O' :
return '二等座';
case 'A8' :
return '二等座';
case 'A9' :
return '商务座';
case 'P' :
return '特等座';
case 'M' :
return '一等座';
case 'A7' :
return '一等座';
case 'A6' :
return '高级软卧';
case 'A' :
return '高级软卧';
case '5' :
return '硬卧';
case 'S' :
return '软卧';
case 'A4' :
return '软卧';
case 'F' :
return '动卧';
case 'A3' :
return '硬卧';
case 'A2' :
return '软座';
case 'A1' :
return '硬座';
case 'Q' :
return '观光座';
case 'H' :
return '其它';
case 'WZ' :
return '无座';
case '13' :
return '无座';
case 'YDW' :
return '一等卧';
case 'EDW' :
return '二等卧';
}
}
}
?>

22
application/views/mobile_first/chinatravel-pc.php
Unescape Escape View File

@ -43,7 +43,7 @@
<li><i class="fa fa-phone" aria-hidden="true"></i><strong>86-773-286-5632</strong> (Intl rates apply)<span class="t-arrow tag hidden"></span></li>
<li><a href="/forms/contactus" class="btn btn-contactus"><i class="fa fa-user-circle-o" aria-hidden="true"></i>Contact Us</a></li>
<li>
<form id="cse-search-box" name="googlesreach" action="https://www.chinatravel.com/search-result.asp">
<form id="cse-search-box" name="googlesreach" action="/search">
<input type="hidden" name="cx" value="016808570474272112209:2xv5z3olaus" />
<input type="hidden" name="cof" value="FORID:11" />
<div class="relative">
@ -93,13 +93,14 @@
</span>
</ul>
</li>
<li><a href="/guide">China Guide<i class="fa fa-angle-down" aria-hidden="true"></i></a>
<li><a href="/guide">Travel Guide<i class="fa fa-angle-down" aria-hidden="true"></i></a>
<ul>
<span class="container">
<li><a href="/guide/how-to-plan-a-trip-to-china">Plan Your China Trip</a></li>
<li><a href="/guide/best-time-to-go-china">China Weather </a></li>
<li><a href="/guide/transport">China Transport</a></li>
<li><a href="/guide/visa">China Visas</a></li>
<li><a href="/guide/visa">China Visas</a></li>
<li><a href="/map">China Maps</a></li>
<li><a href="/giant-panda">Giant Panda</a></li>
<li><a href="/great-wall-of-china">Great Wall Of China</a></li>
</span>
</ul>
@ -117,7 +118,12 @@
</ul>
</li>
<li><a href="/forms/customize">Create My Trip</a></li>
<li><a href="/about-china-travel">About Us<i class="fa fa-angle-down" aria-hidden="true"></i></a>
<li><a href="/china-trains">Trains<i class="fa fa-angle-down" aria-hidden="true"></i></a>
<ul>
<span class="container">
<li><a href="/china-flights">Flights</a></li>
</span>
</ul>
</li>
</ul>
</nav>
@ -212,7 +218,7 @@
<div class="flex-row">
<div class="footer-left vw-width">
<div class="footer-list">
<p> <a rel="nofollow" href="/forms/contactus">Contact Us</a> <a rel="nofollow" href=" /about-china-travel">About Us</a> <a rel="nofollow" href="/about-china-travel/china-travel-terms-conditions.html"> Terms and Conditions</a> <a rel="nofollow" href="/china-travel-faq/">FAQ</a> <a rel="nofollow" href="/feedback/">Testimonial</a> <a rel="nofollow" href="/china-train">Trains</a> <a rel="nofollow" href="/about-china-travel/online-job.html">Work for Us</a> </p>
<p> <a rel="nofollow" href="/forms/contactus">Contact Us</a> <a rel="nofollow" href="/about-us">About Us</a> <a rel="nofollow" href="/about-us/terms"> Terms and Conditions</a> <a rel="nofollow" href="/about-us/privacy">Privacy</a> <a rel="nofollow" href="/about-us/online-job">Work for Us</a> </p>
</div>
<div class="footer-list">
<img src="https://data.chinatravel.com/images/grey.gif" loader="lazy" originalsrc="https://data.chinatravel.com/images/icon/partner-logo.png" alt="partner logo" class="img-responsive" width="500" height="33" />
@ -280,6 +286,10 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c<a?"":e(parseInt(c/a)))+((c=c%a
gtag('js', new Date());
gtag('config', 'AW-823612164');
</script>
<?php if ($ISPRODUCT=="no") { ?>
<!-- Google AD-->
<script data-ad-client="ca-pub-3275214174607898" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<?php } ?>
<!-- End Google -->
<!--@IN-ARTICLE-GOOGLE@-->
<!--@ADDTHIS-WIDGET@--><?php echo $addthis_widget ?>

31
application/views/mobile_first/chinatravel.php
Unescape Escape View File

@ -50,10 +50,10 @@
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-1" aria-owns="submenu-1" href="/tour">China Tours</a><a class="menu__link" href="/tour">China Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-2" aria-owns="submenu-2" href="/citytour">Destinations</a><a class="menu__link" href="/citytour">Destinations</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-3" aria-owns="submenu-3" href="/daytrip">Day Trips</a><a class="menu__link" href="/daytrip">Day Trips</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-4" aria-owns="submenu-4" href="/guide">China Guide</a><a class="menu__link" href="/guide">China Guide</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-4" aria-owns="submenu-4" href="/guide">Travel Guide</a><a class="menu__link" href="/guide">Travel Guide</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-5" aria-owns="submenu-5" href="/culture">Culture</a><a class="menu__link" href="/culture">Culture</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/forms/customize">Create My Trip</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/about-china-travel">About Us</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-6" aria-owns="submenu-6" href="/china-trains">Trains</a><a class="menu__link" href="/china-trains">Trains</a></li>
</ul>
<!-- China Tours -->
<ul data-menu="submenu-1" id="submenu-1" class="menu__level" tabindex="-1" role="menu" aria-label="china-Tours">
@ -85,8 +85,9 @@
<ul data-menu="submenu-4" id="submenu-4" class="menu__level" tabindex="-1" role="menu" aria-label="travel-guide">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guide/how-to-plan-a-trip-to-china">Plan Your China Trip</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guide/best-time-to-go-china">China Weather</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guide/transport">China Transport</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guide/visa">China Visas</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/guide/visa">China Visas</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/map">China Maps</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/giant-panda">Giant Panda</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/great-wall-of-china">Great Wall Of China</a></li>
</ul>
<!-- Culture -->
@ -98,6 +99,10 @@
<li class="menu__item" role="menuitem"><a class="menu__link" href="/chinese-new-year">Chinese New Year</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/culture/kungfu">Chinese Kung Fu</a></li>
</ul>
<!-- Trains -->
<ul data-menu="submenu-6" id="submenu-6" class="menu__level" tabindex="-1" role="menu" aria-label="culture">
<li class="menu__item" role="menuitem"><a class="menu__link" href="/china-flights">Flights</a></li>
</ul>
</div>
</nav>
<!--nav end-->
@ -106,7 +111,7 @@
<div class="top-search">
<button class="action search--close" aria-label="Close Menu"><span class="icon icon--cross"></span></button>
<div class="siteSearch">
<form id="cse-search-box" name="googlesreach" action="https://www.chinatravel.com/search-result.asp">
<form id="cse-search-box" name="googlesreach" action="/search">
<input type="hidden" value="016808570474272112209:2xv5z3olaus" name="cx">
<input type="hidden" value="FORID:11" name="cof">
<input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search" name="q">
@ -206,15 +211,13 @@
<div class="container">
<div class="flex-row">
<div class="flex-col-xs-2">
<p class="footer-xs-title"><a rel="nofollow" href="/about-china-travel">ABOUT US</a></p>
<p class="footer-xs-title"><a rel="nofollow" href="/about-us">ABOUT US</a></p>
<ul>
<li><a rel="nofollow" href="/forms/contactus">Contact Us</a></li>
<li><a rel="nofollow" href="/blog/">Blog</a></li>
<li><a rel="nofollow" href="/about-china-travel/china-travel-terms-conditions.html">Terms and Conditions</a></li>
<li><a rel="nofollow" href="/china-travel-faq/">FAQ</a></li>
<li><a rel="nofollow" href="/feedback/">Testimonial</a></li>
<li><a rel="nofollow" href="/china-train">Train</a></li>
<li><a rel="nofollow" href="/about-china-travel/online-job.html">Work for Us</a></li>
<li><a rel="nofollow" href="/about-us">About Us</a></li>
<li><a rel="nofollow" href="/about-us/terms">Terms and Conditions</a></li>
<li><a rel="nofollow" href="/about-us/privacy">Privacy</a></li>
<li><a rel="nofollow" href="/about-us/online-job">Work for Us</a></li>
</ul>
</div>
<div class="flex-col-xs-2 media-box">
@ -283,6 +286,10 @@
gtag('js', new Date());
gtag('config', 'AW-823612164');
</script>
<?php if ($ISPRODUCT=="no") { ?>
<!-- Google AD-->
<script data-ad-client="ca-pub-3275214174607898" async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<?php } ?>
<!-- End Google -->
<!--@IN-ARTICLE-GOOGLE@-->
<!--@ADDTHIS-WIDGET@--><?php echo $addthis_widget ?>

Write Preview
Loading…
Cancel
Save