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
master
赵鹏 2 years ago
parent 87385e7b49 6b11cbbb9d
commit 35e2e6afca
6 changed files with 53 additions and 18 deletions
Show Stats Download Patch File Download Diff File

20
application/controllers/infofix.php
Unescape Escape View File

@ -205,6 +205,7 @@ class infofix extends CI_Controller
echo json_encode(
array(
'state' => 0,
'ic_url' => $ic->ic_url,
'ic_content' => $ic->ic_content,
'pc_use' => $use,
'json' => $json,
@ -227,6 +228,15 @@ class infofix extends CI_Controller
{
$ic_id = $this->input->get_post('ic_id');
$ic_content = $this->input->get_post('ic_content');
$backup = $this->input->get_post('backup');
// 先备份 - 测试时不备份
if ($backup == 'backup') {
$is = $this->infoContents_model->get_isid_by_icid($ic_id);
$ic = $this->infoContents_model->get_ic_contents2($ic_id);
$this->logs_model->backup($is->is_id, $ic->ic_content);
}
$rs = $this->infoContents_model->force_update($ic_id, $ic_content);
echo json_encode(array('status' => 1));
}
@ -255,7 +265,7 @@ class infofix extends CI_Controller
}
/**
* 转化旧版构建工具数据（上线前的准备）
* 转化旧版构建工具数据（上线前的准备）- 不使用。
* @param mixed $ic_id
*/
public function migrate_hb($dev = 'prod')
@ -292,6 +302,14 @@ class infofix extends CI_Controller
}
// 移除外部包裹标签
$curl_rs = str_replace(array('<my_lmr_tpl>', '</my_lmr_tpl>'), '', $curl_rs);
//cdn域名替换res
$curl_rs = str_replace('//cdn.chinahighlights.ru', '//res.chinahighlights.ru', $curl_rs);
$curl_rs = str_replace('//cdn.arachina.com', '//res.arachina.com', $curl_rs);
$curl_rs = str_replace('//cdn.chinarundreisen.com', '//res.chinarundreisen.com', $curl_rs);
$curl_rs = str_replace('//cdn.voyageschine.com', '//res.voyageschine.com', $curl_rs);
$curl_rs = str_replace('//cdn.viaje-a-china.com', '//res.viaje-a-china.com', $curl_rs);
$curl_rs = str_replace('//cdn.viaggio-in-cina.it', '//res.viaggio-in-cina.it', $curl_rs);
// 强制更新信息内容
$this->infoContents_model->force_update($ic_id, $curl_rs);
echo json_encode(array('status' => 1));

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

