diff --git a/application/controllers/information.php b/application/controllers/information.php index 4fe2a085..1a0a5ad7 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1346,12 +1346,23 @@ 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')) { //主样式表,内联模式,优先读取本地,没有在从网络读取,为了加速 diff --git a/application/views/cache/update.php b/application/views/cache/update.php index ba5145e3..522d7325 100644 --- a/application/views/cache/update.php +++ b/application/views/cache/update.php @@ -176,8 +176,7 @@ 更新 @@ -195,8 +194,9 @@ $it) { - $encode = mb_detect_encoding($it, array('ASCII', 'GBK', 'ISO-8859-1', 'UTF-8')); - $_it = mb_convert_encoding($it, 'UTF8', $encode); + // $encode = mb_detect_encoding($it, array('ASCII', 'GBK', 'ISO-8859-1', 'UTF-8')); + // $_it = mb_convert_encoding($it, 'UTF8', $encode); + $_it = preg_replace('/#(.*)$/i', '', $it); ?> @@ -213,7 +213,7 @@ - + 无操作 diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 438627f9..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 @@ - +
  • Contact us
  • @@ -322,7 +301,6 @@ experience. Learn more -
    diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 500a9a23..3b3480dd 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -118,6 +118,7 @@ href="#">Day Tours + @@ -333,8 +334,6 @@ - - diff --git a/application/views/mobile_first/gh-h1.php b/application/views/mobile_first/gh-h1.php index 5a279417..bc16ba63 100644 --- a/application/views/mobile_first/gh-h1.php +++ b/application/views/mobile_first/gh-h1.php @@ -1,8 +1,4 @@
    - - <?php echo !empty($ic_title)?$ic_title:'H1 title globalhighlights mobile first template'; ?> -
    diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index b4bf250e..5ab95b84 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -239,24 +239,7 @@

    Be the first to receive exciting updates, exclusive promotions, and valuable travel tips from our team of experts.

    -
    - - - -
    +