diff --git a/application/controllers/information.php b/application/controllers/information.php index 11141576..76c353bd 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -951,7 +951,19 @@ class Information extends CI_Controller break; default: } - $breadcrumb_data = $this->Information_model->get_path_exclude_self($information->is_id, $information->is_path); + + // GH Home 下层节点名称和链接映射 + $group_map = [ + 278009289 => [ + 'ic_url' => '/destinations', + 'ic_url_title' => 'Destinations' + ], + 278009290 => [ + 'ic_url' => '/about', + 'ic_url_title' => 'About Us' + ] + ]; + $breadcrumb_data = $this->Information_model->get_breadcrumb_data($information->is_id, $information->is_path, $group_map); $breadcrumb_structured_data_content = $this->load->view( $template_path . '-structured-data-breadcrumb', @@ -1368,7 +1380,9 @@ class Information extends CI_Controller $data["DESCRIPTION"] = $information->ic_seo_description; $data["KEYWORDS"] = $information->ic_seo_keywords; $data["CANONICAL"] = $this->config->item('site_url') . $information->ic_url; - + $meta_ct_page_type = ""; + $meta_ct_page_type = get_meta($information->ic_id, 'meta_ct_page_type'); //页面类型 + $meta_product_code = get_meta($information->ic_id, 'meta_product_code'); //绑定的产品编号 //面包屑 $crumb = ""; @@ -1381,6 +1395,15 @@ class Information extends CI_Controller $crumb .= ""; } $data["crumb"] = $crumb; + + //作者字符串,信息页或者城市天气页加载 2022-7-26 + $str_author=""; + $author = $this->Operator_model->get_author_nikename($information->ic_author); + if ((empty($meta_product_code) && !($meta_ct_page_type !== false && $meta_ct_page_type != "")) || $meta_ct_page_type=="weatherpage"){ + $OPI_FirstName = !empty($author)?$author->OPI_FirstName:'author nickname'; + $str_author = '
Written by '.$OPI_FirstName.' Updated ' . date("M. j, Y",strtotime($information->ic_datetime)) . '
' ; + } + /* 详细内容 */ $ic_content = $information->ic_content; // /**替换详细内容里面的价格 @@ -1399,8 +1422,8 @@ class Information extends CI_Controller // return '';; // },$ic_content); - /** 替换H1加面包屑 */ - $ic_content = preg_replace('/

(.*)<\/h1>/i', $crumb . "\r\n" . '

$1

', $ic_content, 1); + /** 替换H1加面包屑,加作者 */ + $ic_content = preg_replace('/

(.*)<\/h1>/i', $crumb . "\r\n" . '

$1

' . "\r\n" .$str_author, $ic_content, 1); /**替换zodiac标签 */ if (strpos($ic_content, '') !== false){ @@ -1476,9 +1499,8 @@ class Information extends CI_Controller //总JS:为了方便以后js好维护,必须的把一些公用的JS统计到一个文件。但是又不是所有页面都需要调用这个基础js,所以必须在这里进行判断 $addBaseJs = false; $addonJs = ""; - $meta_ct_page_type = ""; $meta_ct_page_price = get_meta($information->ic_id, 'meta_ct_page_price'); //是否包含价格 - $meta_ct_page_type = get_meta($information->ic_id, 'meta_ct_page_type'); //页面类型 + if ($meta_ct_page_price == "yes") { $addBaseJs = true; } else if ($meta_ct_page_type !== false && $meta_ct_page_type != "") { diff --git a/application/models/logs_model.php b/application/models/logs_model.php index 04c666c6..d0da396a 100644 --- a/application/models/logs_model.php +++ b/application/models/logs_model.php @@ -256,7 +256,14 @@ class Logs_model extends CI_Model . " ( \n" . " ?, ?, N?, ?, N?, GETDATE() \n" . " )"; - $query = $this->HT->query($sql, array($log_action, $is_id, $log_content, $admin_info['OPI_Code'], $admin_info['OPI_Name'])); + + // fix 外部站点调用 + $op_code = NULL; + if ($admin_info['OPI_Code']) $op_code = $admin_info['OPI_Code']; + $op_name = 'outside'; + if ($admin_info['OPI_Name']) $op_name = $admin_info['OPI_Name']; + + $query = $this->HT->query($sql, array($log_action, $is_id, $log_content, $op_code, $op_name)); $this->insert_id = $this->HT->last_id('infoLogs'); return $query; //print_r($this->HT->queries); @@ -276,5 +283,4 @@ class Logs_model extends CI_Model $query = $this->HT->query($sql, array($ic_id)); return $query->row(); } - } diff --git a/application/third_party/trainsystem/controllers/innerTrainSearch.php b/application/third_party/trainsystem/controllers/innerTrainSearch.php index bd05027c..b63afc43 100644 --- a/application/third_party/trainsystem/controllers/innerTrainSearch.php +++ b/application/third_party/trainsystem/controllers/innerTrainSearch.php @@ -430,7 +430,7 @@ class innerTrainSearch extends CI_Controller{ } } - //App项目组的接口 + //App项目组的接口 暂时不用 public function appGroupApi($train_date=null,$fromStation=null,$toStation=null,$return=false){ set_time_limit(0); diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 6e8a9367..1f04765e 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1298,7 +1298,7 @@ - +
@@ -1325,6 +1325,22 @@
+
+ + +
ic_ht_area_type == 'err') { ?>