From 5448f941586ae6c9c18040bb970341b12d099a6e Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Sun, 29 Sep 2024 14:25:52 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0FB=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E6=A0=87=E9=A2=98=E5=92=8C=E6=8F=8F=E8=BF=B0=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 16 +++++++++++++--- application/views/mobile_first/ch-pc.php | 2 ++ application/views/mobile_first/ch.php | 6 ++++-- 3 files changed, 19 insertions(+), 5 deletions(-) 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/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index bf4d23b4..46f75254 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -12,6 +12,8 @@ + + diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index bc2d190e..afb46040 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -8,6 +8,8 @@ + + @@ -56,7 +58,7 @@ From 2b93437ea05fa2b104079e803952f2142d9da7e2 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Sun, 29 Sep 2024 15:40:29 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0FB=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 1 + application/views/mobile_first/ch.php | 1 + 2 files changed, 2 insertions(+) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 46f75254..6eafe7cd 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -14,6 +14,7 @@ + diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index afb46040..83c613ef 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -10,6 +10,7 @@ + From 96bcf278b9e5e0cd00aaa3ddce5e85673768fcf9 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Tue, 8 Oct 2024 15:49:32 +0800 Subject: [PATCH 3/8] add backup --- application/controllers/infofix.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php index 8337f2f2..ed68ca8e 100644 --- a/application/controllers/infofix.php +++ b/application/controllers/infofix.php @@ -223,10 +223,18 @@ class infofix extends CI_Controller /** * 无条件更新信息内容（上线前内容） */ - public function update_by_icid() + public function update_by_icid($backup = 'no') { $ic_id = $this->input->get_post('ic_id'); $ic_content = $this->input->get_post('ic_content'); + + // 先备份 - 测试时不备份 + 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 +263,7 @@ class infofix extends CI_Controller } /** - * 转化旧版构建工具数据（上线前的准备） + * 转化旧版构建工具数据（上线前的准备）- 不使用。 * @param mixed $ic_id */ public function migrate_hb($dev = 'prod') From 99adf4cd175468b41f1bd5bcb53b74faf83b25e8 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Tue, 8 Oct 2024 16:02:06 +0800 Subject: [PATCH 4/8] da --- application/controllers/infofix.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php index ed68ca8e..fc0f1299 100644 --- a/application/controllers/infofix.php +++ b/application/controllers/infofix.php @@ -223,10 +223,11 @@ class infofix extends CI_Controller /** * 无条件更新信息内容（上线前内容） */ - public function update_by_icid($backup = 'no') + public function update_by_icid() { $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') { From eba04fcd1c04f4c435d7700e21bbe21c1df3592a Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 9 Oct 2024 11:39:19 +0800 Subject: [PATCH 5/8] da --- application/controllers/infofix.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php index fc0f1299..53d4c3b1 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, From 589db71a972dd503900018b98da076ac42b485f1 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 9 Oct 2024 14:04:03 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E7=A7=BB=E9=99=A4amp=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/bootstrap3/information_edit.php | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) 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'))) {?>