diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php index 8337f2f2..b970693c 100644 --- a/application/controllers/infofix.php +++ b/application/controllers/infofix.php @@ -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('', ''), '', $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)); diff --git a/application/controllers/information.php b/application/controllers/information.php index acfb02eb..2b3dc8af 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1380,6 +1380,16 @@ class Information extends CI_Controller if (!empty($meta_index_set)) { $template = str_replace('', '', $template); } + + $meta_note_ogtitle = get_meta($information->ic_id, 'meta_note_ogtitle'); + if (!empty($meta_note_ogtitle)) { + $template = str_replace('', '', $template); + } + + $meta_note = get_meta($information->ic_id, 'meta_note'); + if (!empty($meta_note)) { + $template = str_replace('', '', $template); + } //设置内容图片缓加载 $lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.chinahighlights.com/grey.gif'); $template = str_replace('', $lazy_content, $template); @@ -2597,7 +2607,7 @@ class Information extends CI_Controller // 动态加载反馈标签,按城市出前三条。左侧 // HTLM:
,显示全部用 - // 解析结果:; Shanghai,Beijing + // 解析结果:; Shanghai,Beijing $feedback_array = []; preg_match_all('^^', $information->ic_content, $feedback_array); if (!empty($feedback_array)) { @@ -2621,7 +2631,7 @@ class Information extends CI_Controller // 动态加载反馈标签,按城市出前三条。整页 // HTLM:
,显示全部用 - // 解析结果:; Shanghai,Beijing + // 解析结果:; Shanghai,Beijing $feedback_array = []; preg_match_all('^^', $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); diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 17eade59..1c2baf84 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -843,7 +843,7 @@ if (!empty($setting_website_nav)) { ic_sitecode == 'chinatravel' || $information->ic_sitecode == 'shanghai' || $information->ic_sitecode == 'beijing') { - ?> + ?>
- config->item('site_code'), array('ch', 'cht', 'gm', 'ah', 'gh', 'ct', 'chinatravel', 'shanghai','beijing'))) { ?> + config->item('site_code'), array('ch', 'cht', 'gm', 'ah', 'gh', 'ct', 'chinatravel', 'shanghai', 'beijing'))) {?>