diff --git a/application/controllers/information.php b/application/controllers/information.php index c83082c6..549e3d28 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1199,9 +1199,11 @@ class Information extends CI_Controller public function test_price() { - $price_rule = '
#ah-8,st,2#
#ah-8,st,2#
'; - $price_tag_list = $this->parse_price_tag($price_rule); - var_dump($price_tag_list); + $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); } /*! @@ -2285,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; //表单模板字符串 + } @@ -2374,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': 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/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php index 96bb3dfe..790f69a7 100644 --- a/application/views/mobile_first/ah-info-page-form.php +++ b/application/views/mobile_first/ah-info-page-form.php @@ -8,135 +8,204 @@
-
-

- Number in your group -

- -
- - -
-
- - -
-
- - -
-
- - -
- - -
- -
-

0-2 yrs old

- -
-
+ +
+ - +

{ $(groupEle).click(function (e) { - - $teenagerNumberInput.val(0); - $childrenNumberInput.val(0); - $infantNumberInput.val(0); var currentTarget = e.currentTarget; if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) { @@ -627,11 +684,6 @@ } else { $adultBlock.show(); $childrenBlock.hide(); - } - if (currentTarget.id === 'Couple') { - $adultNumberInput.val(2); - } else if (currentTarget.id === 'Solo') { - $adultNumberInput.val(1); } }) }); @@ -666,53 +718,6 @@ }); var tripLength = $('#tripLengthNumber').val(); - - //成人 - $('#plusAdult').click(function () { - adultNumber++; - $adultNumberInput.val(adultNumber); - }); - $('#minusAdult').click(function () { - if (adultNumber > 1) { - adultNumber--; - $adultNumberInput.val(adultNumber); - } - }); - // 青少年 - $('#plusTeenager').click(function () { - teenagerNumber++; - $teenagerNumberInput.val(teenagerNumber); - }); - $('#minusTeenager').click(function () { - if (teenagerNumber > 0) { - teenagerNumber--; - $teenagerNumberInput.val(teenagerNumber); - } - }); - // 儿童 - $('#plusChildren').click(function () { - childrenNumber++; - $childrenNumberInput.val(childrenNumber); - }); - $('#minusChildren').click(function () { - if (childrenNumber > 0) { - childrenNumber--; - $childrenNumberInput.val(childrenNumber); - } - }); - // 婴儿 - $('#plusInfant').click(function () { - infantNumber++; - $infantNumberInput.val(infantNumber); - }); - $('#minusInfant').click(function () { - if (infantNumber > 0) { - infantNumber--; - $infantNumberInput.val(infantNumber); - } - }); - - // Trip Length $('#tripLengthPlus').click(function () { diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index b7383ce1..fa9f4666 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -4,136 +4,206 @@ -

-

- How would you travel? -

- -
- - -
-
- - -
-
- - -
-
- - -
- - -
- -
-

0-2 yrs old

- -
-
+ +
+ -
+

@@ -205,82 +275,7 @@ - + -

@@ -689,23 +675,10 @@ function validateQuickInquiryForm() {