diff --git a/application/config/config.php b/application/config/config.php index 41035b47..d04ee784 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -390,6 +390,7 @@ $config['rewrite_short_tags'] = false; */ $config['proxy_ips'] = ''; + //各站信息组和人员权限分配 $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'), @@ -424,9 +425,9 @@ $config['site'] = array( '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,')), - 'shanghai' => array('site_code' => 'shanghai', 'site_id' => 96, 'site_lgc' => '107', 'site_url' => 'http://www.shanghaihighlights.com/', 'site_image_url' => 'https://images.shanghaihighlights.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'), - 'beijing' => array('site_code' => 'beijing', 'site_id' => 98, 'site_lgc' => '106', 'site_url' => 'http://www.mybeijingchina.com/', 'site_image_url' => 'https://images.mybeijingchina.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'), - 'trainspread' => array('site_code' => 'trainspread', 'site_id' => 149, 'site_lgc' => '1', 'site_url' => 'http://www.trainspread.com/', 'site_image_url' => 'https://images.trainspread.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'), + 'shanghai' => array('site_code' => 'shanghai', 'site_id' => 96, 'site_lgc' => '107', 'site_url' => 'https://www.shanghaihighlights.com', 'site_image_url' => 'https://images.shanghaihighlights.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'), + 'beijing' => array('site_code' => 'beijing', 'site_id' => 98, 'site_lgc' => '106', 'site_url' => 'https://www.mybeijingchina.com', 'site_image_url' => 'https://images.mybeijingchina.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'), + 'trainspread' => array('site_code' => 'trainspread', 'site_id' => 149, 'site_lgc' => '1', 'site_url' => 'https://www.trainspread.com', 'site_image_url' => 'https://images.trainspread.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'), ); //静态文件生成路径 diff --git a/application/controllers/information.php b/application/controllers/information.php index 068853ae..40ee711d 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -964,7 +964,7 @@ class Information extends CI_Controller foreach ($feedback_array[0] as $index => $tag_name) { $city_name_string = $feedback_array[1][$index]; $city_name_list = explode(',', $city_name_string); - $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list); + $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list, FALSE); // 防止触发 Google 网络垃圾政策只返回前三条 $top3_feedback_list = array_slice($feedback_list, 0, 3); $feedback_content = $this->load->view( @@ -1091,9 +1091,23 @@ class Information extends CI_Controller } } - // 检查图片地址格式 + // 头部大图 $parsed_photo = $information->ic_photo; - $parsed_photo_url = parse_url($information->ic_photo); + if ($device == 'mobile') { + $meta_addon_picture_mobile = get_meta($information->ic_id, 'meta_addon_picture_mobile'); + + if (!empty($meta_addon_picture_mobile)) { + $parsed_photo = $meta_addon_picture_mobile; + } + } else { + $meta_addon_picture = get_meta($information->ic_id, 'meta_addon_picture'); + if (!empty($meta_addon_picture)) { + $parsed_photo = $meta_addon_picture; + } + } + + // 检查图片地址格式 + $parsed_photo_url = parse_url($parsed_photo); if ( (!isset($parsed_photo_url['host']) || !isset($parsed_photo_url['scheme'])) && isset($parsed_photo_url['path']) ) { @@ -3337,6 +3351,55 @@ class Information extends CI_Controller /** 替换H1加面包屑,加作者 */ $ic_content = preg_replace('/

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

$1

