From 606b3fc8d8abc9d7bc4d088186f0572131e13803 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Mon, 9 Jun 2025 14:46:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E8=A7=A3=E5=86=B3=E5=AE=A2?= =?UTF-8?q?=E4=BA=BA=E5=8F=8D=E9=A6=88=E5=9B=BD=E7=B1=8D=EF=BC=8C=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=8A=A0=E8=BD=BD=E4=B8=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/models/feedback_model.php | 28 +++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php index 7785dcb7..d0d72ac6 100644 --- a/application/models/feedback_model.php +++ b/application/models/feedback_model.php @@ -91,12 +91,15 @@ class Feedback_model extends CI_Model { $feedback_query = $this->HT->query(" - select top 40 tai_url,tad_content, tai_customerid, tai_title, tai_getdate, vci.cii2_name, g.GRI_EntranceDate, country.COI2_Country + select top 40 tai_url,tad_content, tai_customerid, tai_title, tai_getdate, vci.cii2_name, g.GRI_EntranceDate, coi2.COI2_Country from Eva_TAInfo left join Eva_TADetail on TAD_TAI_SN=TAI_SN left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 left join GRoupInfo g on g.GRI_SN = TAI_GRI_SN - left JOIN V_Country_Info country on country.COI_SN = g.GRI_Country and country.LGC_LGC = 1 + left JOIN ConfirmLineInfo cli on cli.COLI_GRI_SN = g.GRI_SN + left join CUstomerList cul on cul.CUL_COLI_SN = cli.COLI_SN and CUL_IsLinkMan = 1 + left join MEmberInfo mei on mei.MEI_SN = cul.CUL_CUI_SN + left join COuntryInfo2 coi2 on coi2.COI2_COI_SN = mei.MEI_Country and COI2_LGC = 1 where TAD_Content is not null and vci.cii2_name = ? and tai_url not LIKE '%trustpilot.com%' order by tai_getdate desc", array($city_name_list[0])); @@ -105,12 +108,15 @@ class Feedback_model extends CI_Model { $feedback_query = $this->HT->query(" select top 40 - tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name, g.GRI_EntranceDate, country.COI2_Country + tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name, g.GRI_EntranceDate, coi2.COI2_Country from Eva_TAInfo left join Eva_TADetail on TAD_TAI_SN=TAI_SN left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 left join GRoupInfo g on g.GRI_SN = TAI_GRI_SN - left JOIN V_Country_Info country on country.COI_SN = g.GRI_Country and country.LGC_LGC = 1 + left JOIN ConfirmLineInfo cli on cli.COLI_GRI_SN = g.GRI_SN + left join CUstomerList cul on cul.CUL_COLI_SN = cli.COLI_SN and CUL_IsLinkMan = 1 + left join MEmberInfo mei on mei.MEI_SN = cul.CUL_CUI_SN + left join COuntryInfo2 coi2 on coi2.COI2_COI_SN = mei.MEI_Country and COI2_LGC = 1 where TAD_Content is not null and vci.cii2_name = ? order by tai_getdate desc", array($city_name_list[0])); @@ -152,12 +158,15 @@ class Feedback_model extends CI_Model { $feedback_query = $this->HT->query(" select top ? - tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name, g.GRI_EntranceDate, country.COI2_Country + tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name, g.GRI_EntranceDate, coi2.COI2_Country from Eva_TAInfo left join Eva_TADetail on TAD_TAI_SN=TAI_SN left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 left join GRoupInfo g on g.GRI_SN = TAI_GRI_SN - left JOIN V_Country_Info country on country.COI_SN = g.GRI_Country and country.LGC_LGC = 1 + left JOIN ConfirmLineInfo cli on cli.COLI_GRI_SN = g.GRI_SN + left join CUstomerList cul on cul.CUL_COLI_SN = cli.COLI_SN and CUL_IsLinkMan = 1 + left join MEmberInfo mei on mei.MEI_SN = cul.CUL_CUI_SN + left join COuntryInfo2 coi2 on coi2.COI2_COI_SN = mei.MEI_Country and COI2_LGC = 1 where TAD_Content is not null and vci.cii2_name = ? and tai_url not LIKE '%trustpilot.com%' order by tai_getdate desc", array($enough_count, $city_name_list[1])); @@ -166,12 +175,15 @@ class Feedback_model extends CI_Model { $feedback_query = $this->HT->query(" select top ? - tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name, g.GRI_EntranceDate, country.COI2_Country + tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name, g.GRI_EntranceDate, coi2.COI2_Country from Eva_TAInfo left join Eva_TADetail on TAD_TAI_SN=TAI_SN left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 left join GRoupInfo g on g.GRI_SN = TAI_GRI_SN - left JOIN V_Country_Info country on country.COI_SN = g.GRI_Country and country.LGC_LGC = 1 + left JOIN ConfirmLineInfo cli on cli.COLI_GRI_SN = g.GRI_SN + left join CUstomerList cul on cul.CUL_COLI_SN = cli.COLI_SN and CUL_IsLinkMan = 1 + left join MEmberInfo mei on mei.MEI_SN = cul.CUL_CUI_SN + left join COuntryInfo2 coi2 on coi2.COI2_COI_SN = mei.MEI_Country and COI2_LGC = 1 where TAD_Content is not null and vci.cii2_name = ? order by tai_getdate desc", array($enough_count, $city_name_list[1])); From 8aae11368e8a6a761f9dbae6e275948849068d44 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Mon, 9 Jun 2025 14:47:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=BB=B6=E8=BF=9F=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/jh-feedback-list.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/views/mobile_first/jh-feedback-list.php b/application/views/mobile_first/jh-feedback-list.php index 70f90c54..f9f6c6f7 100644 --- a/application/views/mobile_first/jh-feedback-list.php +++ b/application/views/mobile_first/jh-feedback-list.php @@ -29,10 +29,10 @@ TrustPilot Rating + originalsrc="https://images.japanhighlights.com/allpicture/2025/05/e6e82f033e0b4619a0df404f74578d7f_cut_382x193_241_1748531605.jpg" style="margin-bottom: 15px;"> TripAdvisor Rating + originalsrc="https://images.japanhighlights.com/allpicture/2025/05/dd7bda74592b44b3b98833e3e2f1448a_cut_306x176_241_1748531758.jpg"> $feedback) {?> @@ -69,14 +69,14 @@ const infoIcon = document.querySelector('.review-aggregate__info'); const toolTip = document.querySelector('.popper__tooltip'); const closeButton = document.querySelector('.review_close'); - + infoIcon.addEventListener('click', function() { toolTip.style.display = "block"; }); - + closeButton.addEventListener('click', function(event) { toolTip.style.display = "none"; }); - + }); \ No newline at end of file From 68479dd9a8c3d62f965f56c830e3b3907aea182a Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Mon, 9 Jun 2025 14:59:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?TA,=20TP=20=20=E5=9B=BE=E7=89=87=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=87=92=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/jh-feedback-list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/jh-feedback-list.php b/application/views/mobile_first/jh-feedback-list.php index f9f6c6f7..372745d9 100644 --- a/application/views/mobile_first/jh-feedback-list.php +++ b/application/views/mobile_first/jh-feedback-list.php @@ -29,10 +29,10 @@ TrustPilot Rating + src="https://images.japanhighlights.com/allpicture/2025/05/e6e82f033e0b4619a0df404f74578d7f_cut_382x193_241_1748531605.jpg" loader="nolazy" style="margin-bottom: 15px;"> TripAdvisor Rating + src="https://images.japanhighlights.com/allpicture/2025/05/dd7bda74592b44b3b98833e3e2f1448a_cut_306x176_241_1748531758.jpg" loader="nolazy"> $feedback) {?>