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

mm

application/config/config.php

@@ -924,6 +924,7 @@ $config['templates_gm'] = array(
     '文化模板 [单页式]' => 'culture_info_detail_one_page',
     '文化模板 [导航式]' => 'culture_info_detail_with_category',
     '信息专题模板' => 'guide_top_series',
+	'列表式' => 'guide_info_list',
 	'空白模板'=>'none'
 );
 

application/controllers/information.php

@@ -528,7 +528,7 @@ class Information extends CI_Controller {
                 break;
 
             case 'gm':
-                GET_HTTP("http://148.251.35.42:3300/create-cache/?url=" . urlencode($url)); //请求nodejs静态化更新页面，删除缓存，因为部分页面没有进入信息平台
+                //GET_HTTP("http://148.251.35.42:3300/create-cache/?url=" . urlencode($url)); //请求nodejs静态化更新页面，删除缓存，因为部分页面没有进入信息平台
                 if ($delete_only) {
                     $url = "http://144.76.185.44:8029/gm.php/information/delete_cache_23Xd913mddkgssODII?static_html_url=" . urlencode($url);
                 } else {

application/third_party/train/controllers/search.php

@@ -438,7 +438,7 @@ class search extends CI_Controller{
 	function ticket_exchange($price,$num){
 	    //echo $this->can_buy_now;
 		if($this->cache == 'yes' || $this->seveth == 'yes'){
-			if(isset($price)){
+			if(isset($price) && is_numeric($num)){
 				if($price > 0){
 					return '有';
 				}else{

application/views/bootstrap3/information_edit.php

@@ -1257,13 +1257,13 @@
             <input type="checkbox" name="ignore_url_check" id="ignore_url_check" />忽略URL重复
           </label>
           <div class="clearfix"></div>
-          <?php if ($this->config->item('site_code') == 'cht') { ?>
+          <?php if (in_array($this->config->item('site_code'),array('cht','gm'))) { ?>
             <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
               <input type="checkbox" name="auto_update_cache_checkbox" id="auto_update_cache_checkbox" onclick="get_update_cache_url();" value="<?php echo $information->ic_url; ?>" />静态更新
             </label>
           <?php } ?>
           
-          <?php if  (in_array($this->config->item('site_code'),array('cht','ah','gn'))) { ?>
+          <?php if  (in_array($this->config->item('site_code'),array('cht','ah','gm'))) { ?>
           <label class="checkbox col-xs-24" style="font-weight: normal;margin-top:0;padding-left: 21px;">
             <input type="checkbox" name="auto_update_amp" id="auto_update_amp" <?php if($information->amp_status==='2'){echo 'disabled';} ?> value="true" />AMP更新 <?php if($information->amp_status==='2'){echo '<i class="glyphicon glyphicon-hand-up" title="手动管理，不会自动更新"></i>'; } ?>
             </label>