diff --git a/application/third_party/order/views/gm/confirm_order.php b/application/third_party/order/views/gm/confirm_order.php
index e5b87dce..1a973471 100644
--- a/application/third_party/order/views/gm/confirm_order.php
+++ b/application/third_party/order/views/gm/confirm_order.php
@@ -69,6 +69,7 @@
 
           <div class="row panel-new-head">
             <h4 class="text-red">Kunden informationen</h4>
+			<p>Bitte prüfen Sie, ob Ihr Name richtig geschrieben ist (vollständiger Name wie im Reisepass) . Da wir die Folgekosten durch ein wegen falschem Namen stornierten Hotel oder Flugticket nicht tragen, ist die richtige Schreibweise Ihres Namens und Ihrer alle Daten unbedingt wichtig.</p>
           </div>
 
           <div class="col-xs-24 nopadding">
@@ -81,6 +82,9 @@
                     <div class="col-xs-11 nopadding" style="padding-left: 2px !important;">Name</div>    
                   </div>
                 </label>
+            </div>
+			<div class="form-group col-sm-4 nopadding-R" style="margin-bottom:0px;">
+                <label class="" style="font-weight:normal">Geburtstag</label>
             </div>
             <div class="form-group col-sm-4 nopadding-R" style="margin-bottom:0px;">
                 <label class="" style="font-weight:normal">Passnr.</label>
@@ -88,9 +92,7 @@
             <div class="form-group col-sm-5 nopadding-R" style="margin-bottom:0px;">
                 <label class="" style="font-weight:normal">Verfallsdatum des Reisepasses</label>
             </div>
-            <div class="form-group col-sm-4 nopadding-R" style="margin-bottom:0px;">
-                <label class="" style="font-weight:normal">Geburtstag</label>
-            </div>
+            
             <div class="form-group col-sm-4" style="margin-bottom:0px;">
                 <label class="" style="font-weight:normal">Nationalität</label>
             </div>
@@ -122,7 +124,13 @@
                   </div>
                 </div>
             </div>
-
+			
+			<div class="form-group col-sm-4 nopadding-R">
+                <div class="input-groups date " data-date="1970-05-20">
+                  <input class="form-control input-sm common_input bd_datepicker" type="text" name="birthday[]" value="" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Bitte tragen Sie Ihr Geburtsdatum ein!" autocomplete="off" style="color:#333333 !important;">
+                </div>
+            </div>
+			
             <div class="form-group col-sm-4 nopadding-R">
                 <input type="text" class="form-control input-sm common_input" name="passport[]" value="" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Bitte tragen Sie Ihre Ausweisnummer ein!" autocomplete="off">
             </div>
@@ -133,11 +141,7 @@
                 </div>
             </div>
 
-            <div class="form-group col-sm-4 nopadding-R">
-                <div class="input-groups date " data-date="1970-05-20">
-                  <input class="form-control input-sm common_input bd_datepicker" type="text" name="birthday[]" value="" data-trigger="manual" data-container="body" data-toggle="popover" data-placement="top" data-content="Bitte tragen Sie Ihr Geburtsdatum ein!" autocomplete="off" style="color:#333333 !important;">
-                </div>
-            </div>
+            
 
             <div class="form-group col-sm-4">
                 <div class="input-group">
@@ -146,7 +150,7 @@
                         <option value="6" selected="selected">
                             Deutschland
                         </option>
-                        <option value="18">
+                        <option value="470">
                             Österreich
                         </option>
                         <option value="25">
