From 1d87b70c63a114b9143708de2ba1a296ee70a2db Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Tue, 26 Dec 2023 14:55:21 +0800 Subject: [PATCH 1/2] add config gh --- application/config/config.php | 6 ++++++ application/controllers/information.php | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/application/config/config.php b/application/config/config.php index 3aec1bec..8cb207d0 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -1070,6 +1070,12 @@ $config['templates_gm'] = array( '空白模板' => 'none', ); +//德语信息模板 +$config['templates_gh'] = array( + '通用内容模板' => 'guide_info_detail', + '带导航' => 'guide_with_nav' +); + // CHT 信息模板 $config['templates_cht'] = array( '通用内容模板' => 'guide_info_detail', diff --git a/application/controllers/information.php b/application/controllers/information.php index ae55198e..e21559a5 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -306,6 +306,11 @@ class Information extends CI_Controller $this->config->set_item('templates', $this->config->item('templates_i')); } + //可选的展示模板 + if (in_array($this->config->item('site_code'), array('gh_vac', 'gh_vc', 'gh_jp', 'gh_ru', 'gh_it'))) { + $this->config->set_item('templates', $this->config->item('templates_gh')); + } + if (in_array($this->config->item('site_code'), array('ah'))) { $this->config->set_item('templates', $this->config->item('templates_ah')); } @@ -1283,8 +1288,9 @@ class Information extends CI_Controller } } - public function test_get_feedback_by_city_name() { - + public function test_get_feedback_by_city_name() + { + $feedback_list = $this->Feedback_model->get_feedback_by_city_name('Bangkok', 5); var_dump($feedback_list); } From 42ab2c9c8192877c92b45a8f2ea6c636c5f2920a Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 26 Dec 2023 15:51:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=9C=B0=E4=B8=8B=E5=86=85=E5=AE=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-pc.php | 161 ++++++++++++++--------- 1 file changed, 98 insertions(+), 63 deletions(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 2dc5e7c3..4f5f3304 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -54,7 +54,8 @@ w.gh_template_name = w.gh_template_name || 'desktop'; })(window); - + @@ -73,6 +74,68 @@
  • Destinations
    +
    +
    Europe
    + +
    +
    +
    Asia
    + +
    + + +
    +
    +
    Middle East
    -
    Southeast Asia
    - -
    -
    -
    North Asia
    - +
    Africa
    South America
    - -
    -
    -
    Central Asia
    +
    • @@ -185,7 +219,8 @@ -
    Create my trip +
    Create + my trip
    @@ -360,7 +395,7 @@ - - + @@ -472,13 +507,13 @@ } - - - + + +