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

application/third_party/train/controllers/search.php

@@ -278,7 +278,7 @@ class search extends CI_Controller{
 			if(!empty($audlt)){
 				$i=0;
 				foreach($audlt as $key_adult=>$value){
-					$seat_name = $this->BIZ_intel_train_model->get_seatname($key_adult)->Seat_EName2;
+					$seat_name = $this->BIZ_intel_train_model->get_seatname($key_adult)->Seat_EName1;
 					$item->adult_seat[$i]['name'] = $seat_name;
 					$item->adult_seat[$i]['code'] = $key_adult;
 					$item->adult_seat[$i]['price'] = $value;
@@ -289,7 +289,7 @@ class search extends CI_Controller{
 			if(!empty($child)){
 				$j=0;
 				foreach($child as $key_child=>$value){
-					$seat_name = $this->BIZ_intel_train_model->get_seatname($key_child)->Seat_EName2;
+					$seat_name = $this->BIZ_intel_train_model->get_seatname($key_child)->Seat_EName1;
 					$item->child_seat[$j]['name'] = $seat_name;
 					$item->child_seat[$j]['code'] = $key_child;
 					$item->child_seat[$j]['price'] = $value;

application/third_party/train/models/BIZ_intel_train_model.php

@@ -62,7 +62,9 @@ class BIZ_intel_train_model extends CI_Model {
 	public function get_one_train($train_no){
 		$sql = "
 				SELECT 
-						*
+						*,
+						(select s_country from TrainStation_intel where trainFromCode = s_code ) as From_country,
+						(select s_country from TrainStation_intel where trainToCode = s_code ) as To_country
 				  FROM
 						trainlist tl
              LEFT JOIN