diff --git a/application/third_party/train/controllers/search.php b/application/third_party/train/controllers/search.php
index aeff2672..ee428378 100644
--- a/application/third_party/train/controllers/search.php
+++ b/application/third_party/train/controllers/search.php
@@ -252,6 +252,8 @@ class search extends CI_Controller{
 		$return_json->status = '200';
 		$return_json->reason = '成功的返回';
 		$return_json->rate = $this->GetCurrencyRate();
+		$return_json->mainland_deliver = 12;
+		$return_json->others_deliver = 9;
 		$return_json->data = array();
 		$return_json->endata = array();
 		
@@ -406,6 +408,8 @@ class search extends CI_Controller{
 			if(isset($price)){
 				if($price > 0){
 					return '有';
+				}else{
+					return '';
 				}
 			}
 			return '';
diff --git a/application/third_party/tuniu/controllers/tuniu_train.php b/application/third_party/tuniu/controllers/tuniu_train.php
index 08bcb176..cf81e430 100644
--- a/application/third_party/tuniu/controllers/tuniu_train.php
+++ b/application/third_party/tuniu/controllers/tuniu_train.php
@@ -53,7 +53,8 @@ class Tuniu_train extends CI_Controller{
 		if(empty(json_decode($back_data)->data)){
 			log_message('error','tuniu:'.json_encode($post_data));
 		}
-		//print_r(json_decode($back_data)->data);
+		//print_r(json_decode($back_data));
+
 		$return_data = new stdClass();
 		$return_data->returnCode = json_decode($back_data)->returnCode;
 		//echo $return_data->returnCode;
@@ -69,10 +70,10 @@ class Tuniu_train extends CI_Controller{
 				$obj[$value->fromStationCode] = $value->fromStationName;
 				$obj[$value->toStationCode] = $value->toStationName;
 				$seat_type = '';
-				if(isset($value->gjrwPrice)){
-					if(is_numeric($value->gjrwPrice)){
-						$gjrwPrice = $value->gjrwPrice * 10;
-						$seat_type .= '"6":"'.$gjrwPrice.'","A6":"¥'.$value->gjrwPrice.'",'; 
+				if(isset($value->gjrwXiaPrice)){
+					if(is_numeric($value->gjrwXiaPrice)){
+						$gjrwXiaPrice = $value->gjrwXiaPrice * 10;
+						$seat_type .= '"6":"'.$gjrwXiaPrice.'","A6":"¥'.$value->gjrwXiaPrice.'",'; 
 					}
 				}
 				if(isset($value->qtxbPrice)){
@@ -132,8 +133,22 @@ class Tuniu_train extends CI_Controller{
 					}
 				}
 				$pricestr = $seat_type.'"train_no":'.'"'.$value->trainNo.'"';
+				
+				//对余票数进行验证
+				$value->gjrwNum = isset($value->gjrwNum) ? ticket_exchange($value->gjrwNum) : '';
+				$value->rwNum = isset($value->rwNum) ? ticket_exchange($value->rwNum) : '';
+				$value->rzNum = isset($value->rzNum)?ticket_exchange($value->rzNum) : '';
+				$value->tdzNum = isset($value->tdzNum)?ticket_exchange($value->tdzNum) : '';
+				$value->wzNum = isset($value->wzNum)?ticket_exchange($value->wzNum) : '';
+				$value->ywNum = isset($value->ywNum)?ticket_exchange($value->ywNum) : '';
+				$value->yzNum = isset($value->yzNum)?ticket_exchange($value->yzNum) : '';
+				$value->edzNum = isset($value->edzNum)?ticket_exchange($value->edzNum) : '';
+				$value->ydzNum = isset($value->ydzNum)?ticket_exchange($value->ydzNum) : '';
+				$value->swzNum = isset($value->swzNum)?ticket_exchange($value->swzNum) : '';
+				$value->dwNum = isset($value->dwNum)?ticket_exchange($value->dwNum) : '';
+				
 				//余票字符串
-				$return_data->data->result[$i] = '|预定|'.$value->trainNo.'|'.$value->trainCode.'|'.$value->fromStationName.'|'.$value->toStationName.'|'.$value->fromStationCode.'|'.$value->toStationCode.'|'.$value->startTime.'|'.$value->arriveTime.'|'.$value->runTime.'|'.$value->canBuyNow.'||'.date('Ymd',strtotime($value->trainStartDate)).'||||||||'.ticket_exchange($value->gjrwNum).'|'.ticket_exchange($value->qtxbNum).'|'.ticket_exchange($value->rwNum).'|'.ticket_exchange($value->rzNum).'|'.ticket_exchange($value->tdzNum).'|'.ticket_exchange($value->wzNum).'||'.ticket_exchange($value->ywNum).'|'.ticket_exchange($value->yzNum).'|'.ticket_exchange($value->edzNum).'|'.ticket_exchange($value->ydzNum).'|'.ticket_exchange($value->swzNum).'|'.ticket_exchange($value->dwNum).'||';
+				$return_data->data->result[$i] = '|预定|'.$value->trainNo.'|'.$value->trainCode.'|'.$value->fromStationName.'|'.$value->toStationName.'|'.$value->fromStationCode.'|'.$value->toStationCode.'|'.$value->startTime.'|'.$value->arriveTime.'|'.$value->runTime.'|'.$value->canBuyNow.'||'.date('Ymd',strtotime($value->trainStartDate)).'||||||||'.$value->gjrwNum.'||'.$value->rwNum.'|'.$value->rzNum.'|'.$value->tdzNum.'|'.$value->wzNum.'||'.$value->ywNum.'|'.$value->yzNum.'|'.$value->edzNum.'|'.$value->ydzNum.'|'.$value->swzNum.'|'.$value->dwNum.'||';
 				$data = '{"validateMessagesShowId":"_validatorMessage","status":true,"httpstatus":200,"data":{'.$pricestr.'},"messages":[],"validateMessages":{}}';
 				$return_data->data->price[$i] = $data;
 				$this->tuniuprice_model->addOrUpdate($value->trainNo,$value->trainCode,$value->fromStationCode,$value->toStationCode,json_encode($data));
diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php
index ca7ec79c..e2b159d4 100644
--- a/application/views/bootstrap/header.php
+++ b/application/views/bootstrap/header.php
@@ -83,6 +83,7 @@
                                 <li><a href="<?php echo site_url('tools/amp_check') ?>">AMP转化检查</a></li>
                                 <li><a target="_blank" href="http://www.arachina.com/html-tag-quick-query.htm">Html基础知识</a></li>
                                 <li><a target="_blank" href="https://docs.google.com/presentation/d/1YN9P8j837SCHenpK_UApHU04K6evV1-GLULhsdmdtWM/edit?usp=sharing">AMP知识及构建SOP</a></li>
+                                <li><a target="_blank" href="https://docs.google.com/presentation/d/1zPc7832vManRsCgkgO5XoMVKe6deIHC9zsmLPWihxrA/edit?usp=sharing">PS超基础课件</a></li>
                                 <li><a href="<?php echo site_url('setting') ?>">系统设置</a></li>
                         </ul>
                     </li>
diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php
index 664cc98d..02adad63 100644
--- a/application/views/bootstrap3/header.php
+++ b/application/views/bootstrap3/header.php
@@ -90,6 +90,7 @@
                                 <li><a href="<?php echo site_url('tools/amp_check') ?>">AMP转化检查</a></li>
                                 <li><a target="_blank" href="http://www.arachina.com/html-tag-quick-query.htm">Html基础知识</a></li>
                                 <li><a target="_blank" href="https://docs.google.com/presentation/d/1YN9P8j837SCHenpK_UApHU04K6evV1-GLULhsdmdtWM/edit?usp=sharing">AMP知识及构建SOP</a></li>
+                                <li><a target="_blank" href="https://docs.google.com/presentation/d/1zPc7832vManRsCgkgO5XoMVKe6deIHC9zsmLPWihxrA/edit?usp=sharing">PS超基础课件</a></li>
                                 <li><a href="<?php echo site_url('setting') ?>">系统设置</a></li>
                             </ul>
                         </li>