diff --git a/application/third_party/order/controllers/confirm.php b/application/third_party/order/controllers/confirm.php index 1b9ae2fc..e8c3e11b 100644 --- a/application/third_party/order/controllers/confirm.php +++ b/application/third_party/order/controllers/confirm.php @@ -30,14 +30,14 @@ class Confirm extends CI_Controller { } } } else { - $this->load->view($site_code.'/link_tips', $data); + $this->load->view($site_code.'/link_tips', $data); return false; } $visitor_link_arr = $this->Order_model->get_visitor_link($COLI_SN); foreach ($visitor_link_arr as $l) { if ($visitor_link == $l->visitor_link) { - $this->load->view($site_code.'/link_tips', $data); + $this->load->view($site_code.'/link_tips', $data); return false; } } @@ -66,6 +66,7 @@ class Confirm extends CI_Controller { //已经确认过 $had_save = $this->Order_model->get_visitor_link($COLI_SN, $visitor_link); + if (!empty($had_save)) { echo json_encode(array('status' => 'ok')); return; @@ -79,7 +80,7 @@ class Confirm extends CI_Controller { } elseif ($this->input->post('address_street')) { $MEI_Street = $this->input->post('address_street') . ',' . $this->input->post('address_city') . ',' . $this->input->post('address_state') . ',' . $this->input->post('address_country'); } else { - $MEI_Street = ''; + $MEI_Street = $this->input->post('street').','.$this->input->post('city').','.$this->input->post('country'); } $data['MEI_Street'] = $MEI_Street; if (isset($given_name[$key]) && $given_name[$key] != 'None') { @@ -125,7 +126,7 @@ class Confirm extends CI_Controller { echo json_encode(array('status' => 'no')); } } - + //只有ch有review功能 function review() { $data = array(); diff --git a/application/third_party/order/views/gm/confirm_order.php b/application/third_party/order/views/gm/confirm_order.php index 31578924..b93a3cc8 100644 --- a/application/third_party/order/views/gm/confirm_order.php +++ b/application/third_party/order/views/gm/confirm_order.php @@ -6,533 +6,400 @@