diff --git a/application/config/config.php b/application/config/config.php index c60bee8e..6e2b319c 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -2,22 +2,23 @@ ?> array('site_code' => 'pgr', 'site_id' => 148, 'site_lgc' => '2', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'https://www.peregrine.cn', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')), 'ts' => array('site_code' => 'ts', 'site_id' => 149, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'https://www.trainspread.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')), 'bht' => array('site_code' => 'bht', 'site_id' => 6565, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'https://www.beijinghighlights.com', 'site_authors' => array('cj')), - 'trippest' => array('site_code' => 'trippest', 'site_id' => 145, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'https://www.trippest.com', 'site_authors' => array('cj'), 'site_user' => array(',ycc,zp,')) + 'trippest' => array('site_code' => 'trippest', 'site_id' => 145, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'https://www.trippest.com', 'site_authors' => array('cj'), 'site_user' => array(',ycc,zp,')), ); //静态文件生成路径 @@ -453,7 +449,6 @@ $config['cache']['vac']['cache_api_para'] = 'cache_url'; $config['cache']['ru']['cache_api_para'] = 'cache_url'; $config['cache']['it']['cache_api_para'] = 'cache_url'; - //本地测试用 - lmr if (isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] == '202.103.68.62:9999') { $config['site']['jp']['site_url'] = 'http://202.103.68.62:9093'; @@ -496,7 +491,7 @@ $config['InfoType_country'] = array( '国家地图' => 'n_map', '民族传统和文化遗产' => 'n_national', '产品附加信息' => 'product', - '旅游工具箱' => 'n_tools' + '旅游工具箱' => 'n_tools', ); //province控制器用到了 @@ -511,7 +506,7 @@ $config['InfoType_province'] = array( '天气' => 'p_weather', '旅游建议' => 'p_tips', '热门旅游城市' => 'p_popular_city', - '产品附加信息' => 'product' + '产品附加信息' => 'product', ); //city控制器用到了 @@ -553,7 +548,7 @@ $config['InfoType_city'] = array( 'article-Tour Planning' => 'a_tourplanning', 'layout' => 'layout', '一地线路详细' => 'c_single_circuit', - '一日游线路详细' => 'c_day_tour' + '一日游线路详细' => 'c_day_tour', ); //special控制器用到了 @@ -573,13 +568,12 @@ $config['InfoType_special'] = array( 'Top专题' => 't_best_china', 'Spotlight文章' => 't_spotlight', '专题首页推介' => 't_topic_promotion', - '产品附加信息' => 'product' + '产品附加信息' => 'product', ); - //special控制器用到了 $config['InfoType_video'] = array( - '不设置' => 'none' + '不设置' => 'none', ); //节庆 @@ -587,7 +581,7 @@ $config['InfoType_festival'] = array( '不设置' => 'none', '民族节庆' => 'f_national', '传统节庆' => 'f_tradition', - '旅游节庆' => 'f_travel' + '旅游节庆' => 'f_travel', ); //公民游 @@ -601,10 +595,9 @@ $config['InfoType_citizen'] = array( '景点详细' => 'w_attraction_detail', '地图目录' => 'w_map', '地图详细' => 'w_map_detail', - '产品' => 'product' + '产品' => 'product', ); - //可选模板 $config['templates_i'] = array( '[城市]C通用模板' => 'guide_info_detail', @@ -634,12 +627,12 @@ $config['templates_i'] = array( '[废弃]D专题-温暖' => 'warm', '[废弃]D专题-庄重' => 'solemn', '[废弃]D专题-节庆' => 'festival', - '[废弃]D专题-促销' => 'promotion_tour' + '[废弃]D专题-促销' => 'promotion_tour', ); //翰特产品类型,Information控制器的get_products函数有直接调用，在这里增加了信息需要去控制器写相关操作代码 $config['ProductType_HT'] = array( - '景点' => 't' + '景点' => 't', ); //区域类型对应字母 @@ -660,42 +653,41 @@ $config['area_type'] = array( '公民游' => 'z', '交换链接' => 'k', '首页' => 'h', - 'FAQ' => 'q' + 'FAQ' => 'q', ); $config['auhtor_task_type'] = array( '翻译' => 'translate', '修改' => 'modify', '审核' => 'review', - '投稿' => 'contribute' + '投稿' => 'contribute', ); $config['auhtor_task_status'] = array( '编辑中' => 'edit', //新建任务或作者编辑 '待审核' => 'review', //作者提交，待管理员审核 '审核通过' => 'reviewed', //审核通过，未付款，审核不通过则把状态改为“编辑中” - '完结' => 'complete' //已付款。任务结束 + '完结' => 'complete', //已付款。任务结束 ); $config['auhtor_task_detail_status'] = array( '使用的' => 'used', //表示目前正在使用的记录，用于区别草稿、版本等其他状态。原因是用同一个表保存不同属性的记录 '原始' => 'original', //原始任务信息备份 - '版本' => 'version' //多份，每提交审核一次生成一份 + '版本' => 'version', //多份，每提交审核一次生成一份 ); //项目类型 $config['project_types'] = array( 'base' => '绩效项目', 'dare' => '挑战项目', - 'innovation' => '创新项目' + 'innovation' => '创新项目', ); //项目状态 $config['project_state'] = array( 'notstart' => '还没开始', 'runing' => '开发中', - 'complete' => '完成' + 'complete' => '完成', ); - //是否开启权限控制 -$config['check_access'] = TRUE; +$config['check_access'] = true; //权限管理超级管理 $config['access_super_manage'] = array('ycc', 'lmr', 'lyj', 'rz', 'zp'); @@ -722,7 +714,6 @@ $config['css_source_ct'] = 'https://data.chinatravel.com/css/min.php?f=/css/css3 $config['css_source_chinatravel'] = 'https://data.chinatravel.com/css/newcss3/base.css'; $config['css_source_ts'] = 'https://www.trainspread.com/css/bootstrap.min.css'; - //静态文件生成路径 $config['cache']['jp']['cache_path'] = 'D:\wwwcache-intl\arachina.com'; @@ -752,7 +743,6 @@ $config['cache']['vac']['cache_api_para'] = 'cache_url'; $config['cache']['ru']['cache_api_para'] = 'cache_url'; $config['cache']['it']['cache_api_para'] = 'cache_url'; - //本地测试用 - lmr if (isset($_SERVER['HTTP_HOST']) && $_SERVER['HTTP_HOST'] == '202.103.68.62:9999') { $config['site']['jp']['site_url'] = 'http://202.103.68.62:9093'; @@ -795,7 +785,7 @@ $config['InfoType_country'] = array( '国家地图' => 'n_map', '民族传统和文化遗产' => 'n_national', '产品附加信息' => 'product', - '旅游工具箱' => 'n_tools' + '旅游工具箱' => 'n_tools', ); //province控制器用到了 @@ -810,7 +800,7 @@ $config['InfoType_province'] = array( '天气' => 'p_weather', '旅游建议' => 'p_tips', '热门旅游城市' => 'p_popular_city', - '产品附加信息' => 'product' + '产品附加信息' => 'product', ); //city控制器用到了 @@ -852,7 +842,7 @@ $config['InfoType_city'] = array( 'article-Tour Planning' => 'a_tourplanning', 'layout' => 'layout', '一地线路详细' => 'c_single_circuit', - '一日游线路详细' => 'c_day_tour' + '一日游线路详细' => 'c_day_tour', ); //special控制器用到了 @@ -872,13 +862,12 @@ $config['InfoType_special'] = array( 'Top专题' => 't_best_china', 'Spotlight文章' => 't_spotlight', '专题首页推介' => 't_topic_promotion', - '产品附加信息' => 'product' + '产品附加信息' => 'product', ); - //special控制器用到了 $config['InfoType_video'] = array( - '不设置' => 'none' + '不设置' => 'none', ); //节庆 @@ -886,7 +875,7 @@ $config['InfoType_festival'] = array( '不设置' => 'none', '民族节庆' => 'f_national', '传统节庆' => 'f_tradition', - '旅游节庆' => 'f_travel' + '旅游节庆' => 'f_travel', ); //产品类型 @@ -895,7 +884,35 @@ $config['InfoType_product'] = array( '线路' => 'pd_tour', '包价线路' => 'pd_package', '信息页' => 'pd_info', - '移动端' => 'pd_phone' + '移动端' => 'pd_phone', +); + +//产品类型 - 德语 +$config['InfoType_product_gm'] = array( + '不设置' => 'none', + '线路' => 'pd_tour', + '包价线路' => 'pd_package', + '信息页' => 'pd_info', + '移动端' => 'pd_phone', + '---------' => 'split_line', + '首页' => 'root', + '基本数据' => 'n_facts', + '国家艺术' => 'n_arts', + '国家文化' => 'n_culture', + '国家概述' => 'n_overview', + '国家图片' => 'n_photos', + '国家景点' => 'n_attraction', + '国家旅游' => 'n_travel', + '国家交通' => 'n_transport', + '国家天气' => 'n_weather', + '国家节庆' => 'n_festival', + '国家美食' => 'n_food', + '国家历史' => 'n_history', + '国家地图' => 'n_map', + '民族传统和文化遗产' => 'n_national', + '产品附加信息' => 'product', + '旅游工具箱' => 'n_tools', + ); //公民游 @@ -909,7 +926,7 @@ $config['InfoType_citizen'] = array( '景点详细' => 'w_attraction_detail', '地图目录' => 'w_map', '地图详细' => 'w_map_detail', - '产品' => 'product' + '产品' => 'product', ); //ct站点用到了 @@ -942,7 +959,7 @@ $config['InfoType_ct'] = array( '产品详细' => 'c_product_detail', '游记' => 'story', '一地线路详细' => 'c_single_circuit', - '一日游线路详细' => 'c_day_tour' + '一日游线路详细' => 'c_day_tour', ); //AH站点用到了 @@ -952,7 +969,7 @@ $config['InfoType_ah'] = array( '国家信息列表页' => 'country_info_list', '区域信息列表页' => 'area_info_list', '线路' => 'pd_tour', - '包价线路' => 'pd_package' + '包价线路' => 'pd_package', ); //可选模板 @@ -993,7 +1010,7 @@ $config['templates'] = array( '专题模板（大）' => 'guide_big_series', '三峡游船' => 'yangtze', '城市article列表' => 'city_article_list', - 'food列表' => 'food_list' + 'food列表' => 'food_list', ); //德语信息模板 @@ -1004,7 +1021,7 @@ $config['templates_gm'] = array( '文化模板 [导航式]' => 'culture_info_detail_with_category', '信息专题模板' => 'guide_top_series', '列表式' => 'guide_info_list', - '空白模板' => 'none' + '空白模板' => 'none', ); // CHT 信息模板 @@ -1034,7 +1051,7 @@ $config['templates_cht'] = array( '三峡游船' => 'yangtze', '城市article列表' => 'city_article_list', 'food列表' => 'food_list', - 'FAQ模板' => 'faq_detail' + 'FAQ模板' => 'faq_detail', ); //产品管理板块模板 @@ -1042,6 +1059,17 @@ $config['templates_product'] = array( '空白模板' => 'none', ); +//产品管理板块模板 +$config['templates_product_gm'] = array( + '空白模板' => 'none', + '通用内容模板' => 'guide_info_detail', + '城市-首页模板(GM)' => 'city_info_index', + '文化模板 [单页式]' => 'culture_info_detail_one_page', + '文化模板 [导航式]' => 'culture_info_detail_with_category', + '信息专题模板' => 'guide_top_series', + '列表式' => 'guide_info_list', +); + //产品管理板块模板（国际站使用） $config['templates_product_i'] = array( '空白模板（HTML构建工具）' => 'r_empty_container', @@ -1049,25 +1077,24 @@ $config['templates_product_i'] = array( '空白模板（旧）' => 'r_tpl_empty', ); - //亚洲组专用模板 $config['templates_ah'] = array( '空白模板' => 'none', - '静态页面' => 'static' + '静态页面' => 'static', ); // 出境游网站模板 $config['templates_pgr'] = array( - '空白模板' => 'guide_info_detail', '导航模板' => 'culture_info_detail_with_category' + '空白模板' => 'guide_info_detail', '导航模板' => 'culture_info_detail_with_category', ); // 国际火车网站模板 $config['templates_ts'] = array( - '空白模板' => 'guide_info_detail', '信息导航模板' => 'train_series_with_category' + '空白模板' => 'guide_info_detail', '信息导航模板' => 'train_series_with_category', ); //翰特产品类型,Information控制器的get_products函数有直接调用，在这里增加了信息需要去控制器写相关操作代码 $config['ProductType_HT'] = array( - '景点' => 't' + '景点' => 't', ); //区域类型对应字母 @@ -1087,37 +1114,37 @@ $config['area_type'] = array( '大使馆' => 'y', '公民游' => 'z', '交换链接' => 'k', - 'FAQ' => 'q' + 'FAQ' => 'q', ); $config['auhtor_task_type'] = array( '翻译' => 'translate', '修改' => 'modify', '审核' => 'review', - '投稿' => 'contribute' + '投稿' => 'contribute', ); $config['auhtor_task_status'] = array( '编辑中' => 'edit', //新建任务或作者编辑 '待审核' => 'review', //作者提交，待管理员审核 '审核通过' => 'reviewed', //审核通过，未付款，审核不通过则把状态改为“编辑中” - '完结' => 'complete' //已付款。任务结束 + '完结' => 'complete', //已付款。任务结束 ); $config['auhtor_task_detail_status'] = array( '使用的' => 'used', //表示目前正在使用的记录，用于区别草稿、版本等其他状态。原因是用同一个表保存不同属性的记录 '原始' => 'original', //原始任务信息备份 - '版本' => 'version' //多份，每提交审核一次生成一份 + '版本' => 'version', //多份，每提交审核一次生成一份 ); //项目类型 $config['project_types'] = array( 'base' => '绩效项目', 'dare' => '挑战项目', - 'innovation' => '创新项目' + 'innovation' => '创新项目', ); //项目状态 $config['project_state'] = array( 'notstart' => '还没开始', 'runing' => '开发中', - 'complete' => '完成' + 'complete' => '完成', ); //多媒体中心的本地图片路径 //上传图片是异步上网的，所以用此url进行本地预览 @@ -1132,5 +1159,4 @@ $config['media_image_url_remote2'] = 'http://116.251.217.48:3581/upload'; /* End of file config.php */ /* Location: ./application/config/config.php */ - header('Cache-Control: no-cache'); diff --git a/application/controllers/information.php b/application/controllers/information.php index 1f9e1ef6..432d599b 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -245,9 +245,13 @@ class Information extends CI_Controller //LMR 2016-7-14 if (in_array($this->config->item('site_code'), array('vac', 'vc', 'jp', 'ru', 'it'))) { $this->config->set_item('templates', $this->config->item('templates_product_i')); + } else if ($this->config->item('site_code') === 'gm') { + $this->config->set_item('templates', $this->config->item('templates_product_gm')); + $data['infoTypeList'] = $this->config->item('InfoType_product_gm'); } else { $this->config->set_item('templates', $this->config->item('templates_product')); } + break; default: $data['infoTypeList'] = array('不设置' => 'none', '首页' => 'root'); @@ -716,8 +720,11 @@ class Information extends CI_Controller $info_page_form_content = $this->load->view($template_path . '-info-page-form', false, true); $information->ic_content = str_replace('', $info_page_form_content, $information->ic_content); + + $visa_free_tester_content = $this->load->view($template_path . '-visa-free-tester', false, true); + $information->ic_content = str_replace('', $visa_free_tester_content, $information->ic_content); } else { - $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); $template = str_replace('?product_code=', '?product_code=' . $meta_product_code, $template); $information->ic_content = str_replace('', $inquiry_form_template, $information->ic_content); @@ -1012,17 +1019,6 @@ class Information extends CI_Controller $template ); - $tour_form_content = $this->load->view( - $template_path . '-tour-form', - array('information' => $information), - true - ); - $template = str_replace( - '', - $tour_form_content, - $template - ); - //替换模板中的标签 $template = str_replace('', $information->ic_seo_title, $template); $template = str_replace('', $information->ic_seo_description, $template); @@ -1121,8 +1117,17 @@ class Information extends CI_Controller ); $information->ic_content = str_replace('', $why_us_covid_list_mobile, $information->ic_content); - $info_page_form_content = $this->load->view($template_path . '-info-page-form', false, true); - $information->ic_content = str_replace('', $info_page_form_content, $information->ic_content); + if (empty($meta_product_code)) { + $info_page_form_content = $this->load->view($template_path . '-info-page-form', false, true); + $information->ic_content = str_replace('', $info_page_form_content, $information->ic_content); + } else { + $tour_form_content = $this->load->view( + $template_path . '-tour-form', + array('information' => $information, 'meta_product_code' => $meta_product_code), + true + ); + $information->ic_content = str_replace('', $tour_form_content, $information->ic_content); + } 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')); @@ -2286,4 +2291,4 @@ class Information extends CI_Controller echo json_encode($data); return true; } -} +} \ No newline at end of file diff --git a/application/third_party/fastapi/controllers/index.php b/application/third_party/fastapi/controllers/index.php index 2d5c4bb6..864c40f6 100644 --- a/application/third_party/fastapi/controllers/index.php +++ b/application/third_party/fastapi/controllers/index.php @@ -43,7 +43,7 @@ class Index extends CI_Controller public function query($sql,$database) { - if ($this->input->ip_address() !== '116.8.4.34' && $this->input->ip_address() !== '127.0.0.1') { //不是公司的网络则不能访问 + if ($this->input->ip_address() !== '116.8.4.34' && $this->input->ip_address() !== '180.140.114.225' && $this->input->ip_address() !== '127.0.0.1') { //不是公司的网络则不能访问 //echo $this->input->ip_address(); Header("HTTP/1.1 403 Forbidden"); return false; diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 32cfe0bb..2af58d77 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -58,46 +58,54 @@
  • Japan
  • Thailand-Vietnam-Cambodia -
    -
    -
    - Thailand-Vietnam-Cambodia: -
    - -
    -
    - -
    - Vietnam & Cambodia: -
    - -
    -
    - -
    - Vietnam & Thailand: +
    +
    +
    + Thailand-Vietnam-Cambodia: +
    - -
    - Thailand & Cambodia: +
    + +
    + Vietnam & Cambodia: +
    + +
    + Vietnam & Thailand: + +
    + +
    + Thailand & Cambodia: + +
    -
    • - + + +
  • Destinations
    @@ -106,10 +114,12 @@ -
    @@ -142,20 +152,21 @@
    @@ -165,11 +176,12 @@
    - +
    Vacation Type
    @@ -232,7 +246,8 @@ -
    How to Plan an Incredible Family Trip to Japan in 2023/2024. Learn more.
    +
    How to Plan an Incredible Family Trip to Japan in 2023/2024. Learn more.
    @@ -251,7 +266,8 @@
  • Worry-free planning: Your 1:1 travel consultant in Asia will take all the uncertainty out of your planning, helping you navigate any travel restrictions. 
    • -
  • No-risk booking: 100% refund policy! (prior to 3 weeks before departure, more details)
    • +
  • No-risk booking: 100% refund policy! (prior to 3 weeks before + departure, more details)
    • @@ -267,7 +283,8 @@
    - We are here to help you...
    Start planning your tailor-made tour with 1-1 help from our travel advisors. + We are here to help you...
    Start planning your tailor-made tour with 1-1 help + from our travel advisors. Create My Trip     @@ -328,6 +345,50 @@
    + +
    +
    + +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index 5f65699a..cad691b0 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -306,6 +306,43 @@
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    At Asia Highlights, we are committed to providing you an affordable, quality private tour, whether it's a milestone trip, family trip, or bucketlist trip — your planning will be made easy with diff --git a/application/views/mobile_first/ch-feedback-list.php b/application/views/mobile_first/ch-feedback-list.php index 8732b3d9..55f513dc 100644 --- a/application/views/mobile_first/ch-feedback-list.php +++ b/application/views/mobile_first/ch-feedback-list.php @@ -1,4 +1,4 @@ -

    +

    Tour Review

    - + +
  • + Create my trip +
    • -
    Contact Us
    +
    @@ -222,8 +225,7 @@ -
    Create my - trip
    +
    Contact us
    diff --git a/application/views/mobile_first/ch-visa-free-tester.php b/application/views/mobile_first/ch-visa-free-tester.php new file mode 100644 index 00000000..115fc4b6 --- /dev/null +++ b/application/views/mobile_first/ch-visa-free-tester.php @@ -0,0 +1,1179 @@ + + + +
    +

    Quick Test: Will My Route Qualify for China 72/144-Hour Visa-Free Transit?

    +
    + +

    1. I will depart from (only applies to direct or connected flight):

    + +

    2. I will arrive in China at [city], [airport / railway station / port].

    + + + + +

    3. My arrival date is...

    + + +

    4. I will leave for [country/region] from China (the bounding destination on the air ticket):

    + + +

    5. My departure date is...

    + + +

    6. My nationality is...

    + + + + +
    + + + +
    + + + \ No newline at end of file diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index f5ee7230..f6add7a3 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -32,7 +32,6 @@ 'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f); })(window, document, 'script', 'dataLayer', 'GTM-T75N4LL'); - @@ -47,7 +46,7 @@
    - Contact Us + Create My Trip
    @@ -75,10 +74,7 @@
    +
    +
    +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    +
    +