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

application/controllers/information.php

@@ -936,7 +936,7 @@ class Information extends CI_Controller
             $template);
 
         $tour_form_content = $this->load->view(
-            $template_path . '-gh-tour-form',
+            $template_path . '-tour-form',
             array('information' => $information),
             true);
         $template = str_replace(
@@ -957,10 +957,7 @@ class Information extends CI_Controller
             $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture');
         }
 
-        //非产品页面
         $meta_product_code = get_meta($information->ic_id, 'meta_product_code');
-        if (empty($meta_product_code)) {
-
         $ads_by_google = !empty(get_meta($information->ic_id, 'meta_google_ad_article'));
         //H1模板替换
         $data_H1 = array();
@@ -982,14 +979,6 @@ class Information extends CI_Controller
             array('information' => $information, 'author' => $author),
             true);
         $template = str_replace('<!--@STRUCTURED-DATA-ARTICLE-BLOCK@-->', $article_structured_data_content, $template);
-        } else {
-//            $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);
-//            $information->ic_content = str_replace('<!--@INQUIRY-FORM@-->', $inquiry_form_template, $information->ic_content);
-//
-//            $breadcrumb_content = $this->load->view($template_path . '-breadcrumb', array('breadcrumb_data' => $breadcrumb_data), true);
-//            $information->ic_content = str_replace('<!--@BREADCRUMB-BLOCK@-->', $breadcrumb_content, $information->ic_content);
-        }
 
         //信息推荐
         $template_recommand = $recommand_information; //$this->recommand_information($information); 从外面传进来，pc和移动只需要查一次，减少数据库负担
@@ -1023,7 +1012,6 @@ class Information extends CI_Controller
         }
 
 
-
         if (is_file('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')) {//主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速
             $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css'));
         } else {

wysiwyg/ckfinder/config.php

@@ -77,6 +77,9 @@ switch ($sitecode){
     case 'gm':
         $site_url = 'https://data.chinarundreisen.com';
         break;
+    case 'gh':
+        $site_url = 'https://data.globalhighlights.com';
+        break;
     case 'ah':
         $site_url = 'https://data.asiahighlights.com';
         break;
@@ -103,6 +106,7 @@ switch ($sitecode){
 }
 
 //文件上传目录，使用相对路径，在文件夹中建立虚拟目录指向真实文件夹
+//创建指向目录  mklink /D D:\wwwroot\uploader-file\gh\image  D:\wwwroot\origin-www.globalhighlights.com\image
 //需要移出项目文件夹，防止FTP访问到，防止误删
 if ('origin-int.mycht.cn' == $_SERVER["SERVER_NAME"] || 'origin-gm.mycht.cn' == $_SERVER["SERVER_NAME"]) {
     // 国际站和德语站不需要更改目录