diff --git a/.gitignore b/.gitignore index a286a2b9..6f1c4033 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /kcfinder/cache/* */cache/* /author/document/* +*/settlement_files/* */statement_files/* */paypal_activities/* /author/document/* diff --git a/application/config/config.php b/application/config/config.php index c0f48d97..3aec1bec 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -392,11 +392,17 @@ $config['site'] = array( 'cht' => array('site_code' => 'cht', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => 'https://images.chinahighlights.com', 'site_authors' => array('zzy', 'spt', 'yl', 'gavin', 'sw', 'zl', 'wbl', 'yqw', 'lf', 'zhm', 'pkl'), 'site_user' => ',ycc,lmr, zyh,J,shw,B,zzy,WJJ,Tony,pcf,zxy,wst,wz,v,S,yyg,yxd,wj,sw,yl,hx,spt,wmr,zl,syt,gavin,zm,htc,yqw,bhn,lmj,wbl,yqw,LYY,zhm,si'), 'ch' => array('site_code' => 'ch', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => 'https://images.chinahighlights.com', 'site_authors' => array('TDJ', 'ycc'), 'site_user' => ',ycc,'), 'gm' => array('site_code' => 'gm', 'site_id' => 22, 'site_lgc' => '4', 'site_url' => 'https://www.chinarundreisen.com', 'site_image_url' => '//bilder.chinarundreisen.com', 'site_authors' => array('DX', 'X', 'K', 'Lan', 'lmr', 'zyh', 'ZYHL', 'TDJ'), 'site_user' => ',ycc,lmr,B,zyh,DX,X,K,htc,zm,bhn,Lan,Tony,zyh,J,v,ZYHL,TDJ,LYY,shw,'), + 'gh_gm' => array('site_code' => 'gh_gm', 'site_id' => 178, 'site_lgc' => '4', 'site_url' => 'https://www.globalhighlights.de', 'site_image_url' => '//www.globalhighlights.de', 'site_authors' => array('DX', 'X', 'K', 'Lan', 'lmr', 'zyh', 'ZYHL', 'TDJ'), 'site_user' => ',ycc,lmr,B,zyh,DX,X,K,htc,zm,bhn,Lan,Tony,zyh,J,v,ZYHL,TDJ,LYY,shw,'), 'vc' => array('site_code' => 'vc', 'site_id' => 30, 'site_lgc' => '5', 'site_url' => 'https://www.voyageschine.com', 'site_image_url' => '//images.voyageschine.com', 'site_authors' => array('JE', 'kq', 'lya', 'lyz', 'zyh'), 'site_user' => ',ycc,lmr, zyh,JE,htc,kq,lya,bhn,Tony,zyh,B,J,lyz,LYY,'), + 'gh_vc' => array('site_code' => 'gh_vc', 'site_id' => 180, 'site_lgc' => '5', 'site_url' => 'https://www.globalhighlights.fr', 'site_image_url' => '//www.globalhighlights.fr', 'site_authors' => array('JE', 'kq', 'lya', 'lyz', 'zyh'), 'site_user' => ',ycc,lmr, zyh,JE,htc,kq,lya,bhn,Tony,zyh,B,J,lyz,LYY,'), 'jp' => array('site_code' => 'jp', 'site_id' => 88, 'site_lgc' => '3', 'site_url' => 'https://www.arachina.com', 'site_image_url' => '//images.arachina.com', 'site_authors' => array('hql', 'LLM', 'SHX', 'lmr', 'zyh', 'zb'), 'site_user' => ',ycc,lmr, zyh,hql,LLM,SHX,htc,zpl,Tony,zyh,J,B,zb,LYY,'), + 'gh_jp' => array('site_code' => 'gh_jp', 'site_id' => 179, 'site_lgc' => '3', 'site_url' => 'https://www.globalhighlights.jp', 'site_image_url' => '//www.globalhighlights.jp', 'site_authors' => array('hql', 'LLM', 'SHX', 'lmr', 'zyh', 'zb'), 'site_user' => ',ycc,lmr, zyh,hql,LLM,SHX,htc,zpl,Tony,zyh,J,B,zb,LYY,'), 'vac' => array('site_code' => 'vac', 'site_id' => 95, 'site_lgc' => '6', 'site_url' => 'https://www.viaje-a-china.com', 'site_image_url' => '//imagenes.viaje-a-china.com', 'site_authors' => array('I', 'cyt', 'lmr', 'zyh', 'LLM'), 'site_user' => ',ycc,lmr, zyh,I,cyt,htc,bhn,Tony,zyh,B,J,LLM,LYY,'), + 'gh_vac' => array('site_code' => 'gh_vac', 'site_id' => 181, 'site_lgc' => '6', 'site_url' => 'https://www.globalhighlights.es', 'site_image_url' => '//www.globalhighlights.es', 'site_authors' => array('I', 'cyt', 'lmr', 'zyh', 'LLM'), 'site_user' => ',ycc,lmr, zyh,I,cyt,htc,bhn,Tony,zyh,B,J,LLM,LYY,'), 'it' => array('site_code' => 'it', 'site_id' => 168, 'site_lgc' => '8', 'site_url' => 'https://www.viaggio-in-cina.it', 'site_image_url' => '//images.viaggio-in-cina.it', 'site_authors' => array('LZY', 'ZQQ', 'lmr', 'zyh'), 'site_user' => ',ycc,lmr, zyh,LZY,htc,ZQQ,Tony,zyh,B,J,LYY,'), + 'gh_it' => array('site_code' => 'gh_it', 'site_id' => 183, 'site_lgc' => '8', 'site_url' => 'https://www.globalhighlights.it', 'site_image_url' => '//www.globalhighlights.it', 'site_authors' => array('LZY', 'ZQQ', 'lmr', 'zyh'), 'site_user' => ',ycc,lmr, zyh,LZY,htc,ZQQ,Tony,zyh,B,J,LYY,'), 'ru' => array('site_code' => 'ru', 'site_id' => 102, 'site_lgc' => '7', 'site_url' => 'https://www.chinahighlights.ru', 'site_image_url' => '//images.chinahighlights.ru', 'site_authors' => array('xjj', 'zyy'), 'site_user' => ',ycc,lmr, zyh,xjj,htc,DX,zyy,bhn,Tony,zyh,B,J,LYY,'), + 'gh_ru' => array('site_code' => 'gh_ru', 'site_id' => 182, 'site_lgc' => '7', 'site_url' => 'https://www.globalhighlights.ru', 'site_image_url' => '//www.globalhighlights.ru', 'site_authors' => array('xjj', 'zyy'), 'site_user' => ',ycc,lmr, zyh,xjj,htc,DX,zyy,bhn,Tony,zyh,B,J,LYY,'), 'wt' => array('site_code' => 'wt', 'site_id' => 172, 'site_lgc' => '2', 'site_url' => 'https://www.iiiyooo.com', 'site_image_url' => '', 'site_authors' => array('ylh', 'lfj', 'wx', 'lzh', 'shw', 'lx'), 'site_user' => ',ycc,lmr, zyh,ylh,lfj,wx,lzh,shw,lx,bhn,B,J,'), 'tbt' => array('site_code' => 'tbt', 'site_id' => 169, 'site_lgc' => '1', 'site_url' => 'https://www.tibettravel.info', 'site_image_url' => '/images', 'site_authors' => array('wj', 'sfx'), 'site_user' => ',ycc,wj,bhn,wx,lzh,lfj,hwt,thf,sfx,J,ZP,'), 'sht' => array('site_code' => 'sht', 'site_id' => 96, 'site_lgc' => '1', 'site_url' => 'https://www.shanghaihighlights.com', 'site_image_url' => '//images.shanghaihighlights.com', 'site_authors' => array('vz', 'sfx'), 'site_user' => ',ycc,wj,bhn,wx,lzh,lfj,hwt,thf,vz,sfx,J,ZP,LYY,'), @@ -426,6 +432,22 @@ $config['cache']['vac']['cache_path'] = 'D:\wwwcache-intl\viaje-a-china.com'; $config['cache']['ru']['cache_path'] = 'D:\wwwcache-intl\chinahighlights.ru'; $config['cache']['it']['cache_path'] = 'D:\wwwcache-intl\viaggio-in-cina.it'; +$config['cache']['gh_jp']['cache_path'] = 'D:\wwwcache-intl\globalhighlights.jp'; +$config['cache']['gh_gm']['cache_path'] = 'C:\Dropbox\wwwcache\globalhighlights.de'; +$config['cache']['gh_vc']['cache_path'] = 'D:\wwwcache-intl\globalhighlights.fr'; +$config['cache']['gh_vac']['cache_path'] = 'D:\wwwcache-intl\globalhighlights.es'; +$config['cache']['gh_ru']['cache_path'] = 'D:\wwwcache-intl\globalhighlights.ru'; +$config['cache']['gh_it']['cache_path'] = 'D:\wwwcache-intl\globalhighlights.it'; + +/* +globalhighlights.jp +globalhighlights.de +globalhighlights.fr +globalhighlights.es +globalhighlights.ru +globalhighlights.it +*/ + //静态文件站点域名 $config['cache']['jp']['site_url'] = 'https://www.arachina.com'; $config['cache']['gm']['site_url'] = 'https://www.chinarundreisen.com'; @@ -434,6 +456,13 @@ $config['cache']['vac']['site_url'] = 'https://www.viaje-a-china.com'; $config['cache']['ru']['site_url'] = 'https://www.chinahighlights.ru'; $config['cache']['it']['site_url'] = 'https://www.viaggio-in-cina.it'; +$config['cache']['gh_jp']['site_url'] = 'https://www.globalhighlights.jp'; +$config['cache']['gh_gm']['site_url'] = 'https://www.globalhighlights.de'; +$config['cache']['gh_vc']['site_url'] = 'https://www.globalhighlights.fr'; +$config['cache']['gh_vac']['site_url'] = 'https://www.globalhighlights.es'; +$config['cache']['gh_ru']['site_url'] = 'https://www.globalhighlights.ru'; +$config['cache']['gh_it']['site_url'] = 'https://www.globalhighlights.it'; + //静态文件更新接口 $config['cache']['jp']['cache_api'] = '/info.php/information/update_cache/'; $config['cache']['gm']['cache_api'] = '/info.php/information/update_cache/'; @@ -442,6 +471,13 @@ $config['cache']['vac']['cache_api'] = '/info.php/information/update_cache/'; $config['cache']['ru']['cache_api'] = '/info.php/information/update_cache/'; $config['cache']['it']['cache_api'] = '/info.php/information/update_cache/'; +$config['cache']['gh_jp']['cache_api'] = '/info.php/information/update_cache/'; +$config['cache']['gh_gm']['cache_api'] = '/info.php/information/update_cache/'; +$config['cache']['gh_vc']['cache_api'] = '/info.php/information/update_cache/'; +$config['cache']['gh_vac']['cache_api'] = '/info.php/information/update_cache/'; +$config['cache']['gh_ru']['cache_api'] = '/info.php/information/update_cache/'; +$config['cache']['gh_it']['cache_api'] = '/info.php/information/update_cache/'; + //静态文件更新接口参数 $config['cache']['jp']['cache_api_para'] = 'cache_url'; $config['cache']['gm']['cache_api_para'] = 'cache_url'; @@ -450,6 +486,13 @@ $config['cache']['vac']['cache_api_para'] = 'cache_url'; $config['cache']['ru']['cache_api_para'] = 'cache_url'; $config['cache']['it']['cache_api_para'] = 'cache_url'; +$config['cache']['gh_jp']['cache_api_para'] = 'cache_url'; +$config['cache']['gh_gm']['cache_api_para'] = 'cache_url'; +$config['cache']['gh_vc']['cache_api_para'] = 'cache_url'; +$config['cache']['gh_vac']['cache_api_para'] = 'cache_url'; +$config['cache']['gh_ru']['cache_api_para'] = 'cache_url'; +$config['cache']['gh_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'; diff --git a/application/controllers/information.php b/application/controllers/information.php index 1ee95a3d..03eec0ca 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -171,7 +171,6 @@ class Information extends CI_Controller $data['informationList'] = $this->Information_model->StructureList($rootStructure_ID); //增加一项，属于这个区域，但是结构数据层次不准确的也要列出来 - //todo: //信息内容 $data['information'] = $this->Information_model->Detail($is_id); @@ -447,7 +446,7 @@ class Information extends CI_Controller $information_new = $this->Information_model->Detail($this->input->post('is_id')); $this->make_www_cache_ct($information_new); // $this->make_www_cache_ct('pc', $information_new); - } else if (strcasecmp($site_code, "shanghai") == 0 && !empty($auto_update_cache)){ + } else if (strcasecmp($site_code, "shanghai") == 0 && !empty($auto_update_cache)) { $information_new = $this->Information_model->Detail($this->input->post('is_id')); $this->make_www_cache_sh($information_new); } else if (strcasecmp($site_code, "cht") == 0 && !empty($auto_update_cache)) { @@ -928,40 +927,40 @@ class Information extends CI_Controller // /day-tours/(278008224) 节点不使用推荐信息 if ($information->is_parent_id == '278008224') { } else { - // 右侧列表广告 - $tips_right_a = []; - $tips_right_b = []; - $tips_right_c = []; - for ($i = 1; $i <= 12; $i++) { - $key = 'List Tips Right A_' . $i; - if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { - $tips_right_a[] = $recommand_information[$key]; - } - } - for ($i = 1; $i <= 12; $i++) { - $key = 'List Tips Right B_' . $i; - if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { - $tips_right_b[] = $recommand_information[$key]; - } - } - for ($i = 1; $i <= 12; $i++) { - $key = 'List Tips Right C_' . $i; - if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { - $tips_right_c[] = $recommand_information[$key]; - } - } - - $tips_right_list_content = $this->load->view( - 'mobile_first/ch-tips-right-list', - array( - 'tips_right_a' => $tips_right_a, - 'tips_right_b' => $tips_right_b, - 'tips_right_c' => $tips_right_c - ), - true - ); - - $template = str_replace('', $tips_right_list_content, $template); + // 右侧列表广告 + $tips_right_a = []; + $tips_right_b = []; + $tips_right_c = []; + for ($i = 1; $i <= 12; $i++) { + $key = 'List Tips Right A_' . $i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_a[] = $recommand_information[$key]; + } + } + for ($i = 1; $i <= 12; $i++) { + $key = 'List Tips Right B_' . $i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_b[] = $recommand_information[$key]; + } + } + for ($i = 1; $i <= 12; $i++) { + $key = 'List Tips Right C_' . $i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_c[] = $recommand_information[$key]; + } + } + + $tips_right_list_content = $this->load->view( + 'mobile_first/ch-tips-right-list', + array( + 'tips_right_a' => $tips_right_a, + 'tips_right_b' => $tips_right_b, + 'tips_right_c' => $tips_right_c + ), + true + ); + + $template = str_replace('', $tips_right_list_content, $template); } //文中的信息推荐 @@ -1200,7 +1199,9 @@ class Information extends CI_Controller public function test_price() { - $price_rule = '
#ah-8,st,2#
#ah-8,st,2#
'; + $price_rule = '
#ah-23,st,2#
'; + $price_item_array = $this->price_pregmatch($price_rule); + var_dump($price_item_array); $price_tag_list = $this->parse_price_tag($price_rule); var_dump($price_tag_list); } @@ -2286,8 +2287,7 @@ class Information extends CI_Controller $dataform["TourCode"] = $productCode; $dataform["CLI_SN"] = $tourdata->clisn; $dataform["TourName"] = $information->ic_title; - $template_form_tourqi = $this->load->view($template_path . '-form-tourqi', $dataform, true); - $data["template_form_tourqi"] = $template_form_tourqi; //表单模板字符串 + } @@ -2375,6 +2375,12 @@ class Information extends CI_Controller } } + if ($meta_ct_page_type == "tourdetail") { + $dataform['device'] = $device; + $template_form_tourqi = $this->load->view($template_path . '-form-tourqi', $dataform, true); + $data["template_form_tourqi"] = $template_form_tourqi; //表单模板字符串 + } + //两种设备分别调用两种模板 ，静态化 switch ($device) { case 'mobile': @@ -2460,7 +2466,7 @@ class Information extends CI_Controller $ic_content = $information->ic_content; /** 替换H1加面包屑,加作者 */ - $ic_content = preg_replace('/

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

