From fb2b5de674bd01ca7b6dcc88855a070aa92b54e1 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Tue, 28 May 2024 16:08:15 +0800 Subject: [PATCH 01/54] format --- application/controllers/infofix.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php index 731dc67b..425244e4 100644 --- a/application/controllers/infofix.php +++ b/application/controllers/infofix.php @@ -108,8 +108,8 @@ class infofix extends CI_Controller } $info->ic_content = $key_with_content; - unset($info->amp_json); - unset($info->amp_body); + unset($info->amp_json); + unset($info->amp_body); } echo json_encode($rs); } From f846137062ecbe2915a6a73c0b50d4c99cff2603 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 29 May 2024 09:20:55 +0800 Subject: [PATCH 02/54] fix --- application/controllers/infofix.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php index 425244e4..305a4c1e 100644 --- a/application/controllers/infofix.php +++ b/application/controllers/infofix.php @@ -51,7 +51,7 @@ class infofix extends CI_Controller $sub_url = explode('@@@',$sub_url); } - $limitStr = 50; + $limitStr = 100; // 信息内容 $pos_content = 0; $pos_content = mb_stripos($info->ic_content, $key); From 4335e662251665d40bf7170460baf8d137197919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=96=87=E5=BC=BA=40HWQ-PC?= Date: Wed, 29 May 2024 15:59:45 +0800 Subject: [PATCH 03/54] =?UTF-8?q?CH=E6=88=90=E6=9C=AC=E5=B8=81=E7=A7=8D?= =?UTF-8?q?=E6=8D=A2=E7=AE=97=E6=88=90=E7=94=A8=E7=BE=8E=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/information.php b/application/controllers/information.php index 433ebe00..1e4e43ad 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1603,6 +1603,7 @@ class Information extends CI_Controller } } } + $price_number = $this->currency->convert_moneny_by_char($price_number,"USD"); $site_money = $this->currency->calc_show_price($price_number); //把金额格式化为带有逗号(,)方便阅读，如 12,345 $price_number = is_numeric($price_number) ? number_format($site_money) : $price_number; From 1c8ef378e6d8f33acd25e87b1b5b4d82d4c6c0ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=96=87=E5=BC=BA=40HWQ-PC?= Date: Wed, 29 May 2024 17:06:51 +0800 Subject: [PATCH 04/54] =?UTF-8?q?CH=E6=88=90=E6=9C=AC=E6=8D=A2=E7=AE=97?= =?UTF-8?q?=E6=88=90=E7=BE=8E=E5=85=83=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=AFch=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 1e4e43ad..a74213d5 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1603,7 +1603,9 @@ class Information extends CI_Controller } } } - $price_number = $this->currency->convert_moneny_by_char($price_number,"USD"); + if($dept_sn == 1){ + $price_number = $this->currency->convert_moneny_by_char($price_number,"USD"); + } $site_money = $this->currency->calc_show_price($price_number); //把金额格式化为带有逗号(,)方便阅读，如 12,345 $price_number = is_numeric($price_number) ? number_format($site_money) : $price_number; From 5f1a375473ea6dc2f618a477888046d72ab78fb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Fri, 31 May 2024 10:38:47 +0800 Subject: [PATCH 05/54] =?UTF-8?q?CT=E7=AB=99=E6=89=8B=E5=8A=A8=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 433ebe00..3b24fab8 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -2466,9 +2466,14 @@ class Information extends CI_Controller //作者字符串，信息页或者城市天气页加载 2022-7-26 $str_author = ""; $author = $this->Operator_model->get_author_nikename($information->ic_author); + $meta_news_createdate = get_meta($information->ic_id, 'meta_news_createdate'); //信息发布时间 if ((empty($meta_product_code) && !($meta_ct_page_type !== false && $meta_ct_page_type != "")) || $meta_ct_page_type == "weatherpage") { $OPI_FirstName = !empty($author) ? $author->OPI_FirstName : 'author nickname'; - $str_author = '
Written by ' . $OPI_FirstName . ' Updated ' . date("M. j, Y", strtotime($information->ic_datetime)) . '
'; + $EditTime = strtotime($information->ic_datetime); //如果有录入信息发布时间的属性，就读取这个 + if (!empty($meta_news_createdate)){ + $EditTime = strtotime($meta_news_createdate); + } + $str_author = '
Written by ' . $OPI_FirstName . ' Updated ' . date("M. j, Y", $EditTime) . '
'; } //火车票详细页搜索框添加 -- zp From 3c198cb7d1ad7d4ad5032f13f7b7590a1690082a Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 3 Jun 2024 10:18:02 +0800 Subject: [PATCH 06/54] =?UTF-8?q?=E6=B3=A8=E9=87=8A=20sms=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/models/infoSMS_model.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/application/models/infoSMS_model.php b/application/models/infoSMS_model.php index a4154c6d..cfb7cf95 100644 --- a/application/models/infoSMS_model.php +++ b/application/models/infoSMS_model.php @@ -37,17 +37,23 @@ class InfoSMS_model extends CI_Model //设置已读 function readed($m_id) { + /* 不再使用注释-lmr $sql = "UPDATE infosms \n" . "SET m_readed = 1 \n" . "WHERE m_id = ?"; return $this->HT->query($sql,array($m_id)); + */ + return array(); } function readed_for_info($m_object_id,$m_object_type='info') { + /* 不再使用注释-lmr $sql = "UPDATE infosms \n" . "SET m_readed = 1 \n" . "WHERE m_object_type=? and m_object_id = ?"; return $this->HT->query($sql,array($m_object_type,$m_object_id)); + */ + return array(); } //获取未读消息 From d28e6ab06c9f6bac71ac5a90d994057c2ad46070 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 3 Jun 2024 10:40:41 +0800 Subject: [PATCH 07/54] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E8=B7=A8=E5=9B=BD=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-pc.php | 66 ------------------------ 1 file changed, 66 deletions(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 32569bdf..8fb53335 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -46,72 +46,6 @@ alt="Asiahighlights logo" class="asiahighlightslogo img-responsive">
  • Tours
    • -
  • Thailand-Vietnam-Cambodia -
    -
    -
    - Thailand-Vietnam-Cambodia - - - -
    - -
    - Vietnam & - Cambodia - - - -
    - -
    - Vietnam & - Thailand - -
    - -
    - Thailand & - Cambodia - -
    -
    -
    -
    • -
  • Destinations
    From 53924c2450902b16f626361b896334f01de30ccf Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 3 Jun 2024 15:59:41 +0800 Subject: [PATCH 08/54] =?UTF-8?q?=E5=BA=95=E9=83=A8TM=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E4=BF=AE=E6=94=B9=E4=B8=BA=20/forms/create-m?= =?UTF-8?q?y-trip.htm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 4 ++-- application/views/mobile_first/ch.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index ab654ff2..d07cd223 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -307,7 +307,7 @@ -
    Create my trip
    @@ -328,7 +328,7 @@ Start planning your tailor-made tour with 1-1 help from our travel advisors. - Create Your Trip diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index c60c4272..27709f33 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -342,7 +342,7 @@ -
    Create +
    Create My Trip
    @@ -351,7 +351,7 @@
    Start planning your tailor-made tour with 1-1 help from our travel advisors. - Create Your Trip + Create Your Trip
    From ffb9629cbdeaefde2303ce41b280214ea32e2613 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 6 Jun 2024 14:54:26 +0800 Subject: [PATCH 09/54] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=B7=BB=E5=8A=A0alt?= =?UTF-8?q?=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 6 +++--- application/views/mobile_first/ch.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index d07cd223..446c1f21 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -433,9 +433,9 @@
    + style="float: left; margin-right: 10px; margin-bottom: 10px; width: 170px; height: 121px;" alt="China Highlights logo"/>
    - + Trip Advisor rating Rated 5 out of 5 | 98.8% Excellence
    China Highlights International
    Travel Service Co., LTD
    @@ -514,7 +514,7 @@
    diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 27709f33..c3013c5d 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -58,7 +58,7 @@