diff --git a/application/controllers/information.php b/application/controllers/information.php index 1d4c3b65..f69e48f2 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1017,8 +1017,20 @@ 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 + ); + } + //火车票搜索框添加 -- 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,14 +1341,13 @@ 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'); + if (!empty ($meta_news_video) && !empty ($meta_video_picture)) { + $template = str_replace('', '
', $template); + } if (is_file('D:/wwwroot/origin-data.chinahighlights.com/css/mobile-first.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 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/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index c0943d05..5f5aef6d 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
    • +
  • About us
  • Contact us
    • @@ -323,7 +302,7 @@ more
    - +
    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 @@
    diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 3a9bf84b..035cf21e 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -118,6 +118,7 @@ href="#">Day Tours + @@ -333,7 +334,7 @@ - +
    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