$1

' . "\r\n" . $str_author . "\r\n", $ic_content, 1); + $ic_content = preg_replace('/

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

$1

' . "\r\n" . $str_author . "\r\n", $ic_content, 1); //图片加延迟 $ic_content = $this->html_optimize_lib->set_lazy_loader($ic_content, 'https://data.shanghaihighlights.com/image/grey.gif'); @@ -2597,10 +2603,10 @@ class Information extends CI_Controller $data["ADDONCSS"] .= ''; //一日游表单的替换 - $DayTripData["productCode"]=$productCode; - $template_form_daydetail = $this->load->view($template_path.'-daydetail-form',$DayTripData,true); //模板内容 + $DayTripData["productCode"] = $productCode; + $template_form_daydetail = $this->load->view($template_path . '-daydetail-form', $DayTripData, true); //模板内容 //使用simple_html_dom_lib库来进行表单添加 - $ic_content = $this->html_optimize_lib->add_htmlcode($ic_content,"#maincontent",$template_form_daydetail); + $ic_content = $this->html_optimize_lib->add_htmlcode($ic_content, "#maincontent", $template_form_daydetail); } if ($meta_ct_page_type == "tourdetail") { //线路 @@ -2631,7 +2637,7 @@ class Information extends CI_Controller $data["ADDONCSS"] .= ''; } - if ($meta_ct_page_type=="daytripform"){ + if ($meta_ct_page_type == "daytripform") { $productType = $meta_ct_page_type; $addonJs .= ''; $data["ADDONCSS"] .= ''; @@ -2837,8 +2843,8 @@ class Information extends CI_Controller } foreach ($group_recommands as $item) { - if ($this->config->item('site_code') == 'ah' or $this->config->item('site_code') == 'ch' or $this->config->item('site_code') == 'gh' ) { //如果是AH CH GH的页面，取消重复检测 - $exclude_ids=array(0); + if ($this->config->item('site_code') == 'ah' or $this->config->item('site_code') == 'ch' or $this->config->item('site_code') == 'gh') { //如果是AH CH GH的页面，取消重复检测 + $exclude_ids = array(0); } if (empty($data[$item->ir_name])) { $result = $this->recommand_information_rule($information, $root_detail, $item, $exclude_ids); @@ -3006,7 +3012,8 @@ class Information extends CI_Controller //} break; - case 'vac': //国际站 + //国际站 + case 'vac': case 'vc': case 'it': case 'ru': @@ -3057,6 +3064,64 @@ class Information extends CI_Controller } } break; + //国际站 - GH + case 'gh_vac': + case 'gh_vc': + case 'gh_it': + case 'gh_ru': + case 'gh_jp': + $information = $this->Information_model->Detail($url); + $meta_pc_amp = @get_meta($information->ic_id, 'AMP_BODY_PC_STATUS'); + if ($delete_only) { + //只删除操作，在url修改和不发布信息的时候使用 + $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $url; + } else { + $tmp = $url; + //判断是否是更新信息 + // 产品页面不能生成静态页面，比如/beijing/hotel/只是为了在导航显示一个链接，如果生成了静态页面，网前只会显示一个空白页面了 + if (!empty($information->ic_content) || !empty($information->ic_summary) || $meta_pc_amp == 'yes') { + $url = $this->config->item('site_url') . '/index.php/gh/info/detail/?static_html_url=' . $url; + } else { + $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/?static_html_url=' . $url; + //$url = $this->config->item('site_url') . '/index.php/information/detail/?static_html_url=' . $url; + } + if (isset($information->ic_type) && $information->ic_type == 'product') { + $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/?static_html_url=' . $tmp; + } + + // GH国际 不发布的时候删除缓存 + if (!$information->ic_status) { + $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $tmp; + } + + //int return direct + $cache_url = $this->input->post('cache_url'); + if ($url && !$cache_url) { + /* + ignore_user_abort(true); + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_TIMEOUT, 1); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检查 + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); // 从证书中检查SSL加密算法是否存在 + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); //禁止直接显示获取的内容 + curl_setopt($ch, CURLOPT_HEADER, 0); //不需要HEAD + curl_setopt($ch, CURLOPT_FRESH_CONNECT, 1); + curl_setopt($ch, CURLOPT_NOBODY, 1); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); + curl_exec($ch); + curl_close($ch); + */ + $data['async_update'] = $url; + $data[] = array('name' => 'ok', 'value' => '信息保存成功，请在8秒后检查更新页面。', 'url' => $url); + //如果是外部调用就返回结果，内部就不返回了 + if ($cache_url) { + echo json_encode($data); + } + return $data; + } + } + break; case 'ct': //子站点使用 $url = 'http://50.97.246.187:22223' . $url; diff --git a/application/helpers/info_helper.php b/application/helpers/info_helper.php index afa24dfb..3f98988e 100644 --- a/application/helpers/info_helper.php +++ b/application/helpers/info_helper.php @@ -77,7 +77,7 @@ function is_series_site() { $CI = &get_instance(); $sitecode = $CI->config->item('site_code'); - if ($sitecode == 'vc' || $sitecode == 'ru' || $sitecode == 'jp' || $sitecode == 'vac' || $sitecode == 'it') { + if (in_array($sitecode, array('jp', 'vc', 'vac', 'ru', 'it', 'gh_jp', 'gh_vc', 'gh_vac', 'gh_ru', 'gh_it', 'gh_gm'))) { return true; } else { return false; @@ -103,7 +103,7 @@ function is_mobile_first() { $CI = &get_instance(); $sitecode = $CI->config->item('site_code'); - if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode=='chinatravel' || $sitecode == 'gh' || $sitecode=='shanghai') { + if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode == 'chinatravel' || $sitecode == 'gh' || $sitecode == 'shanghai') { return true; } else { return false; @@ -222,7 +222,7 @@ function get_task_count_by_status() function get_author_photo($author_code_id = false) { $CI = &get_instance(); - $root_url = '';//'http://data.chtcdn.com'; + $root_url = ''; //'http://data.chtcdn.com'; $avatar = $root_url . '/css/images/avatar.jpg'; if ($author_code_id && is_numeric($author_code_id)) { $CI->load->model('Infoauthors_model'); @@ -237,7 +237,7 @@ function get_author_photo($author_code_id = false) //补全图片路径 function get_photo_url($photo) { - $root_url = '';//'http://data.chtcdn.com'; + $root_url = ''; //'http://data.chtcdn.com'; if ($photo == '') { $avatar = $root_url . '/css/images/uploadPic.jpg'; } else { @@ -275,7 +275,8 @@ function show_page($page) } $html = ''; - if ($nowview > 1) $befor--; + if ($nowview > 1) + $befor--; if ($pageSize <= $total) { for ($i = $befor; $i <= $after; $i++) { if ($i == $currentPage) { @@ -338,7 +339,7 @@ function GET_HTTP($url, $data = '', $method = 'GET') curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回 $tmpInfo = curl_exec($curl); // 执行操作 $httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE); - if ($httpCode >= 400) {//页面状态，如果大于400说明页面打不开 + if ($httpCode >= 400) { //页面状态，如果大于400说明页面打不开 log_message('error', " curl {$httpCode} {$url} "); return false; } @@ -371,7 +372,8 @@ function compress_css($buffer) } //把临时多媒体中心预览图片地址替换为网前地址 -function replace_image_url($ic_content){ +function replace_image_url($ic_content) +{ $CI = &get_instance(); - return str_replace($CI->config->item('media_image_url'), $CI->config->item('site_image_url'),$ic_content); + return str_replace($CI->config->item('media_image_url'), $CI->config->item('site_image_url'), $ic_content); } \ No newline at end of file diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php index e861a496..c58d687d 100644 --- a/application/models/feedback_model.php +++ b/application/models/feedback_model.php @@ -16,9 +16,11 @@ class Feedback_model extends CI_Model { $this->HT->query(" select top 40 tad_content, tai_customerid, tai_title, tai_getdate, tai_url - from Eva_TAInfo - left join Eva_TADetail on TAD_TAI_SN=TAI_SN + from Eva_TAInfo tai + left join Eva_TADetail on TAD_TAI_SN=TAI_SN + left join Eva_TAGuidePrize tgp on tgp.TGP_TAI_SN = tai.TAI_SN where TAD_Content is not null + and isnull(TAI_DeleteFlag,0) = 0 and isnull(tgp.TGP_CheckState, 0) = 136002 order by tai_getdate desc"); $feedback_result = $feedback_query->result(); @@ -51,9 +53,11 @@ class Feedback_model extends CI_Model { $this->HT->query(" select top 40 tad_content, tai_customerid, tai_title, tai_getdate, tai_url - from Eva_TAInfo - left join Eva_TADetail on TAD_TAI_SN=TAI_SN + from Eva_TAInfo tai + left join Eva_TADetail on TAD_TAI_SN=TAI_SN + left join Eva_TAGuidePrize tgp on tgp.TGP_TAI_SN = tai.TAI_SN where TAD_Content is not null + and isnull(TAI_DeleteFlag,0) = 0 and isnull(tgp.TGP_CheckState, 0) = 136002 order by tai_getdate desc"); $feedback_result = $feedback_query->result(); @@ -65,12 +69,12 @@ class Feedback_model extends CI_Model { $createdOnString = $createdOn->format('M Y'); $feedback_count = COUNT($feedback_list); if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) { - $feedback = [ - // 'title' => $feedback_row->tai_title, + $feedback = [ + 'title' => $feedback_row->tai_title, 'customer' => $feedback_row->tai_customerid, // 'content' => $feedback_row->tad_content, - // 'url' => $feedback_row->tai_url, - // 'createdOn' => $createdOnString + 'url' => $feedback_row->tai_url, + 'createdOn' => $createdOnString ]; $feedback_list[] = $feedback; $customer_id_list[] = $feedback_row->tai_customerid; diff --git a/application/third_party/ctmobilefirst/models/api_model.php b/application/third_party/ctmobilefirst/models/api_model.php index d38bdb29..3d055a83 100644 --- a/application/third_party/ctmobilefirst/models/api_model.php +++ b/application/third_party/ctmobilefirst/models/api_model.php @@ -93,7 +93,7 @@ class Api_model extends CI_Model { $reust = ""; //'新的GP没有设置以前的2-5人等价格，导致读不出价格。把Gp价格放前面计算 $sql = "select top 1 CLI_SN,CLI_PackageClass from CustomerLineInfo - where CLI_NO=? and CLI_State=1005004 + where CLI_NO=? and ( CLI_State = 1005003 or CLI_State=1005004) and CLI_Grade=7001 AND (CLI_DEI_SN= ? )"; $query = $this->HT->query($sql,array($cli_no,$this->dei_sn)); if (!$query->num_rows()>0){ @@ -137,7 +137,7 @@ class Api_model extends CI_Model { CustomerLinePrice ON CustomerLineInfo.CLI_SN = CustomerLinePrice.CLP_CLI_SN INNER JOIN CustomerLineInfo2 ON CustomerLineInfo.CLI_SN = CustomerLineInfo2.CLI2_CLI_SN where CLI_SN= ? and CLI2_LGC=? and (CLP_Area=1 or CLP_Area=2) - and CLI_State = 1005004 ORDER BY CLP_TwoToFiveAdultPrice"; + and (CLI_State = 1005004 or CLI_State = 1005003) ORDER BY CLP_TwoToFiveAdultPrice"; $query = $this->HT->query($sql,array($CLI_SN,$this->CTLGC)); if ($query->num_rows()>0){ $reust = $query->row()->CLP_TwoToFiveAdultPrice; diff --git a/application/third_party/order/views/mailtext.php b/application/third_party/order/views/mailtext.php index 2a1a8114..98550e13 100644 --- a/application/third_party/order/views/mailtext.php +++ b/application/third_party/order/views/mailtext.php @@ -29,12 +29,12 @@

Flight Information

-

Arrival China Flight No.:

+

Arrival Flight No.:

Arrival time:

- Departure China Flight no.: + Departure Flight no.:

Departure time: diff --git a/application/views/cache/update.php b/application/views/cache/update.php index c60e8614..ba5145e3 100644 --- a/application/views/cache/update.php +++ b/application/views/cache/update.php @@ -59,11 +59,11 @@ } @@ -689,23 +675,10 @@ function validateQuickInquiryForm() { +