diff --git a/application/controllers/information.php b/application/controllers/information.php index 2a322ce4..d231c226 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -3673,7 +3673,7 @@ class Information extends CI_Controller $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.trainspread.com/images/grey.gif'); + $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_image_size($ic_content); @@ -3912,7 +3912,7 @@ class Information extends CI_Controller $DayTripData["productCode"] = $productCode; $DayTripData["picture_mobile"] = get_meta($information->ic_id, 'meta_addon_picture_mobile'); $DayTripData["picture_pc"] = get_meta($information->ic_id, 'meta_addon_picture'); - $DayTripData["TITLE"] = $information->ic_seo_title; + $DayTripData["TITLE"] = $information->ic_title; //成人，儿童，婴儿的年龄显示信息 $AdultMsg = $this->infoBokunData_model->getBokunMetaList($information->ic_id, "AdultMsg"); if ($AdultMsg) { @@ -3953,9 +3953,92 @@ 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'); + if ( $TsOption1 != false ){ + $arrOption = explode(",", $TsOption1); + $arrItem = array(); + $num = count($arrOption); + 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; + } + } + $InfoData->Option1->ItemList = $arrItem; + }else{ + $InfoData->Option1 = $TsOption1; + } + + //Package + $TsPackage = get_meta($information->ic_id, 'meta_trippest_package'); + if ($TsPackage!=false){ + $arrOption = explode("|", $TsPackage); + $arrItem = array(); + $num = count($arrOption); + 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]; + $arrItemClass->ItemChild = $arr_Item[2]; + $arrItem[$i-1] = $arrItemClass; + } + } + } + $InfoData->Package->ItemList = $arrItem; + }else{ + $InfoData->Package = $TsPackage; + } - $DayTripData["InfoData"] = $InfoData; + //选项二 + $TsOption2 = get_meta($information->ic_id, 'meta_trainspread_option2'); + if ( $TsOption2 != false ){ + $arrOption = explode(",", $TsOption2); + $arrItem = array(); + $num = count($arrOption); + 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; + } + } + $InfoData->Option2->ItemList = $arrItem; + }else{ + $InfoData->Option2 = $TsOption2; + } + + + //附加选项 + $t_Type = get_meta($information->ic_id, "meta_trippest_type"); + if ($t_Type) { + $InfoData->t_Type = $t_Type; + } else { + $InfoData->t_Type = "general"; + } + $t_excludedate = get_meta($information->ic_id, "meta_trippest_excludedate"); + $t_includedate = get_meta($information->ic_id, "meta_trippest_includedate"); + $t_excludemonth = get_meta($information->ic_id, "meta_trippest_excludemonth"); + $InfoData->t_excludedate = $t_excludedate; + $InfoData->t_includedate = $t_includedate; + $InfoData->t_excludemonth = $t_excludemonth; + $InfoData->t_hoteladdress = get_meta($information->ic_id, "meta_trippest_hoteladdress"); + $DayTripData["InfoData"] = $InfoData; //传递信息平台数据 $linktour = get_meta($information->ic_id, 'meta_trainspread_linktour'); //关联线路 if (!empty($linktour)){ diff --git a/application/third_party/ctmobilefirst/models/apits_model.php b/application/third_party/ctmobilefirst/models/apits_model.php index 666490b0..33324ac9 100644 --- a/application/third_party/ctmobilefirst/models/apits_model.php +++ b/application/third_party/ctmobilefirst/models/apits_model.php @@ -455,6 +455,7 @@ class Apits_model extends CI_Model { ,PAG_GuideLan ,PAG2_TimeDetail ,p1.PAG_SourceType + ,PAG2_Summary FROM dbo.BIZ_PackageInfo P1 INNER JOIN dbo.BIZ_PackageInfo2 p2 ON P1.PAG_SN = p2.PAG2_PAG_SN INNER JOIN dbo.CItyInfo2 ON P1.PAG_CII_SN = dbo.CItyInfo2.CII2_CII_SN AND diff --git a/application/views/mobile_first/trainspread-daydetail-form.php b/application/views/mobile_first/trainspread-daydetail-form.php index ecbd0eef..acf6d7f5 100644 --- a/application/views/mobile_first/trainspread-daydetail-form.php +++ b/application/views/mobile_first/trainspread-daydetail-form.php @@ -1,19 +1,18 @@ -
- -
- - <?php echo $TITLE ?> - - <?php echo $TITLE ?> - -
-
    -
  • PAG_NeedTime ==""?"":"Duration:".$TourData->PAG_NeedTime." hours" ?>
    • -
  • Departure:Daily
    • -
  • MinTravelers>0?"Min Travelers:".$InfoData->MinTravelers." Pax" : "Min Travelers:NO Limit" ?>
    • -
-
+
+
+ + <?php echo $TITLE ?> + + <?php echo $TITLE ?> + +
+
    +
  • PAG_NeedTime ==""?"":"Duration:".$TourData->PAG_NeedTime." hours" ?>
    • +
  • Departure:Daily
    • +
  • MinTravelers>0?"Min Travelers:".$InfoData->MinTravelers." Pax" : "Min Travelers:NO Limit" ?>
    • +
+
@@ -54,7 +53,7 @@ ?>
- + @@ -161,7 +160,7 @@ } else { ?>
- + +
+
-
-
+