diff --git a/application/controllers/information.php b/application/controllers/information.php index ec0fafad..1c1ea289 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -983,6 +983,14 @@ class Information extends CI_Controller file_put_contents($html_path, $template, LOCK_EX); } + public function test_recommand() + { + + $information = $this->Information_model->Detail($this->input->get('is_id')); + $recommand_information = $this->recommand_information($information); + var_dump($recommand_information); + } + public function test_feedback() { $feedback_newest = $this->Feedback_model->test_feedback_newest(); diff --git a/application/third_party/order/controllers/confirm.php b/application/third_party/order/controllers/confirm.php index 7f3e17b9..a6a9177c 100644 --- a/application/third_party/order/controllers/confirm.php +++ b/application/third_party/order/controllers/confirm.php @@ -89,10 +89,10 @@ class Confirm extends CI_Controller { $COLI_ID = $this->input->post('COLI_ID'); //航班信息 $MEI_ArrivalFlightNo = $this->input->post('MEI_ArrivalFlightNo'); - // HTML datetime-local 获取的值：2023-05-29T15:45，需要替换 T 为空格才能符合数据类型 - $MEI_ArrivalTime = str_replace("T", " ", $this->input->post('MEI_ArrivalTime')); $MEI_DepartureFlightNo = $this->input->post('MEI_DepartureFlightNo'); - $MEI_DepartureTime = str_replace("T", " ", $this->input->post('MEI_DepartureTime')); + // HTML datetime-local 获取的值：2023-05-29T15:45，需要替换 T 为空格才能符合数据类型 + $MEI_ArrivalTime = str_replace("T", " ", $this->input->post('MEI_ArrivalDate').' '.$this->input->post('MEI_ArrivalTime')); + $MEI_DepartureTime = str_replace("T", " ", $this->input->post('MEI_DepartureDate').' '.$this->input->post('MEI_DepartureTime')); //已经确认过 @@ -159,13 +159,14 @@ class Confirm extends CI_Controller { } } - //只有ch有review功能 function review() { - header('Content-type: application/json;charset=utf-8'); - $data = array(); - $data['postdata'] = $this->input->post(); - $mail_text = $this->load->view('mailtext', $data, true); - echo json_encode($mail_text); + header('Content-type: application/json;charset=utf-8'); + $data = array(); + $site_code = $this->input->get('site_code'); + $viewName = $site_code.'/mailtext'; + $data['postdata'] = $this->input->post(); + $mail_text = $this->load->view($viewName, $data, true); + echo json_encode($mail_text); } } diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php index cb8e055e..5656f3e6 100644 --- a/application/third_party/order/views/ah/confirm_order.php +++ b/application/third_party/order/views/ah/confirm_order.php @@ -767,9 +767,10 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + +
@@ -783,9 +784,10 @@ select.gender_pick {border: 1px solid #d1d1d1;
- + +
@@ -928,7 +930,7 @@ select.gender_pick {border: 1px solid #d1d1d1; type: "post", dataType: "json", data: $("#form-confirm-info").serialize(), - url: 'https://www.chinahighlights.com/secureinfoconfirm/confirm/review', + url: 'https://www.chinahighlights.com/secureinfoconfirm/confirm/review?site_code=ah', success: function(data, textStatus) { $('#reviewModal_body').html(data); $('#reviewModal').modal('show'); @@ -947,42 +949,6 @@ select.gender_pick {border: 1px solid #d1d1d1; var travelerCount = $(".traveler_info").length + 1; $addTraveler.find('[data-header]').text('Traveler ' + travelerCount); $('#add_traveler_button').before($addTraveler); - - $('.datepicker').datepicker({ - controlType: 'select', - oneLine: true, - changeMonth: true, - changeYear: true, - yearRange: '2010:2055', - timeFormat: 'mm/dd/yy' - }); - - $('.datetimepicker').datetimepicker({ - controlType: 'select', - oneLine: true, - changeMonth: false, - changeYear: false, - timeFormat: 'H:mm' - }); - - }); - - - $('.datepicker').datepicker({ - controlType: 'select', - oneLine: true, - changeMonth: true, - changeYear: true, - yearRange: '2010:2055', - timeFormat: 'mm/dd/yy' - }); - - $('.datetimepicker').datetimepicker({ - controlType: 'select', - oneLine: true, - changeMonth: false, - changeYear: false, - timeFormat: 'H:mm' }); }); diff --git a/application/third_party/order/views/ah/mailtext.php b/application/third_party/order/views/ah/mailtext.php new file mode 100644 index 00000000..993027c8 --- /dev/null +++ b/application/third_party/order/views/ah/mailtext.php @@ -0,0 +1,76 @@ +

+ China Highlights is not responsible for any costs or consequences which may arise from failure on your part to provide correct information (For example, wrongly spelt names may cause your flight tickets to be cancelled, incorrect incoming flight number may lead to failure in pick-up etc.).
+

+

+ Passenger Information +

+ $sur) { ?> + +

Passenger

+

Sur name/First and Middle name:

+

Passport No.:

+

Passport Expiration Date:

+

Birthday:

+ + +

Contact Information

+

Land line:

+

Mobile:

+ +

+ Flight Information +

+

Arrival Flight No.:

+

+ Arrival date: +

+

+ Arrival time: +

+

+ Departure Flight no.: +

+

+ Departure date: +

+

+ Departure time: +

+

+ Special Request +

+

+ +
+

+

+ Insurance Information +

+

+ +
+

+

+ Emergency Contact Information +

+

+ Contact person name: +

+

+ Relationship with him/her: +

+

+ E-mail address: +

+

+ Telephone no.: +

\ No newline at end of file diff --git a/application/third_party/recommend/views/bind.php b/application/third_party/recommend/views/bind.php index f17378dd..e572dfa4 100644 --- a/application/third_party/recommend/views/bind.php +++ b/application/third_party/recommend/views/bind.php @@ -109,6 +109,58 @@ + +
+
+
Content Article I
+
+ ir_rule . '
' . $recommends['Content Article I']->ir_keyword; ?> +
+
+
+ +
+
+
Content Article J
+
+ ir_rule . '
' . $recommends['Content Article J']->ir_keyword; ?> +
+
+
+ +
+
+
Content Article K
+
+ ir_rule . '
' . $recommends['Content Article K']->ir_keyword; ?> +
+
+
+ +
+
+
Content Article L
+
+ ir_rule . '
' . $recommends['Content Article L']->ir_keyword; ?> +
+
+
@@ -164,10 +216,7 @@ - - -
Content Tour E
+
+
+
Content Tour I +
+
+ ir_rule . '
' . $recommends['Content Tour I']->ir_keyword; ?> +
+
+
+ + + +
+
+
Content Tour J +
+
+ ir_rule . '
' . $recommends['Content Tour J']->ir_keyword; ?> +
+
+
+ +
+
+
Content Tour K +
+
+ ir_rule . '
' . $recommends['Content Tour K']->ir_keyword; ?> +
+
+
+ +
+
+
Content Tour L +
+
+ ir_rule . '
' . $recommends['Content Tour L']->ir_keyword; ?> +
+
+
+
@@ -248,6 +347,26 @@
+
+
右侧列表广告
+
+
    + +
  1. + + List Tips Right ir_rule; ?> + +
    2. + +
+ + +
+
+ @@ -302,10 +421,9 @@ - - + +
-
Article E
+
+
+ +
+
+
Article I
+
+ ir_rule . '
' . $recommends['Article I']->ir_keyword; ?> +
+
+
+ +
+
+
Article J
+
+ ir_rule . '
' . $recommends['Article J']->ir_keyword; ?> +
+
+
+ +
+
+
Article K
+
+ ir_rule . '
' . $recommends['Article K']->ir_keyword; ?> +
+
+
+ +
+
+
Article L
+
+ ir_rule . '
' . $recommends['Article L']->ir_keyword; ?> +
+
+
+
@@ -408,10 +581,7 @@
- - -
Tour E
+
+
+
Tour I +
+
+ ir_rule . '
' . $recommends['Tour I']->ir_keyword; ?> +
+
+
+ +
+
+
Tour J +
+
+ ir_rule . '
' . $recommends['Tour J']->ir_keyword; ?> +
+
+
+ +
+
+
Tour K +
+
+ ir_rule . '
' . $recommends['Tour K']->ir_keyword; ?> +
+
+
+ +
+
+
Tour L +
+
+ ir_rule . '
' . $recommends['Tour L']->ir_keyword; ?> +
+
+
+
diff --git a/application/third_party/recommend/views/templates.php b/application/third_party/recommend/views/templates.php index 1232c0f3..96d0483b 100644 --- a/application/third_party/recommend/views/templates.php +++ b/application/third_party/recommend/views/templates.php @@ -1,4 +1,4 @@ -

CH文中信息广告代码：

+

CH文中tour广告代码：

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index eee416f0..23aebf64 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -2,611 +2,625 @@ ?>
-
- -
+ +