' . "\r\n" . $str_author . "\r\n", $ic_content, 1); + // 动态加载反馈标签，按城市出前三条。左侧 + // HTLM:
,显示全部用 + // 解析结果：; Shanghai,Beijing + $feedback_array = []; + preg_match_all('^^', $information->ic_content, $feedback_array); + if (!empty($feedback_array)) { + foreach ($feedback_array[0] as $index => $tag_name) { + $city_name_string = $feedback_array[1][$index]; + $feedback_list = $this->Feedback_model->get_CT_feedback_by_cityname($city_name_string,30); + // 防止触发 Google 网络垃圾政策只返回前三条 + $top3_feedback_list = array_slice($feedback_list, 0, 3); + $feedback_content = $this->load->view( + 'mobile_first/chinatravel-feedback-list', + array('feedback_list' => $top3_feedback_list), + true + ); + $ic_content = str_replace( + $tag_name, + $feedback_content, + $ic_content + ); + } + } + + // 动态加载反馈标签，按城市出前三条。整页 + // HTLM:
,显示全部用 + // 解析结果：; Shanghai,Beijing + $feedback_array = []; + preg_match_all('^^', $information->ic_content, $feedback_array); + if (!empty($feedback_array)) { + foreach ($feedback_array[0] as $index => $tag_name) { + $city_name_string = $feedback_array[1][$index]; + $feedback_list = $this->Feedback_model->get_CT_feedback_by_cityname($city_name_string,30); + // 防止触发 Google 网络垃圾政策只返回前三条 + $top3_feedback_list = array_slice($feedback_list, 0, 3); + $feedback_content = $this->load->view( + 'mobile_first/chinatravel-feedback-cross', + array('feedback_list' => $top3_feedback_list), + true + ); + $ic_content = str_replace( + $tag_name, + $feedback_content, + $ic_content + ); + } + } + + //图片加延迟 $ic_content = $this->html_optimize_lib->set_lazy_loader($ic_content, 'https://www.mybeijingchina.com/images/grey.gif'); @@ -3666,14 +3729,34 @@ class Information extends CI_Controller } + //火车票详细页搜索框添加 -- zp + $meta_ct_page_trainform = get_meta($information->ic_id, 'meta_ct_page_trainform'); //是否插入火车票搜索框 + $template_TrainDetailSearch = ""; + if ($meta_ct_page_trainform == "yes" || strpos($information->ic_url,"/china-trains")!==false) { + $meta_train_city = get_meta($information->ic_id, 'meta_train_city'); //默认的出发及目的地城市 ， beijing|shanghai + $data_TrainCity = array(); + $data_TrainCity["from"] = ""; + $data_TrainCity["to"] = ""; + if (!empty($meta_train_city)) { + if (strpos($meta_train_city, '|') !== false) { + $arrTrainCity = explode('|', $meta_train_city); + $data_TrainCity["from"] = $arrTrainCity[0]; + $data_TrainCity["to"] = $arrTrainCity[1]; + + } + } + $template_TrainDetailSearch = $this->load->view($template_path . '-train-index', $data_TrainCity, true); + } + + /* 详细内容 */ $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 . $template_TrainDetailSearch . "\r\n", $ic_content, 1); //图片加延迟 - $ic_content = $this->html_optimize_lib->set_lazy_loader($ic_content, 'https://wwww.trainspread.com/images/grey.gif'); + $ic_content = $this->html_optimize_lib->set_lazy_loader($ic_content, 'https://www.trainspread.com/images/grey.gif'); $ic_content = $this->html_optimize_lib->set_image_size($ic_content); @@ -3906,7 +3989,7 @@ class Information extends CI_Controller if ($meta_ct_page_type == "daytripdetail") { //一日游产品的表单处理放这里，根据PC和移动端有所区别 $DayTripData['device'] = $device; - + /**替换左右结构的线路表单标签 2024-7-4*/ if (strpos($ic_content, '') !== false) { //准备数据 @@ -3954,44 +4037,44 @@ class Information extends CI_Controller $InfoData = new stdClass(); //传递用来计算的信息平台数据 $MinTravelers = get_meta($information->ic_id, 'meta_trippest_limitperson'); - $InfoData->MinTravelers = $MinTravelers == null ? 0 : $MinTravelers; + $InfoData->MinTravelers = $MinTravelers == null ? 0 : $MinTravelers; //选项一 $TsOption1 = get_meta($information->ic_id, 'meta_trainspread_option1'); $InfoData->Option1 = new stdClass(); if ( $TsOption1 != false ){ - $arrOption = explode(",", $TsOption1); - $arrItem = array(); + $arrOption = explode(",", $TsOption1); + $arrItem = array(); $num = count($arrOption); - for ($i = 0; $i < $num; $i++) { + for ($i = 0; $i < $num; $i++) { if ($i==0){ $InfoData->Option1->OptionName = $arrOption[$i]; }else{ $arrItemClass = new stdClass(); $arrItemClass->id = $i-1; $arrItemClass->value = $arrOption[$i]; - $arrItem[$i-1] = $arrItemClass; + $arrItem[$i-1] = $arrItemClass; } } $InfoData->Option1->ItemList = $arrItem; }else{ $InfoData->Option1 = $TsOption1; } - + //Package $TsPackage = get_meta($information->ic_id, 'meta_trippest_package'); $InfoData->Package = new stdClass(); if ($TsPackage!=false){ - $arrOption = explode("|", $TsPackage); - $arrItem = array(); + $arrOption = explode("|", $TsPackage); + $arrItem = array(); $num = count($arrOption); - for ($i = 0; $i < $num; $i++) { + for ($i = 0; $i < $num; $i++) { if ($i==0){ $InfoData->Package->PackageName = $arrOption[$i]; } else{ $arr_Item = explode(",", $arrOption[$i]); for ($j=0;$jid = $i; $arrItemClass->ItemName = $arr_Item[0]; $arrItemClass->ItemAdult = $arr_Item[1]; @@ -4009,17 +4092,17 @@ class Information extends CI_Controller $TsOption2 = get_meta($information->ic_id, 'meta_trainspread_option2'); $InfoData->Option2 = new stdClass(); if ( $TsOption2 != false ){ - $arrOption = explode(",", $TsOption2); - $arrItem = array(); + $arrOption = explode(",", $TsOption2); + $arrItem = array(); $num = count($arrOption); - for ($i = 0; $i < $num; $i++) { + for ($i = 0; $i < $num; $i++) { if ($i==0){ $InfoData->Option2->OptionName = $arrOption[$i]; }else{ $arrItemClass = new stdClass(); $arrItemClass->id = $i-1; $arrItemClass->value = $arrOption[$i]; - $arrItem[$i-1] = $arrItemClass; + $arrItem[$i-1] = $arrItemClass; } } $InfoData->Option2->ItemList = $arrItem; @@ -4029,7 +4112,7 @@ class Information extends CI_Controller //附加选项 - $t_Type = get_meta($information->ic_id, "meta_trippest_type"); + $t_Type = get_meta($information->ic_id, "meta_trippest_type"); //产品类型 if ($t_Type) { $InfoData->t_Type = $t_Type; } else { @@ -4043,6 +4126,21 @@ class Information extends CI_Controller $InfoData->t_excludemonth = $t_excludemonth; $InfoData->t_hoteladdress = get_meta($information->ic_id, "meta_trippest_hoteladdress"); $InfoData->t_defaultDate = get_meta($information->ic_id, "meta_trippest_defaultDate"); + + $t_Cancellation = get_meta($information->ic_id, "meta_trainspread_Cancellation"); //取消条款类型 + if ($t_Cancellation) { + $InfoData->t_Cancellation = $t_Cancellation; + }else{ + $InfoData->t_Cancellation = ""; + } + $t_CustomCancel = get_meta($information->ic_id, "meta_trainspread_CustomCancel"); + if ($t_CustomCancel){ + $InfoData->t_CustomCancelText = $t_CustomCancel; + }else{ + $InfoData->t_CustomCancelText = ""; + } + + $DayTripData["InfoData"] = $InfoData; //传递信息平台数据 $linktour = get_meta($information->ic_id, 'meta_trainspread_linktour'); //关联线路 @@ -4056,11 +4154,11 @@ class Information extends CI_Controller $TourData = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apits/getDaytripDetail/?param=" . $paramCode)); $DayTripData["TourData"] = $TourData; - $TourPrice = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apits/getDaytripsPrice/?param=" . $paramCode)); + $TourPrice = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apits/getDaytripsPrice/?param=" . $productCode)); if ($TourPrice->status == "ok"){ $DayTripData["DaytripPrice"] = $TourPrice->price; }else{ - $TourPrice = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apits/getDaytripsPrice/?param=" . $paramCode.",3")); + $TourPrice = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/apits/getDaytripsPrice/?param=" . $productCode.",3")); $DayTripData["DaytripPrice"] = $TourPrice->price; } diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php index 026c4d48..fcb60729 100644 --- a/application/models/feedback_model.php +++ b/application/models/feedback_model.php @@ -19,7 +19,7 @@ class Feedback_model extends CI_Model { 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 + where TAD_Content is not null and isnull(TAI_DeleteFlag,0) = 0 and isnull(tgp.TGP_CheckState, 0) = 136002 order by tai_getdate desc", $total_limit); @@ -31,7 +31,7 @@ class Feedback_model extends CI_Model { $createdOn = new DateTime($feedback_row->tai_getdate); $createdOnString = $createdOn->format('M Y'); $feedback_count = COUNT($feedback_list); - if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < $row_limit) { + if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < $row_limit) { $feedback = [ 'title' => $feedback_row->tai_title, 'customer' => $feedback_row->tai_customerid, @@ -54,9 +54,9 @@ class Feedback_model extends CI_Model { select top 40 tad_content, tai_customerid, tai_title, tai_getdate, tai_url from Eva_TAInfo tai - left join Eva_TADetail on TAD_TAI_SN=TAI_SN + 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 + where TAD_Content is not null and isnull(TAI_DeleteFlag,0) = 0 and isnull(tgp.TGP_CheckState, 0) = 136002 order by tai_getdate desc"); @@ -68,8 +68,8 @@ class Feedback_model extends CI_Model { $createdOn = new DateTime($feedback_row->tai_getdate); $createdOnString = $createdOn->format('M Y'); $feedback_count = COUNT($feedback_list); - if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) { - $feedback = [ + if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) { + $feedback = [ 'title' => $feedback_row->tai_title, 'customer' => $feedback_row->tai_customerid, // 'content' => $feedback_row->tad_content, @@ -87,28 +87,30 @@ class Feedback_model extends CI_Model { /** * 根据城市英文名查找最新八条反馈信息 */ - function get_feedback_by_city_list($city_name_list) { - - // $feedback_query = - // $this->HT->query(" - // select top 40 - // tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name - // from Eva_TAInfo - // left join Eva_TADetail on TAD_TAI_SN=TAI_SN - // left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 - // where TAD_Content is not null and vci.cii2_name = ? - // order by tai_getdate desc", - // array($city_name_list[0])); + function get_feedback_by_city_list($city_name_list, $all=TRUE) { + $feedback_query = + $this->HT->query(" + select top 40 tai_url,tad_content, tai_customerid, tai_title, tai_getdate, vci.cii2_name + from Eva_TAInfo + left join Eva_TADetail on TAD_TAI_SN=TAI_SN + left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 + where TAD_Content is not null and vci.cii2_name = ? and tai_url not LIKE '%trustpilot.com%' + order by tai_getdate desc", + array($city_name_list[0])); + + if ($all) { $feedback_query = $this->HT->query(" - select top 40 tai_url,tad_content, tai_customerid, tai_title, tai_getdate, vci.cii2_name - from Eva_TAInfo - left join Eva_TADetail on TAD_TAI_SN=TAI_SN - left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 - where TAD_Content is not null and tai_url not LIKE '%trustpilot.com%' - order by tai_getdate desc", + select top 40 + tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name + from Eva_TAInfo + left join Eva_TADetail on TAD_TAI_SN=TAI_SN + left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 + where TAD_Content is not null and vci.cii2_name = ? + order by tai_getdate desc", array($city_name_list[0])); + } $first_city_num = $feedback_query->num_rows(); $feedback_result = $feedback_query->result(); @@ -120,7 +122,7 @@ 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) { + if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) { $feedback = [ 'title' => $feedback_row->tai_title, 'customer' => $feedback_row->tai_customerid, @@ -134,37 +136,40 @@ class Feedback_model extends CI_Model { } $enough_count = 40 - $first_city_num; - + if ($enough_count > 0 && count($city_name_list) > 1) { - + $feedback_query = $this->HT->query(" select top ? tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name - from Eva_TAInfo + from Eva_TAInfo left join Eva_TADetail on TAD_TAI_SN=TAI_SN left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 where TAD_Content is not null and vci.cii2_name = ? and tai_url not LIKE '%trustpilot.com%' order by tai_getdate desc", array($enough_count, $city_name_list[1])); - // $feedback_query = - // $this->HT->query(" - // select top ? - // tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name - // from Eva_TAInfo - // left join Eva_TADetail on TAD_TAI_SN=TAI_SN - // left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 - // where TAD_Content is not null and vci.cii2_name = ? - // order by tai_getdate desc", - // array($enough_count, $city_name_list[1])); + + if ($all) { + $feedback_query = + $this->HT->query(" + select top ? + tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name + from Eva_TAInfo + left join Eva_TADetail on TAD_TAI_SN=TAI_SN + left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 + where TAD_Content is not null and vci.cii2_name = ? + order by tai_getdate desc", + array($enough_count, $city_name_list[1])); + } $feedback_result = $feedback_query->result(); - + foreach ($feedback_result as $feedback_row) { $createdOn = new DateTime($feedback_row->tai_getdate); $createdOnString = $createdOn->format('M Y'); $feedback_count = COUNT($feedback_list); - if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) { + if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) { $feedback = [ 'title' => $feedback_row->tai_title, 'customer' => $feedback_row->tai_customerid, @@ -190,7 +195,7 @@ class Feedback_model extends CI_Model { // $this->HT->query(" // select top ? // tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name - // from Eva_TAInfo + // from Eva_TAInfo // left join Eva_TADetail on TAD_TAI_SN=TAI_SN // left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 // where TAD_Content is not null and vci.cii2_name = ? @@ -200,7 +205,7 @@ class Feedback_model extends CI_Model { $this->HT->query(" select top ? tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name - from Eva_TAInfo + from Eva_TAInfo left join Eva_TADetail on TAD_TAI_SN=TAI_SN left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 where TAD_Content is not null and vci.cii2_name = ? and tai_url not LIKE '%trustpilot.com%' @@ -214,8 +219,8 @@ class Feedback_model extends CI_Model { foreach ($feedback_result as $feedback_row) { $createdOn = new DateTime($feedback_row->tai_getdate); $createdOnString = $createdOn->format('M Y'); - - if (!in_array($feedback_row->tai_customerid, $customer_id_list)) { + + if (!in_array($feedback_row->tai_customerid, $customer_id_list)) { $feedback = [ 'title' => $feedback_row->tai_title, 'customer' => $feedback_row->tai_customerid, @@ -238,21 +243,21 @@ class Feedback_model extends CI_Model { $feedback_query = $this->HT->query(" select top 3 - tad.tad_content, - tai.tai_customerid, - tai.tai_title, - tai.tai_getdate, - tai.tai_url, + tad.tad_content, + tai.tai_customerid, + tai.tai_title, + tai.tai_getdate, + tai.tai_url, vci.cii2_name from Eva_TAInfo tai join Eva_TADetail tad on tad.TAD_TAI_SN = tai.TAI_SN join V_CIty_Info vci on vci.cii_sn = tai.tai_cii_sn and vci.LGC_LGC = 1 where tad.TAD_SN in ( - select TAD_SN + select TAD_SN from Eva_TADetail e join V_Operator_Info v on e.TAD_ObjList like '%,' + cast(v.OPI_SN as varchar) + ',%' - where e.TAD_ObjType = 99002 - and v.LGC_LGC = 1 + where e.TAD_ObjType = 99002 + and v.LGC_LGC = 1 and v.OPI2_Name = ? ) and tai_url not LIKE '%trustpilot.com%' @@ -267,8 +272,8 @@ class Feedback_model extends CI_Model { foreach ($feedback_result as $feedback_row) { $createdOn = new DateTime($feedback_row->tai_getdate); $createdOnString = $createdOn->format('M Y'); - - if (!in_array($feedback_row->tai_customerid, $customer_id_list)) { + + if (!in_array($feedback_row->tai_customerid, $customer_id_list)) { $feedback = [ 'title' => $feedback_row->tai_title, 'customer' => $feedback_row->tai_customerid, @@ -294,10 +299,10 @@ class Feedback_model extends CI_Model { $sql = " select top ? tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name - from Eva_TAInfo + from Eva_TAInfo left join Eva_TADetail on TAD_TAI_SN=TAI_SN left join V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1 - where TAD_Content is not null + where TAD_Content is not null and tai_url not LIKE '%trustpilot.com%' "; //根据传递的城市名称进行判断 @@ -309,9 +314,9 @@ class Feedback_model extends CI_Model { // 将每个字符串元素用引号包围，然后用逗号连接起来 $cityList = "'" . implode("','", $cityArray) . "'"; $sql .= "and vci.cii2_name in ($cityList) "; - } - - $sql .=" and TAI_GRI_SN in ( select coli_gri_sn from ConfirmLineInfo + } + + $sql .=" and TAI_GRI_SN in ( select coli_gri_sn from ConfirmLineInfo where COLI_OPI_ID in ( select OPI_SN from OperatorInfo where OPI_DEI_SN=18) and COLI_GRI_SN>'' and isnull(DeleteFlag,0)=0 ) order by tai_getdate desc"; @@ -328,8 +333,8 @@ class Feedback_model extends CI_Model { foreach ($feedback_result as $feedback_row) { $createdOn = new DateTime($feedback_row->tai_getdate); $createdOnString = $createdOn->format('M Y'); - - if (!in_array($feedback_row->tai_customerid, $customer_id_list)) { + + if (!in_array($feedback_row->tai_customerid, $customer_id_list)) { $feedback = [ 'title' => $feedback_row->tai_title, 'customer' => $feedback_row->tai_customerid, diff --git a/application/third_party/ctmobilefirst/controllers/apits.php b/application/third_party/ctmobilefirst/controllers/apits.php index 87b2257a..2bf1bf58 100644 --- a/application/third_party/ctmobilefirst/controllers/apits.php +++ b/application/third_party/ctmobilefirst/controllers/apits.php @@ -312,7 +312,7 @@ class Apits extends CI_Controller { $i = 0 ; $ProductList = array(); foreach ($arrCode as $value) { - + $value = trim($value); //循环读取每条产品的价格列表 $ProductList[$i] = new stdClass(); $ProductList[$i] ->productdetail = $this->apits_model->get_pagdetail($value); diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index a7454202..aa3816a6 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -2245,7 +2245,7 @@ $meta_subnavi_arr = array( onclick="meta('save', 'ic_id; ?>', 'meta_trippest_limitperson', $('#meta_trippest_limitperson').val())"> + class="text-muted glyphicon glyphicon-question-sign"> + @@ -2310,7 +2311,7 @@ $meta_subnavi_arr = array( onclick="meta('save', 'ic_id; ?>', 'meta_trippest_starrating', $('#meta_trippest_starrating').val())"> + class="text-muted glyphicon glyphicon-question-sign"> @@ -2343,7 +2344,7 @@ $meta_subnavi_arr = array( onclick="meta('save', 'ic_id; ?>', 'meta_trippest_defaultDate', $('#meta_trippest_defaultDate').val())"> + class="text-muted glyphicon glyphicon-question-sign"> @@ -2400,6 +2401,55 @@ $meta_subnavi_arr = array( id="meta_trainspread_option2" /> +
+
+ + +
+
+ + +
+
diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index 7a5c85b1..6e6b4f49 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -5,8 +5,10 @@
-

- How would you travel? +

+ * How would you travel?