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

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

Browse Source
master
LMR 1 year ago
parent 7f3fe43362 5b429599eb
commit 725ffb663e
6 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File

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

@ -1017,8 +1017,20 @@ class Information extends CI_Controller
$information->ic_content
);
// 火车票首页搜索框 --zp
$template_TrainSearch = "";
if ($information->ic_url == "/china-trains/hometest.htm" || $information->ic_url == "/china-trains/") {
$template_TrainSearch = $this->load->view($template_path . '-train-index', null, true);
$information->ic_content = str_replace(
'<!--@TRAIN-INDEX-SEARCHFORM@-->',
$template_TrainSearch,
$information->ic_content
);
}
//火车票搜索框添加 -- zp
if ($information->is_parent_id == "278008234") {
if ($information->is_parent_id == "278008234" && $information->ic_url != "/china-trains/") { //20240403 字节
//本地测试的火车父类ID为：278035939 。网前为：278008234
$meta_train_city = get_meta($information->ic_id, 'meta_train_city'); //默认的出发及目的地城市 ， beijing|shanghai
$data_TrainCity = array();
@ -1329,14 +1341,13 @@ class Information extends CI_Controller
$meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture');
}
// 火车票首页搜索框 --zp
$template_TrainSearch = "";
if ($information->ic_url == "/china-trains/hometest.htm" || $information->ic_url == "/china-trains/") {
$template_TrainSearch = $this->load->view($template_path . '-train-index', null, true);
if ($device == "mobile") {
//手机端的搜索框直接显示，不再加背景图，这样可以保证CLS分数。
$template = str_replace('<!--@TOP-BANNER@-->', '<div class="detailtopbanner">' . $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-data.chinahighlights.com/css/mobile-first.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速

8
application/third_party/trainsystem/controllers/addorders.php vendored
Unescape Escape View File

@ -791,7 +791,13 @@ class addorders extends CI_Controller{
$passagersdata[$i]->contactMobile = "";
$passagersdata[$i]->contactEmail = "";
if (!empty($PassagerInfo->BPE_Nationality)){
$passagersdata[$i]->regionCode = $PassagerInfo->BPE_Nationality; //国家简码 美国us ,中国cn
$regionCode = $PassagerInfo->BPE_Nationality;
if ($regionCode =="TW" || $regionCode=="HK" || $regionCode=="MO"){
$passagersdata[$i]->regionCode = "CN";
}else{
$passagersdata[$i]->regionCode = $regionCode; //国家简码 美国us ,中国cn
}
}
$i++;

31
application/views/mobile_first/ch-pc.php
Unescape Escape View File

@ -128,8 +128,10 @@
</li>
<li class="start-nav-item"><a href="/yunnan/tours.htm" id="yunnan_tours_2021">Yunnan</a>
</li>
<li class="start-nav-item start-nav-item-last"><a href="/hong-kong/tours.htm"
<li class="start-nav-item"><a href="/hong-kong/tours.htm"
id="hk_tours_2021">Hong Kong</a></li>
<li class="start-nav-item start-nav-item-last"><a href="https://www.asiahighlights.com/tours"
id="asia_tours_2021" target="blank">Asia Tours</a></li>
</ul>
</div>
</li>
@ -255,30 +257,6 @@
</ul>
</div>
</li>
<li class="dropdown"><a href="/tour/asia-tours/" class="p_topnavilink">Asia Tours</a>
<div class="destinationspc dropdown-content">
<ul class="list-reset sidebar">
<li class="start-nav-item"><a
href="https://www.asiahighlights.com/asia/tours/japan-china-discovery"
target="_blank">China-Japan</a></li>
<li class="start-nav-item"><a
href="https://www.asiahighlights.com/asia/tours/china-and-vietnam"
target="_blank">China-Vietnam</a></li>
<li class="start-nav-item"><a
href="https://www.asiahighlights.com/asia/tours/mongolia-china-and-thailand"
target="_blank">China-Mongolia-Thailand</a></li>
<li class="start-nav-item"><a
href="https://www.asiahighlights.com/asia/tours/china-nepal-and-india"
target="_blank">China-Nepal-India</a></li>
<li class="start-nav-item"><a href="/tour/cht-th-04/">China-Thailand</a></li>
<li class="start-nav-item" style="width:100%;"><a
href="https://www.asiahighlights.com/caucasus-central-asia/tours/kyrgyzstan-uzbekistan-turkmenistan"
target="_blank">China-Kyrgyzstan-Uzbekistan-Turkmenistan</a></li>
</ul>
</div>
</li>
<li class="dropdown"><a href="/day-tours/" class="p_topnavilink">Day Tours</a>
<div class="destinationspc dropdown-content">
<ul class="list-reset sidebar">
@ -297,6 +275,7 @@
</ul>
</div>
</li>
<li class="dropdown"><a href="/aboutus/" class="p_topnavilink">About us</a></li>
<li class="topnavitailor">
<a href="/contactus/?product_code=" id="contact_us_2021">Contact us</a>
</li>
@ -323,7 +302,7 @@
more</a></div>
</div>
<div class="main_content">
<script src="https://data.chinahighlights.com/js/min.php?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js&amp;v=20231110"></script>
<!--@HEAD_1@-->
<div id="main_content_pc">
<div class="pc_content">

2
application/views/mobile_first/ch-train-index.php
View File

File diff suppressed because one or more lines are too long

3
application/views/mobile_first/ch.php
Unescape Escape View File

@ -118,6 +118,7 @@
href="#">Day Tours</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-7" aria-owns="submenu-7"
href="#">Asia Tours</a></li>
<li class="menu__item" role="menuitem"><a href="/aboutus/" class="menu__link">About us</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" href="/reviews.htm">Reviews</a></li>
</ul>
<!-- China Tours -->
@ -333,7 +334,7 @@
</nav>
<script src="https://data.chinahighlights.com/js/min.php?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js&amp;v=20231110"></script>
<!--@HEAD_1@-->
<div id="main_content_mobile">

2
gys_system/models/user_model.php
Unescape Escape View File

@ -121,7 +121,7 @@ class User_model extends CI_Model {
WHERE TGI2_TGI_SN = TGI_SN
AND TGI2_LGC = 2
AND LEN(TGI2_Name) > 0
AND TGI2_Name LIKE '23%'
AND TGI2_Name LIKE '24%'
AND TGI_VEI_SN = ?
ORDER BY
TGI2_Name ASC

Write Preview
Loading…
Cancel
Save