From 483dda454dbba3fbb446b603db44f7035cc97484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Tue, 2 Apr 2024 14:45:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A6=99=E6=B8=AF=EF=BC=8C=E5=8F=B0?= =?UTF-8?q?=E6=B9=BE=EF=BC=8C=E6=BE=B3=E9=97=A8=E4=B8=89=E5=9C=B0=E6=90=BA?= =?UTF-8?q?=E7=A8=8B=E5=87=BA=E7=A5=A8=E6=97=B6=EF=BC=8C=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=A0CN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/trainsystem/controllers/addorders.php | 8 +++++++- gys_system/models/user_model.php | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php index 5bb18194..7d23b3bc 100644 --- a/application/third_party/trainsystem/controllers/addorders.php +++ b/application/third_party/trainsystem/controllers/addorders.php @@ -791,7 +791,13 @@ class addorders extends CI_Controller{ $passagersdata[$i]->contactMobile = ""; $passagersdata[$i]->contactEmail = ""; if (!empty($PassagerInfo->BPE_Nationality)){ - $passagersdata[$i]->regionCode = $PassagerInfo->BPE_Nationality; //国家简码 美国us ,中国cn + $regionCode = $PassagerInfo->BPE_Nationality; + if ($regionCode =="TW" || $regionCode=="HK" || $regionCode=="MO"){ + $passagersdata[$i]->regionCode = "CN"; + }else{ + $passagersdata[$i]->regionCode = $regionCode; //国家简码 美国us ,中国cn + } + } $i++; diff --git a/gys_system/models/user_model.php b/gys_system/models/user_model.php index 250b7dc5..ab3eb443 100644 --- a/gys_system/models/user_model.php +++ b/gys_system/models/user_model.php @@ -121,7 +121,7 @@ class User_model extends CI_Model { WHERE TGI2_TGI_SN = TGI_SN AND TGI2_LGC = 2 AND LEN(TGI2_Name) > 0 - AND TGI2_Name LIKE '23%' + AND TGI2_Name LIKE '24%' AND TGI_VEI_SN = ? ORDER BY TGI2_Name ASC From a269b1fdf454c4534d9f0f92ad131675a0263294 Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 3 Apr 2024 09:52:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0about=20us?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 29 ++++-------------------- application/views/mobile_first/ch.php | 1 + 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index c0943d05..5a707d10 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -128,8 +128,10 @@
  • Yunnan
    • -
  • Hong Kong
    • +
  • Asia Tours
    • @@ -255,30 +257,6 @@ -
  • Asia Tours -
    - -
    -
  • Day Tours
      @@ -297,6 +275,7 @@
    • +
  • About us
  • Contact us
    • diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 3a9bf84b..3b3480dd 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -118,6 +118,7 @@ href="#">Day Tours + From 3622569c3bc4dbec9ed6e8f6a013aae6305ef511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Wed, 3 Apr 2024 10:04:12 +0800 Subject: [PATCH 3/6] =?UTF-8?q?CH=E7=81=AB=E8=BD=A6=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=94=B9=E7=89=88=EF=BC=8C=E5=8E=BB=E6=8E=89top=20banner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 29 ++++++++++++------- .../views/mobile_first/ch-train-index.php | 2 +- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 599b2b76..4fe2a085 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1017,8 +1017,25 @@ class Information extends CI_Controller $information->ic_content ); + + // 火车票首页搜索框 --zp + $template_TrainSearch = ""; + if ($information->ic_url == "/china-trains/hometest.htm" || $information->ic_url == "/china-trains/") { + $template_TrainSearch = $this->load->view($template_path . '-train-index', null, true); + $information->ic_content = str_replace( + '', + $template_TrainSearch, + $information->ic_content + ); + + if ($device == "mobile") { + //手机端的搜索框直接显示，不再加背景图，这样可以保证CLS分数。 + $template = str_replace('', '
    ' . $template_TrainSearch . '
    ', $template); + } + } + //火车票搜索框添加 -- zp - if ($information->is_parent_id == "278008234") { + if ($information->is_parent_id == "278008234" && $information->ic_url != "/china-trains/") { //20240403 字节 //本地测试的火车父类ID为：278035939 。网前为：278008234 $meta_train_city = get_meta($information->ic_id, 'meta_train_city'); //默认的出发及目的地城市 ， beijing|shanghai $data_TrainCity = array(); @@ -1329,15 +1346,7 @@ class Information extends CI_Controller $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture'); } - // 火车票首页搜索框 --zp - $template_TrainSearch = ""; - if ($information->ic_url == "/china-trains/hometest.htm" || $information->ic_url == "/china-trains/") { - $template_TrainSearch = $this->load->view($template_path . '-train-index', null, true); - if ($device == "mobile") { - //手机端的搜索框直接显示，不再加背景图，这样可以保证CLS分数。 - $template = str_replace('', '
    ' . $template_TrainSearch . '
    ', $template); - } - } + //顶部视频 $meta_news_video = get_meta($information->ic_id, 'meta_news_video'); $meta_video_picture = get_meta($information->ic_id, 'meta_video_picture'); diff --git a/application/views/mobile_first/ch-train-index.php b/application/views/mobile_first/ch-train-index.php index e3493b72..a76aef2f 100644 --- a/application/views/mobile_first/ch-train-index.php +++ b/application/views/mobile_first/ch-train-index.php @@ -77,7 +77,7 @@ From c600f95b4760035a1128ffeba1ae3289aad5393d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Wed, 3 Apr 2024 10:07:39 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=81=AB=E8=BD=A6=E9=A6=96=E9=A1=B5fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 1a0a5ad7..759fd2eb 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1027,11 +1027,6 @@ class Information extends CI_Controller $template_TrainSearch, $information->ic_content ); - - if ($device == "mobile") { - //手机端的搜索框直接显示，不再加背景图，这样可以保证CLS分数。 - $template = str_replace('', '
    ' . $template_TrainSearch . '
    ', $template); - } } //火车票搜索框添加 -- zp From b03a12669842e8e1ecf9e3d8f4c053ab0bb96bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Wed, 3 Apr 2024 10:12:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 759fd2eb..f69e48f2 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1341,23 +1341,13 @@ class Information extends CI_Controller $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture'); } -<<<<<<< HEAD //顶部视频 $meta_news_video = get_meta($information->ic_id, 'meta_news_video'); $meta_video_picture = get_meta($information->ic_id, 'meta_video_picture'); if (!empty ($meta_news_video) && !empty ($meta_video_picture)) { $template = str_replace('', '
    ', $template); -======= - // 火车票首页搜索框 --zp - $template_TrainSearch = ""; - if ($information->ic_url == "/china-trains/hometest.htm" || $information->ic_url == "/china-trains/") { - $template_TrainSearch = $this->load->view($template_path . '-train-index', null, true); - if ($device == "mobile") { - //手机端的搜索框直接显示，不再加背景图，这样可以保证CLS分数。 - $template = str_replace('', '
    ' . $template_TrainSearch . '
    ', $template); - } ->>>>>>> a269b1fdf454c4534d9f0f92ad131675a0263294 + } if (is_file('D:/wwwroot/origin-data.chinahighlights.com/css/mobile-first.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 From 5b429599ebda729c278ea8b29ab4ae3faf57f834 Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 3 Apr 2024 11:46:58 +0800 Subject: [PATCH 6/6] =?UTF-8?q?newsletter=20jquery=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 2 +- application/views/mobile_first/ch.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 5a707d10..5f5aef6d 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -302,7 +302,7 @@ more
    - +
    diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 3b3480dd..035cf21e 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -334,7 +334,7 @@ - +