From 626356796cc1357330c253310a3cc2f5e0c628e3 Mon Sep 17 00:00:00 2001 From: cyc Date: Tue, 18 Jun 2019 15:02:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0AH=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=8D=95=E7=8B=AC=E7=9A=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/config/config.php | 6 ++++++ application/controllers/information.php | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/application/config/config.php b/application/config/config.php index f04b8859..b136d9e7 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -920,6 +920,12 @@ $config['InfoType_ct'] = array( '一日游线路详细' => 'c_day_tour' ); +//ct站点用到了 +$config['InfoType_ah'] = array( + '国家信息' => 'country_info', + '区域信息' => 'area_info' +); + //可选模板 $config['templates'] = array( '通用内容模板' => 'guide_info_detail', diff --git a/application/controllers/information.php b/application/controllers/information.php index 9de4109c..2a982b4a 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -198,8 +198,9 @@ class Information extends CI_Controller if ($Structure->is_sitecode == 'ct') { $data['infoTypeList'] = $this->config->item('InfoType_ct'); - } else { - + } elseif($Structure->is_sitecode == 'ah'){ + $data['infoTypeList'] = $this->config->item('InfoType_ah'); + }else { switch ($data['rootInformation']->ic_ht_area_type) { case 'c': //城市 $data['infoTypeList'] = $this->config->item('InfoType_city'); From 43c496c9675dc7a6548a414c8eaf0f2b187b956f Mon Sep 17 00:00:00 2001 From: cyc Date: Tue, 18 Jun 2019 15:22:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9AH=20amp=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/htmlcompressor/views/amp-template/ah.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/third_party/htmlcompressor/views/amp-template/ah.php b/application/third_party/htmlcompressor/views/amp-template/ah.php index ce7d0666..e7c66b5a 100644 --- a/application/third_party/htmlcompressor/views/amp-template/ah.php +++ b/application/third_party/htmlcompressor/views/amp-template/ah.php @@ -108,6 +108,7 @@
@AMP-GOOGLE-ANALYTICS@ +@AMP-CONSTRUCT-TAG@