diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php
index ede131aa..2a2b7671 100644
--- a/application/third_party/trainsystem/controllers/addorders.php
+++ b/application/third_party/trainsystem/controllers/addorders.php
@@ -201,6 +201,13 @@ class addorders extends CI_Controller{
 		
 		$data['train'] = $this->BIZ_train_model->biz_order_detail($cold_sn);
         $data['people_list']=$this->BIZ_train_model->in_bpesn_people_info($bpe_sn);
+		$coli_id = $this->BIZ_train_model->cold_sn_get_coli_id($cold_sn)['0']->COLI_ID;
+		
+		if(empty($this->BIZ_train_model->get_operatorInfo($coli_id))){
+			$data['email'] = 'jason@hainatravel.com';
+		}else{
+			$data['email'] = $this->BIZ_train_model->get_operatorInfo($coli_id)['0']->OPI_Email;
+		}
 		
 		if($selectseat == ''){
 			$selectseat = '';
@@ -311,9 +318,9 @@ class addorders extends CI_Controller{
 			}
 			
 			if($passporttypeseid == 'G'){
-				$passengers .= ',{"passengerid":' . (++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"'.$data["train"]->adultcost.'","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '","gatValidDateEnd":"'.$item->BPE_PassExpdate.'","gatBornDate":"'.$item->BPE_BirthDate.'","sexCode":"'.$sex.'","email":"cyc@hainatravel.com"}';
+				$passengers .= ',{"passengerid":' . (++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"'.$data["train"]->adultcost.'","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '","gatValidDateEnd":"'.$item->BPE_PassExpdate.'","gatBornDate":"'.$item->BPE_BirthDate.'","sexCode":"'.$sex.'","email":"'.$data['email'].'"}';
 			}else{
-				$passengers .= ',{"passengerid":' . ( ++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"'.$data["train"]->adultcost.'","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '","countryCode":"US","email":"cyc@hainatravel.com"}';
+				$passengers .= ',{"passengerid":' . ( ++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"'.$data["train"]->adultcost.'","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '","countryCode":"US","email":"'.$data['email'].'"}';
 			}
             
         }
@@ -395,6 +402,7 @@ class addorders extends CI_Controller{
 		
 	}
 	
+	//途牛模块
 	function tuniuModel($data,$selectseat,$cold_sn){
 		$this->load->library('Des');
 		$zwcode = $this->db_train_zw[$data['train']->Aircraft]; //座位简码
@@ -558,6 +566,7 @@ class addorders extends CI_Controller{
         return false;
 	}
 	
+	//携程模块
 	function ctripModel($data,$selectseat,$cold_sn){
 		$zwcode = $this->db_train_zw[$data['train']->Aircraft]; //座位简码
         $zwname = $this->train_zw[$this->db_train_zw[$data['train']->Aircraft]]; //座位名称
@@ -575,7 +584,7 @@ class addorders extends CI_Controller{
 		
 		$PostData['TrainOrderService'] = new stdClass();
 		$PostData['TrainOrderService']->PartnerName = ORDERUSER;
-		$PostData['TrainOrderService']->Operation = '';
+		$PostData['TrainOrderService']->Operation = 'add';
 		$PostData['TrainOrderService']->OrderType = '电子';
 		$PostData['TrainOrderService']->OrderTicketType = '0';
 		$PostData['TrainOrderService']->OrderNumber = $OrderNumber;
@@ -584,9 +593,6 @@ class addorders extends CI_Controller{
 		$PostData['TrainOrderService']->Order = new stdClass();
 		$PostData['TrainOrderService']->Order->OrderTime = $time;
 		$PostData['TrainOrderService']->Order->OrderMedia = 'pc';
-		$PostData['TrainOrderService']->Order->Insurance = 'N';
-		$PostData['TrainOrderService']->Order->Invoice = 'N';
-		$PostData['TrainOrderService']->Order->PrivateCustomization = '0';
 		
 		$PostData['TrainOrderService']->Order->TicketItem = new stdClass();
 		$PostData['TrainOrderService']->Order->TicketItem->FromStationName = $data['train']->DepartAirport_cn;
@@ -599,7 +605,8 @@ class addorders extends CI_Controller{
 		
 		$AdultNum = 0;
 		$ChildNum = 0;
-		$Passport = '';
+		$i = 0;
+		$passagersdata = array();
 		foreach ($data['people_list'] as $PassagerInfo){
 			//乘客类型
 			switch ($PassagerInfo->BPE_GuestType) {
@@ -617,7 +624,7 @@ class addorders extends CI_Controller{
                     $PiaoType = 1;
                     $PiaoTypeName = "成人票";
                     break;
-            }	
+            }
 
 			//证件类型
 			switch ($PassagerInfo->BPE_PassportType){
@@ -637,32 +644,30 @@ class addorders extends CI_Controller{
 					$PassportTypeseidName = "护照";
 					break;
 			}
-			//$Passport .= chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName).','.$PassportTypeseidName.','.$PassagerInfo->BPE_Passport.','.$PiaoTypeName.','.''.',0|';
-			
-			if($PiaoType == 1){
-				$RelatioNme = chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName);
-				$Passport .= chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName).','.$PassportTypeseidName.','.$PassagerInfo->BPE_Passport.','.$PiaoTypeName.','.''.',0|';
-			}elseif($PiaoType == 2){
-				$Passport .= $RelatioNme.','.$PassportTypeseidName.','.$PassagerInfo->BPE_Passport.','.$PiaoTypeName.','.''.',0,'.chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName).'|';
-			}
-			
+			$passagersdata[$i] = new stdClass();
+			$passagersdata[$i]->PassengerType = $PiaoTypeName;
+			$passagersdata[$i]->PassportType = $PassportTypeseidName;
+			$passagersdata[$i]->PassportNumber = $PassagerInfo->BPE_Passport;
+			$passagersdata[$i]->PassportName = chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName);
+			$passagersdata[$i]->RealName = chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName);
+			$passagersdata[$i]->ContactEmail = $data['email'];
+			$i++;
 		}
 		
 		$PostData['TrainOrderService']->Order->TicketItem->AuditTicketCount = $AdultNum;
 		$PostData['TrainOrderService']->Order->TicketItem->ChildTicketCount = $ChildNum;
 		$PostData['TrainOrderService']->Order->TicketItem->SeatName = $this->train_zw[$this->db_train_zw[$data['train']->Aircraft]];
 		$PostData['TrainOrderService']->Order->TicketItem->SelectedSeat = $selectseat;
-		
 		$is_accept_standing = '';
 		if($this->istanding == 'true'){
 			$is_accept_standing = '无座';
 		}
 		$PostData['TrainOrderService']->Order->TicketItem->AcceptSeat = $is_accept_standing;
 		
-		$PostData['TrainOrderService']->Order->TicketItem->passport = substr($Passport,0,strlen($Passport)-1);
+		//乘客人信息
+		$PostData['TrainOrderService']->Order->TicketItem->Passengers = $passagersdata;
 		$PostData['TrainOrderService']->Order->TicketItem->OrderPrice = $data['train']->adultcost * $AdultNum + $data['train']->childcost * $ChildNum;
 		
-		$PostData['TrainOrderService']->Order->FrontSeatFlag = '0';
 		
 		$PostData['TrainOrderService']->Order->User = new stdClass();
 		$PostData['TrainOrderService']->Order->User->UserID = '';
@@ -670,6 +675,7 @@ class addorders extends CI_Controller{
 		$PostData['TrainOrderService']->Order->User->userLoginName = 'guilintravel';
 		$PostData['TrainOrderService']->Order->User->UserMobile = '18877381547';
 		//print_r(json_encode($PostData));
+		//die();
 		//本地添加记录
 		$add_data = new stdClass();
 		$add_data->cold_sn = $cold_sn;
@@ -692,12 +698,13 @@ class addorders extends CI_Controller{
 		//存储到数据库
 		$this->train_system_model->add_orders($add_data);
 		
-		$Url = 'http://m.ctrip.com/restapi/soa2/11009/json/PartnerAddOrder';
+		//$Url = 'http://m.ctrip.com/restapi/soa2/11009/json/PartnerAddOrder';
+		$Url = 'http://apiproxy.fws.ctripqa.com/apiproxy/soa2/13680/json/PartnerAddOrder';
 		$ResponseJson = GetPost_http($Url,json_encode($PostData),'json');
 		$ResponseData = json_decode($ResponseJson);
 		
-		//echo '预定';
-		//print_r($ResponseData);die();
+		echo '预定';
+		print_r($ResponseData);die();
 		
 		//预定请求成功后执行支付
 		if($ResponseData->Status == 'SUCCESS'){
@@ -735,7 +742,7 @@ class addorders extends CI_Controller{
 		$PostData['TrainOrderService']->PartnerName = ORDERUSER;
 		$PostData['TrainOrderService']->OrderNumber = $CtripOrder;
 		$PostData['TrainOrderService']->PayedPrice = $Price;
-		//$PostData['TrainOrderService']->PayType = $time;
+		$PostData['TrainOrderService']->PayTime = $time;
 		//$PostData['TrainOrderService']->TradeNumber = $time;
 		
 		$Url = 'http://m.ctrip.com/restapi/soa2/11009/json/PartnerPayOrder';
diff --git a/application/third_party/trainsystem/views/homepage.php b/application/third_party/trainsystem/views/homepage.php
index 49127619..56f0d64e 100644
--- a/application/third_party/trainsystem/views/homepage.php
+++ b/application/third_party/trainsystem/views/homepage.php
@@ -297,13 +297,13 @@ function selseat(seat){
                     <td colspan="4"  class="biaoqian"><span class="back_mes" style="color:red;line-height: 30px;"></span>
                     </td>
                   </tr>
-				  <tr style="text-align:;">
+				  <!--<tr style="text-align:;">
                     <td>
                       <button type="button" class="btn btn-success ctrip_pay" data-order="<?php echo $v->train[0]->FOI_COLD_SN;?>">携程订票</button>
                     </td>
                     <td colspan="4"  class="biaoqian"><span class="ctrip_back_mes" style="color:red;line-height: 30px;"></span>
                     </td>
-                  </tr>
+                  </tr>-->
 				  <tr style="text-align:;">
 					<td>
                       <button type="button" class="btn btn-success grab_ticket" data-order="<?php echo $v->train[0]->FOI_COLD_SN;?>">抢票</button>