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

hotfix/paypal-note
赵鹏 2 years ago
commit ae1b25f074

@ -178,7 +178,7 @@ class Logs_model extends CI_Model
public function list_backup_meta($is_id, $meta_code)
{
$this->init();
$this->top_num = 100;
$this->top_num = 500;
$this->log_res_id = " AND il.log_res_id =" . $this->HT->escape($is_id);
$this->log_action = " AND il.log_action like 'backup_meta_" . $meta_code . "_%'";
return $this->get_list();
@ -258,10 +258,15 @@ class Logs_model extends CI_Model
. " )";
// fix 外部站点调用
$op_code = NULL;
if ($admin_info['OPI_Code']) $op_code = $admin_info['OPI_Code'];
$op_code = null;
if ($admin_info['OPI_Code']) {
$op_code = $admin_info['OPI_Code'];
}
$op_name = 'outside';
if ($admin_info['OPI_Name']) $op_name = $admin_info['OPI_Name'];
if ($admin_info['OPI_Name']) {
$op_name = $admin_info['OPI_Name'];
}
$query = $this->HT->query($sql, array($log_action, $is_id, $log_content, $op_code, $op_name));
$this->insert_id = $this->HT->last_id('infoLogs');

@ -960,7 +960,6 @@ if (!empty($setting_website_nav)) {
<?php if ($information->ic_sitecode == "trippest") {?>
<label><a class="btn default" data-toggle="modal" id="aBokunData"> 管理TPBokun数据 </a> </label>
<?php }?>
<label><a class="btn default" data-toggle="modal" id="btnTemplate">特殊代码模板</a> </label>
</div>
<div id="customize" class="col-xs-24" style="display:none;">
@ -1882,8 +1881,7 @@ $meta_subnavi_arr = array(
<div id="bind_product_code">
<div class="input-group">
<a class="btn default" data-toggle="modal" id="btnFeedback">TA/TP反馈标签</a>
<a class="btn default" data-toggle="modal" id="btnFormTag">Inquiry表单标签</a>
<a class="btn default" target="_blank" href="https://www.kdocs.cn/l/ckDJoZnCw9Td">特殊代码模版</a>
</div>
</div>
@ -2085,146 +2083,6 @@ foreach ($author_list as $author_item) {
</div>
<!-- Trippest bokun窗口 -->
<div style="display:none" id="templateFeedback">
海外
泰国:<!--@FEEDBACK_Bangkok@-->
越南:<!--@FEEDBACK_Saigon@-->
柬埔寨:<!--@FEEDBACK_Siem Reap@-->
日本:<!--@FEEDBACK_Tokyo,Siem Reap@-->
缅甸:<!--@FEEDBACK_Yangon,Siem Reap@-->
印度:<!--@FEEDBACK_Delhi,Bangkok@-->
中国:
北京:<!--@FEEDBACK_Beijing@-->
西安:<!--@FEEDBACK_Xian@-->
桂林:<!--@FEEDBACK_Guilin@-->
成都:<!--@FEEDBACK_Chengdu@-->
黄山:<!--@FEEDBACK_Huangshan@-->
苏州:<!--@FEEDBACK_Suzhou@-->
杭州:<!--@FEEDBACK_Hangzhou@-->
上海:<!--@FEEDBACK_Shanghai@-->
张家界:<!--@FEEDBACK_Zhangjiajie@-->
丽江:<!--@FEEDBACK_Lijiang@-->
大理:<!--@FEEDBACK_Dali@-->
熊猫:<!--@FEEDBACK_Chengdu@-->
</div>
<div class="modal fade" id="modalFeedback">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="NoPermissionModalLabel">TA/TP反馈标签</h4>
</div>
<div class="modal-body" style="height:650px;">
<pre><code id='feedbackHTML'>
</code></pre>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default " data-dismiss="modal"> 关 闭</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="modalFormTag">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="NoPermissionModalLabel">Inquiry表单标签</h4>
</div>
<div class="modal-body" style="height:650px;">
<label>
Inquiry表单&lt;!--@INFO-PAGE-FORM@--&gt;
</label>
<br>
<label>
CH需要在底部附加样式添加https://data.chinahighlights.com/css/tour-detail-former.css
</label>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default " data-dismiss="modal"> 关 闭</button>
</div>
</div>
</div>
</div>
<div style="display:none" id="templateHTML">
CH/GH表格
<div class="table-responsive">
<table class="infotable">
<tbody>
<tr>
<td>Chinese Zodiac Sign</td>
<td>Years</td>
</tr>
</tbody>
</table>
</div>
AH表格
<div class="table-responsive">
<table class="InfoTable">
<tbody>
<tr>
<td>Festivals of India</td>
<td>Date</td>
<td>Public Holiday</td>
</tr>
</tbody>
</table>
</div>
CH无序列表
<ul class="drop1">
<li>Average temperature</li>
<li>Sunny days</li>
</ul>
AH无序列表
<ul class="InfoList">
<li>Average temperature</li>
<li>Sunny days</li>
</ul>
GH无序列表
<ul class="ghlist">
<li>Average temperature</li>
<li>Sunny days</li>
</ul>
Whats New广告框
<div class="whatsnew"><img alt="Guilin Hotel upgrade" class="img-responsive" src="https://data.chinahighlights.com/image/tour-detail/china-tour/whats-new-info-tag-pic.png" width="170px" />
<div>
<p>After three years...</p>
</div>
</div>
</div>
<div class="modal fade" id="modalTemplate">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="NoPermissionModalLabel">特殊代码模板</h4>
</div>
<div class="modal-body" style="height:650px; overflow: scroll">
<pre>
<code id="codeHTML">
</code>
</pre>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default " data-dismiss="modal"> 关 闭</button>
</div>
</div>
</div>
</div>
<script>
$(function() {
$('#codeHTML').append($('<div>').text($('#templateHTML').html()).html());
$('#feedbackHTML').append($('<div>').text($('#templateFeedback').html()).html());
});
</script>
<script>
$(function() {
$("#aBokunData").click(function() {
@ -2235,23 +2093,5 @@ foreach ($author_list as $author_item) {
backdrop: 'static'
});
})
$("#btnFeedback").click(function() {
$('#modalFeedback').modal({
show: true,
backdrop: 'static'
});
})
$("#btnFormTag").click(function() {
$('#modalFormTag').modal({
show: true,
backdrop: 'static'
});
})
$("#btnTemplate").click(function() {
$('#modalTemplate').modal({
show: true,
backdrop: 'static'
});
})
});
</script>

@ -130,8 +130,7 @@
<div class="inspirationlist topthings">
<span class="inspirationtitle">Vietnam & Thailand:</span>
<ul class="inspiration">
<li><a href="/southeast-asia/tours/classic-vietnam-and-thailand">2-Week
Itinerary (In-depth)</a></li>
<li><a href="/southeast-asia/tours/classic-vietnam-and-thailand">2-Week Itinerary (Classic)</a></li>
</ul>
</div>
@ -188,14 +187,15 @@
<div class=" dropdown-content">
<div class="inspirationinfo">
<div class="inspirationlist topthings">
<span class="inspirationtitle">7-10 Days Itinerary</span>
<span class="inspirationtitle">7-12 Days Itinerary</span>
<div class="listtour">
<ul class="inspiration">
<li><a href="/japan/1-week-itinerary">1 Week in Japan</a></li>
<li><a href="/vietnam/7-days-itinerary">1 Week in Vietnam</a></li>
<li><a href="/japan/10-day-itineraries">10 Days in Japan</a></li>
<li><a href="/vietnam/10-days-itinerary">10 Days in Vietnam</a></li>
<li><a href="https://www.chinahighlights.com/travelguide/10-days-china-itinerary.htm" target="_blank">10 Days in China</a></li>
<li><a href="https://www.chinahighlights.com/travelguide/10-days-china-itinerary.htm" target="_blank">10 Days in China</a></li>
<li><a href="/japan/12-day-itineraries">12 Days in Japan</a></li>
</ul>
</div>
</div>

@ -86,7 +86,7 @@
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-1"
aria-owns="submenu-1">Destinations</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-4" aria-owns="submenu-4">1-Week Itinerary</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-2" aria-owns="submenu-2">10-Day Itinerary</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-2" aria-owns="submenu-2">10-12 Days Itinerary</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-5"
aria-owns="submenu-5">2-Week Itinerary</a></li>
<li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-3"
@ -107,7 +107,7 @@
<li class="menu__item" role="menuitem" style="margin-bottom: 30px;"><a href="/southeast-asia/tours/vietnam-cambodia-mekong-cruise" class="menu__link">2-Week Vietnam & Cambodia Itinerary (Retired Couple)</a></li>
<li class="menu__item" role="menuitem" style="margin-bottom: 30px;"><a href="/southeast-asia/tours/classic-vietnam-and-thailand" class="menu__link">2-Week Vietnam & Thailand Itinerary (In-depth)</a></li>
<li class="menu__item" role="menuitem" style="margin-bottom: 30px;"><a href="/southeast-asia/tours/classic-vietnam-and-thailand" class="menu__link">2-Week Vietnam & Thailand Itinerary (Classic)</a></li>
<li class="menu__item" role="menuitem" style="margin-bottom: 30px;"><a href="/southeast-asia/tours/best-of-thailand-and-cambodia" class="menu__link">2-Weel Thailand & Cambodia Itinerary (In-depth)</a></li>
@ -142,9 +142,10 @@
</ul>
<!-- Best-time -->
<ul data-menu="submenu-2" id="submenu-2" class="menu__level" tabindex="-1" role="menu" aria-label="Best-time">
<li class="menu__item" role="menuitem"><a href="/japan/10-day-itineraries" class="menu__link">Japan</a></li>
<li class="menu__item" role="menuitem"><a href="/vietnam/10-days-itinerary" class="menu__link">Vietnam</a></li>
<li class="menu__item" role="menuitem"><a href="https://www.chinahighlights.com/travelguide/10-days-china-itinerary.htm" target="_blank" class="menu__link">China</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/10-day-itineraries" class="menu__link">10 Days in Japan</a></li>
<li class="menu__item" role="menuitem"><a href="/vietnam/10-days-itinerary" class="menu__link">10 Days in Vietnam</a></li>
<li class="menu__item" role="menuitem"><a href="https://www.chinahighlights.com/travelguide/10-days-china-itinerary.htm" target="_blank" class="menu__link">10 Days in China</a></li>
<li class="menu__item" role="menuitem"><a href="/japan/12-day-itineraries" class="menu__link">12 Days in Japan</a></li>
</ul>
<!-- festival -->

Loading…
Cancel
Save