From 479025ecf2c8a51b6bc272c8af53a10ba94bda5e Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Dec 2023 09:30:45 +0800 Subject: [PATCH 1/9] fix --- application/controllers/information.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 98c71e11..239395f0 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -105,7 +105,7 @@ class Information extends CI_Controller return true; } - //复制节点结构到任意站点的节点下面。-- lmr + //复制节点结构到任意站点的节点下面。-- lmr - 1225 //is_id 信息结构ID， public function copy_by_is_id($src_is_id, $dest_is_id) { From 6a25f9be8a80b982f6f4692899f99b4d40a93b52 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Dec 2023 09:34:13 +0800 Subject: [PATCH 2/9] fkx --- application/controllers/information.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 95f110e0..2e79f600 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -138,7 +138,7 @@ class Information extends CI_Controller foreach ($src_path as $n => $item) { if ($item->is_parent_id == $src->is_id) { // info_content - echo $item->is_ic_id . ' @ '; + echo $item->is_id . ' # ' . $item->is_ic_id . ' @ '; $item_info_content = $this->InfoContents_model->get_ic_contents2($item->is_ic_id); $this->InfoContents_model->Add_with_sitecode( From dae813af5b70f582c2e8372c1f7b167c396bfc0c Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Dec 2023 09:40:09 +0800 Subject: [PATCH 3/9] fix --- application/controllers/information.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 2e79f600..5a622869 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -173,19 +173,24 @@ class Information extends CI_Controller $item_meta_pcbody = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_BODY_PC'); $item_meta_pccss = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_CSS_PC'); $item_meta_pcschema = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_SCHEMA'); - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP', $item_meta_amp); - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_STATUS', $item_meta_ampstatus); - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC_STATUS', $item_meta_pcstatus); - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC', $item_meta_pcbody); - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_CSS_PC', $item_meta_pccss); - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_SCHEMA', $item_meta_pcschema); + + if ($item_meta_amp) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP', $item_meta_amp); + if ($item_meta_ampstatus) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_STATUS', $item_meta_ampstatus); + if ($item_meta_pcstatus) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC_STATUS', $item_meta_pcstatus); + if ($item_meta_pcbody) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC', $item_meta_pcbody); + if ($item_meta_pccss) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_CSS_PC', $item_meta_pccss); + if ($item_meta_pcschema) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_SCHEMA', $item_meta_pcschema); // 添加节点 $this->InfoStructures_model->Add_with_sitecode($dest->is_id, $this->InfoContents_model->insert_id, 999, $dest->is_sitecode); $node_map[$item->is_id] = $this->InfoStructures_model->insert_id; - } else { - } } From 3eadc7fe033b541cc51a4608bfa7e76bbbb3aa0e Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Dec 2023 09:46:29 +0800 Subject: [PATCH 4/9] fix --- application/controllers/information.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 5a622869..15b0c48e 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -167,12 +167,12 @@ class Information extends CI_Controller $dest->is_sitecode ); // info_meta - $item_meta_amp = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP'); - $item_meta_ampstatus = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_STATUS'); - $item_meta_pcstatus = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_BODY_PC_STATUS'); - $item_meta_pcbody = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_BODY_PC'); - $item_meta_pccss = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_CSS_PC'); - $item_meta_pcschema = $this->InfoMetas_model->Detail($item->is_ic_id, 'AMP_SCHEMA'); + $item_meta_amp = $this->InfoMetas_model->get($item->is_ic_id, 'AMP'); + $item_meta_ampstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_STATUS'); + $item_meta_pcstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC_STATUS'); + $item_meta_pcbody = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC'); + $item_meta_pccss = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_CSS_PC'); + $item_meta_pcschema = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_SCHEMA'); if ($item_meta_amp) $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP', $item_meta_amp); From c3543627aeb68744215f7d684d9e3b87799f0971 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Dec 2023 09:48:13 +0800 Subject: [PATCH 5/9] fix --- application/controllers/information.php | 117 +++++++++++++----------- 1 file changed, 63 insertions(+), 54 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 15b0c48e..9abcd6a4 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -107,6 +107,8 @@ class Information extends CI_Controller //复制节点结构到任意站点的节点下面。-- lmr - 1225 //is_id 信息结构ID， + //复制节点结构到任意站点的节点下面。-- lmr + //is_id 信息结构ID， public function copy_by_is_id($src_is_id, $dest_is_id) { $data = array(); @@ -136,62 +138,69 @@ class Information extends CI_Controller $node_map = array(); // 循环复制各个层级的节点。 foreach ($src_path as $n => $item) { - if ($item->is_parent_id == $src->is_id) { - // info_content - echo $item->is_id . ' # ' . $item->is_ic_id . ' @ '; - $item_info_content = $this->InfoContents_model->get_ic_contents2($item->is_ic_id); - - $this->InfoContents_model->Add_with_sitecode( - $item_info_content->ic_url, - $item_info_content->ic_url_title, - $item_info_content->ic_type, - $item_info_content->ic_title, - $item_info_content->ic_content, - $item_info_content->ic_summary, - $item_info_content->ic_seo_title, - $item_info_content->ic_seo_description, - $item_info_content->ic_seo_keywords, - $item_info_content->ic_show_bread_crumbs, - $item_info_content->ic_status, - $item_info_content->ic_template, - $item_info_content->ic_photo, - $item_info_content->ic_photo_width, - $item_info_content->ic_photo_height, - $item_info_content->ic_recommend_tours, - $item_info_content->ic_recommend_packages, - $item_info_content->ic_ht_area_id, - $item_info_content->ic_ht_area_type, - $item_info_content->ic_ht_product_id, - $item_info_content->ic_ht_product_type, - $item_info_content->ic_author, - $dest->is_sitecode - ); - // info_meta - $item_meta_amp = $this->InfoMetas_model->get($item->is_ic_id, 'AMP'); - $item_meta_ampstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_STATUS'); - $item_meta_pcstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC_STATUS'); - $item_meta_pcbody = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC'); - $item_meta_pccss = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_CSS_PC'); - $item_meta_pcschema = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_SCHEMA'); - - if ($item_meta_amp) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP', $item_meta_amp); - if ($item_meta_ampstatus) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_STATUS', $item_meta_ampstatus); - if ($item_meta_pcstatus) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC_STATUS', $item_meta_pcstatus); - if ($item_meta_pcbody) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC', $item_meta_pcbody); - if ($item_meta_pccss) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_CSS_PC', $item_meta_pccss); - if ($item_meta_pcschema) - $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_SCHEMA', $item_meta_pcschema); - - // 添加节点 - $this->InfoStructures_model->Add_with_sitecode($dest->is_id, $this->InfoContents_model->insert_id, 999, $dest->is_sitecode); - $node_map[$item->is_id] = $this->InfoStructures_model->insert_id; + // 定位复制的父节点 + $target_is_id = $dest->is_id; + foreach ($node_map as $old => $new) { + if ($item->is_parent_id == $old) { + $target_is_id = $new; + } } + // info_content + $item_info_content = $this->InfoContents_model->get_ic_contents2($item->is_ic_id); + $this->InfoContents_model->Add_with_sitecode( + $item_info_content->ic_url, + $item_info_content->ic_url_title, + $item_info_content->ic_type, + $item_info_content->ic_title, + $item_info_content->ic_content, + $item_info_content->ic_summary, + $item_info_content->ic_seo_title, + $item_info_content->ic_seo_description, + $item_info_content->ic_seo_keywords, + $item_info_content->ic_show_bread_crumbs, + $item_info_content->ic_status, + $item_info_content->ic_template, + $item_info_content->ic_photo, + $item_info_content->ic_photo_width, + $item_info_content->ic_photo_height, + $item_info_content->ic_recommend_tours, + $item_info_content->ic_recommend_packages, + $item_info_content->ic_ht_area_id, + $item_info_content->ic_ht_area_type, + $item_info_content->ic_ht_product_id, + $item_info_content->ic_ht_product_type, + $item_info_content->ic_author, + $dest->is_sitecode + ); + + // info_meta + $item_meta_amp = $this->InfoMetas_model->get($item->is_ic_id, 'AMP'); + $item_meta_ampjson = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_JSON'); + $item_meta_ampstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_STATUS'); + $item_meta_pcstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC_STATUS'); + $item_meta_pcbody = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC'); + $item_meta_pccss = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_CSS_PC'); + $item_meta_pcschema = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_SCHEMA'); + + if (!empty($item_meta_amp)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP', $item_meta_amp); + if (!empty($item_meta_ampjson)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_JSON', $item_meta_ampjson); + if (!empty($item_meta_ampstatus)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_STATUS', $item_meta_ampstatus); + if (!empty($item_meta_pcstatus)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC_STATUS', $item_meta_pcstatus); + if (!empty($item_meta_pcbody)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC', $item_meta_pcbody); + if (!empty($item_meta_pccss)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_CSS_PC', $item_meta_pccss); + if (!empty($item_meta_pcschema)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_SCHEMA', $item_meta_pcschema); + + // 添加节点 + $this->InfoStructures_model->Add_with_sitecode($target_is_id, $this->InfoContents_model->insert_id, 999, $dest->is_sitecode); + $node_map[$item->is_id] = $this->InfoStructures_model->insert_id; } From 71f9e187aa32b0d53bc27fa5ec80bc507981ee60 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Dec 2023 14:16:04 +0800 Subject: [PATCH 6/9] fux --- application/controllers/information.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 9abcd6a4..040798ca 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -233,10 +233,10 @@ class Information extends CI_Controller $info_detail = $this->Information_model->Detail($is_id); //删除前，备份amp的meta标签-isid。 - $meta_value = $this->InfoMetas_model->get($info_detail->ic_id, 'AMP_JSON'); - if ($meta_value) { - $this->Logs_model->backup_meta($info_detail->ic_id, $meta_value, 'AMP_JSON_' . $is_id); - } + //$meta_value = $this->InfoMetas_model->get($info_detail->ic_id, 'AMP_JSON'); + //if ($meta_value) { + // $this->Logs_model->backup_meta($info_detail->ic_id, $meta_value, 'AMP_JSON_' . $is_id); + //} $this->Logs_model->delete($is_id, $info_detail->ic_content); if (!empty($info_detail->ic_summary)) { From da2af2a25954396f24ab3cbb85a1c2a8d306e937 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Mon, 25 Dec 2023 15:07:34 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=9C=80=E6=96=B0=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=9D=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 3 ++ application/models/feedback_model.php | 64 ++++++++++++------------- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 9abcd6a4..a9080def 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1260,6 +1260,9 @@ class Information extends CI_Controller { $feedback_newest = $this->Feedback_model->test_feedback_newest(); var_dump($feedback_newest); + echo '------------------------------------------------------'; + $feedback_newest = $this->Feedback_model->test_feedback_newest(10); + var_dump($feedback_newest); } public function test_feedback30() diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php index c58d687d..6cbc5639 100644 --- a/application/models/feedback_model.php +++ b/application/models/feedback_model.php @@ -8,43 +8,43 @@ class Feedback_model extends CI_Model { } /** - * 返回最新八条反馈信息 + * 返回最新反馈信息，默认 20条 */ - function get_feedback_newest() { - - $feedback_query = - $this->HT->query(" - select top 40 - tad_content, tai_customerid, tai_title, tai_getdate, tai_url - from Eva_TAInfo tai - left join Eva_TADetail on TAD_TAI_SN=TAI_SN - left join Eva_TAGuidePrize tgp on tgp.TGP_TAI_SN = tai.TAI_SN - where TAD_Content is not null - and isnull(TAI_DeleteFlag,0) = 0 and isnull(tgp.TGP_CheckState, 0) = 136002 - order by tai_getdate desc"); + function get_feedback_newest($row_limit = 20) { + $total_limit = $row_limit * 2; + $feedback_query = + $this->HT->query(" + select top ? + tad_content, tai_customerid, tai_title, tai_getdate, tai_url + from Eva_TAInfo tai + left join Eva_TADetail on TAD_TAI_SN=TAI_SN + left join Eva_TAGuidePrize tgp on tgp.TGP_TAI_SN = tai.TAI_SN + where TAD_Content is not null + and isnull(TAI_DeleteFlag,0) = 0 and isnull(tgp.TGP_CheckState, 0) = 136002 + order by tai_getdate desc", $total_limit); - $feedback_result = $feedback_query->result(); - $feedback_list = []; - $customer_id_list = []; + $feedback_result = $feedback_query->result(); + $feedback_list = []; + $customer_id_list = []; - foreach ($feedback_result as $feedback_row) { - $createdOn = new DateTime($feedback_row->tai_getdate); - $createdOnString = $createdOn->format('M Y'); - $feedback_count = COUNT($feedback_list); - if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) { - $feedback = [ - 'title' => $feedback_row->tai_title, - 'customer' => $feedback_row->tai_customerid, - 'content' => $feedback_row->tad_content, - 'url' => $feedback_row->tai_url, - 'createdOn' => $createdOnString - ]; - $feedback_list[] = $feedback; - $customer_id_list[] = $feedback_row->tai_customerid; - } + foreach ($feedback_result as $feedback_row) { + $createdOn = new DateTime($feedback_row->tai_getdate); + $createdOnString = $createdOn->format('M Y'); + $feedback_count = COUNT($feedback_list); + if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < $row_limit) { + $feedback = [ + 'title' => $feedback_row->tai_title, + 'customer' => $feedback_row->tai_customerid, + 'content' => $feedback_row->tad_content, + 'url' => $feedback_row->tai_url, + 'createdOn' => $createdOnString + ]; + $feedback_list[] = $feedback; + $customer_id_list[] = $feedback_row->tai_customerid; } + } - return $feedback_list; + return $feedback_list; } function test_feedback_newest() { From b9eaff1db57cc9125f6da0d121fce286c2addcd9 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Mon, 25 Dec 2023 15:09:46 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 6660152a..2b4e654a 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1258,10 +1258,10 @@ class Information extends CI_Controller public function test_feedback() { - $feedback_newest = $this->Feedback_model->test_feedback_newest(); + $feedback_newest = $this->Feedback_model->get_feedback_newest(); var_dump($feedback_newest); echo '------------------------------------------------------'; - $feedback_newest = $this->Feedback_model->test_feedback_newest(10); + $feedback_newest = $this->Feedback_model->get_feedback_newest(10); var_dump($feedback_newest); } From 8fc3933256f2af3f09273b96a53c334e9ca64d54 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Mon, 25 Dec 2023 15:21:35 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E7=AD=BE=20NEWE?= =?UTF-8?q?ST=5FFEEDBACK=5F10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 15 +++++++++++- .../mobile_first/ah-feedback-newest-10.php | 23 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 application/views/mobile_first/ah-feedback-newest-10.php diff --git a/application/controllers/information.php b/application/controllers/information.php index 2b4e654a..cbe16f7f 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1930,6 +1930,18 @@ class Information extends CI_Controller $template = str_replace('', $tips_right_list_content, $template); + // + $feedback_newest_10 = $this->Feedback_model->get_feedback_newest(10); + $feedback_newest_10_content = $this->load->view( + 'mobile_first/ah-feedback-newest-10', + array('feedback_list' => $feedback_newest_10), + true + ); + str_replace( + '', + $feedback_newest_10_content, + $template); + //文中的信息推荐 if (strpos($information->ic_content, '') !== false) { $information->ic_content = str_replace('', $this->load->view($template_path . '-recommends-article', array('recommands' => $template_recommand), true), $information->ic_content); @@ -2100,9 +2112,10 @@ class Information extends CI_Controller } } + // $feedback_newest = $this->Feedback_model->get_feedback_newest(); $feedback_newest_content = $this->load->view( - $template_path . '-feedback-newest', + 'mobile_first/ah-feedback-newest', array('feedback_list' => $feedback_newest), true ); diff --git a/application/views/mobile_first/ah-feedback-newest-10.php b/application/views/mobile_first/ah-feedback-newest-10.php new file mode 100644 index 00000000..f2c04a47 --- /dev/null +++ b/application/views/mobile_first/ah-feedback-newest-10.php @@ -0,0 +1,23 @@ +
+ + $feedback) {?> +
+ + +
+ +
\ No newline at end of file