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 
# Conflicts:
#	application/controllers/information.php
master
赵鹏 1 year ago
parent 3622569c3b a269b1fdf4
commit 7c4080ab0d
7 changed files with 23 additions and 72 deletions
Show Stats Download Patch File Download Diff File

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

@ -1346,12 +1346,23 @@ class Information extends CI_Controller
$meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture');
}
<<<<<<< HEAD
//顶部视频
$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);
=======
// 火车票首页搜索框 --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);
}
>>>>>>> a269b1fdf454c4534d9f0f92ad131675a0263294
}
if (is_file('D:/wwwroot/origin-data.chinahighlights.com/css/mobile-first.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速

10
application/views/cache/update.php vendored
Unescape Escape View File

@ -176,8 +176,7 @@
<form class="form-search" id="path_search" action="#" method="post">
<input type="text" placeholder="输入路径删选，例如：/tours/。" value="<?php if (isset($_POST['p'])) {
echo ($_POST['p']);
} ?>" class="input-medium search-query"
name="p" />
} ?>" class="input-medium search-query" name="p" />
<button type="submit" class="btn">筛选</button>
</form>
<a id="update" class="btn mr10 btn-info">更新</a>
@ -195,8 +194,9 @@
</thead>
<tbody class="data_group">
<?php foreach ($file as $key => $it) {
$encode = mb_detect_encoding($it, array('ASCII', 'GBK', 'ISO-8859-1', 'UTF-8'));
$_it = mb_convert_encoding($it, 'UTF8', $encode);
// $encode = mb_detect_encoding($it, array('ASCII', 'GBK', 'ISO-8859-1', 'UTF-8'));
// $_it = mb_convert_encoding($it, 'UTF8', $encode);
$_it = preg_replace('/#(.*)$/i', '', $it);
?>
<tr class="data">
<td>
@ -213,7 +213,7 @@
</td>
<?php } ?>
<td>
<?php echo ($file_time[$it]); ?>
<?php echo (isset($file_time[$it]) ? $file_time[$it] : 'bad file'); ?>
</td>
<td class="msg_wait">无操作</td>
</tr>

30
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>
@ -322,7 +301,6 @@
experience. <a href="/tour/top-china-tours/" id="updated_news_new_year_2022_pc">Learn
more</a></div>
</div>
<!--@TOP-VIDEO@-->
<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@-->

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,8 +334,6 @@
</nav>
<!--@TOP-VIDEO@-->
<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@-->

4
application/views/mobile_first/gh-h1.php
Unescape Escape View File

@ -1,8 +1,4 @@
<div class="pagetop">
<?php if (!empty($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 } ?>
<div class="aboutustop">
<div class="top_content_pc">

19
application/views/mobile_first/gh-pc.php
Unescape Escape View File

@ -239,24 +239,7 @@
<p style="text-align: center;">Be the first to receive exciting updates, exclusive promotions, and valuable
travel tips from our
team of experts. </p>
<form action="https://www.globalhighlights.com/forms/newsletter_save" method="post" id="newsletter_form"
name="newsletter_form" novalidate="">
<label id="name_area">
<input type="text" name="name" id="newsletter_realname" class="contact_name"
placeholder="* Your name">
<div style="color: #a31022;display: none" class="requiredArea" id="newsletter_realname_errmsg">
Please fill up your name.</div>
</label>
<label id="email_area">
<input type="email" class="safyemail autoemail ui-autocomplete-input contact_email" name="email"
id="newsletter_email" autocomplete="off" placeholder="* Email">
<div style="color: #a31022;display: none" class="requiredArea" id="newsletter_email_errmsg">Please
fill up your email address.</div>
<div style="color: #a31022;display: none" class="requiredArea" id="newsletter_email_verify_errmsg">
Please verify your email.</div>
</label>
<button id="submit_newsletter" type="button" class="sendInquiry">Inspire Me</button>
</form>
<div class="tourbutton"><a href="/newsletter">Click to Sign up</a></div>
</div>
</div>
<div id="footer">

18
application/views/mobile_first/gh.php
Unescape Escape View File

@ -208,23 +208,7 @@
<p style="text-align: center;">Be the first to receive exciting updates, exclusive promotions, and valuable travel
tips from our
team of experts. </p>
<form action="https://www.globalhighlights.com/forms/newsletter_save" method="post" id="newsletter_form"
name="newsletter_form" novalidate="">
<label id="name_area">
<input type="text" name="name" id="newsletter_realname" class="contact_name" placeholder="* Your name">
<div style="color: #a31022;display: none" class="requiredArea" id="newsletter_realname_errmsg">Please fill up
your name.</div>
</label>
<label id="email_area">
<input type="email" class="safyemail autoemail ui-autocomplete-input contact_email" name="email"
id="newsletter_email" autocomplete="off" placeholder="* Email">
<div style="color: #a31022;display: none" class="requiredArea" id="newsletter_email_errmsg">Please fill up
your email address.</div>
<div style="color: #a31022;display: none" class="requiredArea" id="newsletter_email_verify_errmsg">Please
verify your email.</div>
</label>
<button id="submit_newsletter" type="button" class="sendInquiry">Inspire Me</button>
</form>
<div class="tourbutton"><a href="/newsletter">Click to Sign up</a></div>
</div>
</div>
<footer>

Write Preview
Loading…
Cancel
Save