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

hotfix/paypal-note
candice 4 years ago
commit f9f8059b19

@ -629,13 +629,11 @@ class Information extends CI_Controller
$addthis_widget = $this->load->view($template_path . '-add-this', false, true); $addthis_widget = $this->load->view($template_path . '-add-this', false, true);
$template = str_replace('<!--@ADDTHIS-WIDGET@-->', $addthis_widget, $template); $template = str_replace('<!--@ADDTHIS-WIDGET@-->', $addthis_widget, $template);
if ($information->is_id == '278006460') { $article_structured_data_content = $this->load->view(
$article_structured_data_content = $this->load->view( $template_path . '-structured-data-article',
$template_path . '-structured-data-article', array('information' => $information, 'author' => $author),
array('information' => $information, 'author' => $author), true);
true); $template = str_replace('<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->', $article_structured_data_content, $template);
$template = str_replace('<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->', $article_structured_data_content, $template);
}
} else { } else {
$template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.chinahighlights.com/js/flatpickr.js"></script>', $template); $template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.chinahighlights.com/js/flatpickr.js"></script>', $template);
$inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code' => $meta_product_code), true); $inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code' => $meta_product_code), true);
@ -1197,7 +1195,7 @@ class Information extends CI_Controller
//读取附加移动端图片 //读取附加移动端图片
$data->mobile_photo = get_meta($data->ic_id, 'meta_addon_picture_mobile'); $data->mobile_photo = get_meta($data->ic_id, 'meta_addon_picture_mobile');
if (empty($data->mobile_photo)) { if (empty($data->mobile_photo)) {
if (!empty($information->ic_photo)) { if (!empty($data->ic_photo)) {
$data->mobile_photo = $this->config->item('site_image_url').$data->ic_photo; $data->mobile_photo = $this->config->item('site_image_url').$data->ic_photo;
} else { } else {
$data->mobile_photo = 'https://data.asiahighlights.com/image/travel-guide/thailand/info-template-recommended.jpg'; $data->mobile_photo = 'https://data.asiahighlights.com/image/travel-guide/thailand/info-template-recommended.jpg';

@ -11,7 +11,7 @@
"https://images.chinahighlights.com<?php echo $information->ic_photo; ?>" "https://images.chinahighlights.com<?php echo $information->ic_photo; ?>"
], ],
"datePublished": "<?php echo $information->is_datetime; ?>", "datePublished": "<?php echo $information->is_datetime; ?>",
"dateModified": "<?php echo time(); ?>", "dateModified": "<?php echo date('Y-m-d\TH:i:s'); ?>",
"author": { "author": {
"@type": "Person", "@type": "Person",
"name": "<?php echo $author->OPI_FirstName; ?>" "name": "<?php echo $author->OPI_FirstName; ?>"

Loading…
Cancel
Save