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

hotfix/paypal-note
candice 3 years ago
commit 9aa31d5904

@ -1075,8 +1075,8 @@ class Information extends CI_Controller
$template = str_replace('<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->', $article_structured_data_content, $template);
if (!empty($meta_product_code)) {
// <input name="cli_no" type="hidden" value="cht-63">
$product_code_input = "<input name='cli_no' type='hidden' value='$meta_product_code'>";
// <input name="product_code" type="hidden" value="cht-63">
$product_code_input = "<input name='product_code' type='hidden' value='$meta_product_code'>";
$template = str_replace('<!--@INPUT_PRODUCT_CODE@-->', $product_code_input, $template);
}

@ -959,7 +959,10 @@ if (!empty($setting_website_nav)) {
<label><a href="javascript:void(0);" onclick="$('#customize').toggle();">自定义选项</a> </label>
<?php if ($information->ic_sitecode == "trippest") {?>
<label><a class="btn default" data-toggle="modal" id="aBokunData"> 管理TPBokun数据 </a> </label>
<?php }?>
<?php }?>
<label><a class="btn default" data-toggle="modal" id="btnFeedback">TA/TP反馈标签</a> </label>
<label><a class="btn default" data-toggle="modal" id="btnFormTag">Inquiry表单标签</a> </label>
<label><a class="btn default" data-toggle="modal" id="btnTemplate">特殊代码模板</a> </label>
</div>
<div id="customize" class="col-xs-24" style="display:none;">
@ -2070,6 +2073,144 @@ foreach ($author_list as $author_item) {
</div>
</div>
</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>
</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() {
@ -2080,6 +2221,23 @@ 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>
<!-- Trippest bokun窗口 -->
</script>
Loading…
Cancel
Save