@ -1380,6 +1380,16 @@ class Information extends CI_Controller
if (!empty($meta_index_set)) {
$template = str_replace('<!--@Meta_Robots@-->', '<meta name="robots" content="' . $meta_index_set . '" />', $template);
}
$meta_note_ogtitle = get_meta($information->ic_id, 'meta_note_ogtitle');
if (!empty($meta_note_ogtitle)) {
$template = str_replace('<!--@meta_og:title@-->', '<meta property="og:title" content="' . $meta_note_ogtitle . '" />', $template);
}
$meta_note = get_meta($information->ic_id, 'meta_note');
if (!empty($meta_note)) {
$template = str_replace('<!--@meta_og:description@-->', '<meta property="og:description" content="' . $meta_note . '" />', $template);
}
//设置内容图片缓加载
$lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.chinahighlights.com/grey.gif');
$template = str_replace('<!--@CUSTOM-CONENT@-->', $lazy_content, $template);
@ -2597,7 +2607,7 @@ class Information extends CI_Controller
// 动态加载反馈标签，按城市出前三条。左侧
// HTLM: <div><!--@FEEDBACK_Shanghai,Beijing@--></div> ,显示全部用<!--@FEEDBACK_All@-->
// 解析结果：<!--@FEEDBACK_Shanghai,Beijing@-->; Shanghai,Beijing
// 解析结果：<!--@FEEDBACK_Shanghai,Beijing@-->; Shanghai,Beijing
$feedback_array = [];
preg_match_all('^<!--@FEEDBACK_(.*)@-->^', $information->ic_content, $feedback_array);
if (!empty($feedback_array)) {
@ -2621,7 +2631,7 @@ class Information extends CI_Controller
// 动态加载反馈标签，按城市出前三条。整页
// HTLM: <div><!--@FEEDBACKCROSS_Shanghai,Beijing@--></div> ,显示全部用<!--@FEEDBACK_All@-->
// 解析结果：<!--@FEEDBACKCROSS_Shanghai,Beijing@-->; Shanghai,Beijing
// 解析结果：<!--@FEEDBACKCROSS_Shanghai,Beijing@-->; Shanghai,Beijing
$feedback_array = [];
preg_match_all('^<!--@FEEDBACKCROSS_(.*)@-->^', $information->ic_content, $feedback_array);
if (!empty($feedback_array)) {
@ -3562,7 +3572,7 @@ class Information extends CI_Controller
}
}
if ($meta_ct_page_type == "tourdetail") { //线路表单，左右结构，用标签来做
$dataform['device'] = $device;
$template_form_tourqi = $this->load->view($template_path . '-form-tourqi-new', $dataform, true);

23
application/views/bootstrap3/information_edit.php
Unescape Escape View File

@ -843,7 +843,7 @@ if (!empty($setting_website_nav)) {
</div>
</div>
<?php if ($information->ic_sitecode == 'chinatravel' || $information->ic_sitecode == 'shanghai' || $information->ic_sitecode == 'beijing') {
?>
?>
<div>
<div class="col-sm-8">
<label>附加图片PC
@ -2502,7 +2502,7 @@ foreach ($author_list as $author_item) {
<input type="checkbox" name="ignore_url_check" id="ignore_url_check" />忽略URL重复
</label>
<div class="clearfix"></div>
<?php if (in_array($this->config->item('site_code'), array('ch', 'cht', 'gm', 'ah', 'gh', 'ct', 'chinatravel', 'shanghai','beijing'))) { ?>
<?php if (in_array($this->config->item('site_code'), array('ch', 'cht', 'gm', 'ah', 'gh', 'ct', 'chinatravel', 'shanghai', 'beijing'))) {?>
<label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
<input type="checkbox" name="auto_update_cache_checkbox" id="auto_update_cache_checkbox"
onclick="get_update_cache_url();" value="<?php echo $information->ic_url; ?>" />静态更新
@ -2527,15 +2527,16 @@ foreach ($author_list as $author_item) {
<input type="hidden" name="rule_check_flag" id="rule_check_flag" value="1">
<a href="javascript:void(0);" class="btn btn-primary col-xs-19" onclick=" editor.updateElement();
//保存增加AMP判断 - lmr
<?php if (get_meta($information->ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') !== 'yes') {?>
if (!$('#PcAmp input').is(':checked')) {
var amp_confirm = window.confirm('\n检测到页面存在AMP版本，是否需要打开AMP编辑界面？\n\r注意：如果修改了PC端版本，那么同时也需要修改AMP版本。\n');
if (amp_confirm) {
window.open('<?php echo ($amp_build_url); ?>', '_blank');
}
}
<?php }?>
// 保存增加AMP判断 - lmr
// <?php if (get_meta($information->ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') !== 'yes') {?>
// if (!$('#PcAmp input').is(':checked')) {
// var amp_confirm = window.confirm('\n检测到页面存在AMP版本，是否需要打开AMP编辑界面？\n\r注意：如果修改了PC端版本，那么同时也需要修改AMP版本。\n');
// if (amp_confirm) {
// window.open('<?php echo ($amp_build_url); ?>', '_blank');
// }
// }
// <?php }?>
<?php if (get_meta($information->ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') === 'yes') {?>
// if (editor.element.getText() == '') {
// editor.setData('From HTML-Generator');

2
application/views/mobile_first/ah-lantern-form.php
Unescape Escape View File

@ -595,7 +595,7 @@
heritage_ticket_premium_div.style.display = '';
heritage_ticket_vip_div.style.display = '';
heritage_ticket_premium_radio.disabled = false;
heritage_ticket_premium_radio.disabled = true;
heritage_ticket_vip_radio.checked = true;
currentTicketPrice = parseInt(heritage_ticket_vip_radio.getAttribute('data-price'));

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

@ -12,6 +12,9 @@
<meta name="apple-mobile-web-app-title" content="China Highlights - Since 1998!">
<meta name="description" content="<!--@DESCRIPTION@-->">
<!--@Meta_Robots@-->
<!--@meta_og:title@-->
<!--@meta_og:description@-->
<!--@OG:IMAGE@-->
<!--@Meta-Ezoic-NoAds@-->
<link rel="canonical" href="<!--@CANONICAL@-->">

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

@ -8,6 +8,9 @@
</title>
<meta name="description" content="<!--@DESCRIPTION@-->">
<!--@Meta_Robots@-->
<!--@meta_og:title@-->
<!--@meta_og:description@-->
<!--@OG:IMAGE@-->
<meta content="width=device-width,minimum-scale=1,initial-scale=1" name="viewport">
<!--@Meta-Ezoic-NoAds@-->
@ -56,7 +59,7 @@
<!--头部导航-->
<header class="headerbar" id="header">
<img src="https://data.chinahighlights.com/image/tour-detail/icon/top-navigation-menu-button.jpg"
class="navimenu topnaviarrowdown action--open" width="26px" height="25px"
style="position: relative; left: 10px; top: 12px; z-index: 9;" alt="menu button" title="navigation button">
@ -68,7 +71,7 @@
<div class="topnavitailor">
<a href="/contactus/?product_code=" class="infocustomize">Contact</a>
</div>
</header>
<!--总-->

Write Preview
Loading…
Cancel
Save