Merge branch 'master' of gitee.com:hainatravel/information-system

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',

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');

application/third_party/htmlcompressor/views/amp-template/ah.php

@@ -108,6 +108,7 @@
 <div class="fixed-addthis"><amp-addthis width="320" height="40" layout="responsive" data-pub-id="ra-598408c3e2fb90c3" data-widget-id="o2ei"></amp-addthis></div>
 <amp-animation id="showAnim"layout="nodisplay"><script type="application/json">{"duration":"200ms","fill":"both","iterations":"1","direction":"alternate","animations":[{"selector":"#scrollToTopButton","keyframes":[{"opacity":"1","visibility":"visible"}]}]}</script></amp-animation><amp-animation id="hideAnim"layout="nodisplay"><script type="application/json">{"duration":"200ms","fill":"both","iterations":"1","direction":"alternate","animations":[{"selector":"#scrollToTopButton","keyframes":[{"opacity":"0","visibility":"hidden"}]}]}</script></amp-animation><div id="marker"><amp-position-observer on="enter:hideAnim.start; exit:showAnim.start"layout="nodisplay"></amp-position-observer></div><a id="scrollToTopButton"on="tap:top-page.scrollTo(duration=200)"class="scrollToTop"></a>
 @AMP-GOOGLE-ANALYTICS@
+@AMP-CONSTRUCT-TAG@
 <!--AMP Builder-->
 </body>
 </html>