Merge branch 'master' of github.com:hainatravel/information-system into master

application/third_party/order/controllers/confirm.php

@@ -80,10 +80,11 @@ class Confirm extends CI_Controller {
         $passport = $this->input->post('passport');
         $expiration_date = $this->input->post('passport_expiration_date');
         $nationality = $this->input->post('nationality');
-         
+
         $occupation=$this->input->post('occupation');
 
-        $contact_phone = '手机:' . $this->input->post('mobile');
+        $country_code = $this->input->post('country_code');
+        $contact_phone = $country_code . ' ' . $this->input->post('mobile');
         $COLI_SN = $this->input->post('COLI_SN');
         $visitor_link = $this->input->post('visitor_link');
         $COLI_ID = $this->input->post('COLI_ID');
@@ -97,7 +98,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;
@@ -162,7 +163,7 @@ class Confirm extends CI_Controller {
             echo json_encode(array('status' => 'no'));
         }
     }
-	
+
     function review() {
       header('Content-type: application/json;charset=utf-8');
       $data = array();