diff --git a/application/controllers/information.php b/application/controllers/information.php
index c5d496fc..17a2c40b 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -3666,11 +3666,31 @@ class Information extends CI_Controller
     }
 
 
+     //火车票详细页搜索框添加 -- zp
+     $meta_ct_page_trainform = get_meta($information->ic_id, 'meta_ct_page_trainform'); //是否插入火车票搜索框
+     $template_TrainDetailSearch = "";
+     if ($meta_ct_page_trainform == "yes" || $information->is_parent_id == "278014609") {
+       $meta_train_city = get_meta($information->ic_id, 'meta_train_city'); //默认的出发及目的地城市 ， beijing|shanghai
+       $data_TrainCity = array();
+       $data_TrainCity["from"] = "";
+       $data_TrainCity["to"] = "";
+       if (!empty($meta_train_city)) {
+         if (strpos($meta_train_city, '|') !== false) {
+           $arrTrainCity = explode('|', $meta_train_city);
+           $data_TrainCity["from"] = $arrTrainCity[0];
+           $data_TrainCity["to"] = $arrTrainCity[1];
+ 
+         }
+       }
+       $template_TrainDetailSearch = $this->load->view($template_path . '-train-index', $data_TrainCity, true);
+     }
+
+
     /*  详细内容  */
     $ic_content = $information->ic_content;
 
     /** 替换H1加面包屑,加作者 */
-    $ic_content = preg_replace('/<h1>(.*)<\/h1>/i', $crumb . "\r\n" . '<H1>$1</H1>' . "\r\n" . $str_author . "\r\n", $ic_content, 1);
+    $ic_content = preg_replace('/<h1>(.*)<\/h1>/i', $crumb . "\r\n" . '<H1>$1</H1>' . "\r\n" . $str_author . $template_TrainDetailSearch  . "\r\n", $ic_content, 1);
 
     //图片加延迟
     $ic_content = $this->html_optimize_lib->set_lazy_loader($ic_content, 'https://www.trainspread.com/images/grey.gif');
@@ -4029,7 +4049,7 @@ class Information extends CI_Controller
 
 
           //附加选项
-          $t_Type = get_meta($information->ic_id, "meta_trippest_type");
+          $t_Type = get_meta($information->ic_id, "meta_trippest_type"); //产品类型
           if ($t_Type) {
               $InfoData->t_Type = $t_Type;
           } else {
@@ -4043,6 +4063,21 @@ class Information extends CI_Controller
           $InfoData->t_excludemonth = $t_excludemonth;
           $InfoData->t_hoteladdress = get_meta($information->ic_id, "meta_trippest_hoteladdress");
           $InfoData->t_defaultDate = get_meta($information->ic_id, "meta_trippest_defaultDate");
+
+          $t_Cancellation = get_meta($information->ic_id, "meta_trainspread_Cancellation"); //取消条款类型
+          if ($t_Cancellation) { 
+            $InfoData->t_Cancellation = $t_Cancellation;
+          }else{
+            $InfoData->t_Cancellation = "";
+          }
+          $t_CustomCancel = get_meta($information->ic_id, "meta_trainspread_CustomCancel");
+          if ($t_CustomCancel){
+            $InfoData->t_CustomCancelText = $t_CustomCancel;
+          }else{
+            $InfoData->t_CustomCancelText = "";
+          }
+         
+
           $DayTripData["InfoData"] = $InfoData;  //传递信息平台数据
 
           $linktour = get_meta($information->ic_id, 'meta_trainspread_linktour'); //关联线路
diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index a7454202..54962945 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -2245,7 +2245,7 @@ $meta_subnavi_arr = array(
                     onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_trippest_limitperson', $('#meta_trippest_limitperson').val())"><i
                       class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
                   <a href="javascript:void(0);" title="产品预订需要的最少人数"><i
-                      class="text-muted glyphicon glyphicon-question-sign"></i></a>
+                      class="text-muted glyphicon glyphicon-question-sign"></i></a></label>
                   <select name="meta_trippest_limitperson" id="meta_trippest_limitperson" class="form-control">
                     <option value="0" <?php echo get_meta($information->ic_id, 'meta_trippest_limitperson') === '0' ? 'selected' : false; ?>>
                       0
@@ -2310,7 +2310,7 @@ $meta_subnavi_arr = array(
                     onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_trippest_starrating', $('#meta_trippest_starrating').val())"><i
                       class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
                   <a href="javascript:void(0);" title="TP产品星级评分数，可以为小数"><i
-                      class="text-muted glyphicon glyphicon-question-sign"></i></a>
+                      class="text-muted glyphicon glyphicon-question-sign"></i></a></label>
                   <input type="text" name="meta_trippest_starrating" class="form-control"
                     value="<?php echo get_meta($information->ic_id, 'meta_trippest_starrating'); ?>"
                     id="meta_trippest_starrating" />
@@ -2343,7 +2343,7 @@ $meta_subnavi_arr = array(
                     onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_trippest_defaultDate', $('#meta_trippest_defaultDate').val())"><i
                       class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
                   <a href="javascript:void(0);" title="有些产品开放日期固定，比如水灯节，可设置默认选择.如：2025/11/24"><i
-                      class="text-muted glyphicon glyphicon-question-sign"></i></a>
+                      class="text-muted glyphicon glyphicon-question-sign"></i></a></label>
                   <input type="text" name="meta_trippest_defaultDate" class="form-control"
                     value="<?php echo get_meta($information->ic_id, 'meta_trippest_defaultDate'); ?>"
                     id="meta_trippest_defaultDate" />
@@ -2400,6 +2400,55 @@ $meta_subnavi_arr = array(
                     id="meta_trainspread_option2" />
                 </div>
               </div>
+              <div class="row">
+                <div class="col-sm-6">
+                  <label>TS取消条款类型
+                    <a href="javascript:void(0);"
+                      onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_trainspread_Cancellation, $('#meta_trainspread_Cancellation').val())"><i
+                        class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-remove"></i></a>
+                    <a href="javascript:void(0);"
+                      onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_trainspread_Cancellation', $('#meta_trainspread_Cancellation').val())"><i
+                        class="text-muted glyphicon glyphtext-muted glyphicon glyphicon-hdd"></i></a>
+                    <a href="javascript:void(0);" title="TS取消条款选择类型，如果没选默认通用"><i
+                        class="text-muted glyphicon glyphicon-question-sign"></i></a></label>
+                    <select name="meta_trainspread_Cancellation" id="meta_trainspread_Cancellation" class="form-control">
+                      <option value="" <?php echo get_meta($information->ic_id, 'meta_trainspread_Cancellation') === '' ? 'selected' : false; ?>>
+                      通用模板
+                      </option>
+                      <option value="24小时" <?php echo get_meta($information->ic_id, 'meta_trainspread_Cancellation') === '24小时' ? 'selected' : false; ?>>
+                      24小时
+                      </option>
+                      <option value="48小时" <?php echo get_meta($information->ic_id, 'meta_trainspread_Cancellation') === '48小时' ? 'selected' : false; ?>>
+                      48小时
+                      </option>
+                      <option value="72小时" <?php echo get_meta($information->ic_id, 'meta_trainspread_Cancellation') === '72小时' ? 'selected' : false; ?>>
+                      72小时
+                      </option>
+                      <option value="30天" <?php echo get_meta($information->ic_id, 'meta_trainspread_Cancellation') === '30天' ? 'selected' : false; ?>>
+                      30天
+                      </option>
+                      <option value="不可取消" <?php echo get_meta($information->ic_id, 'meta_trainspread_Cancellation') === '不可取消' ? 'selected' : false; ?>>
+                      不可取消
+                      </option>
+                  </select>
+                </div>
+                <div class="col-sm-8">
+                  <label>TS自定义取消条款
+                    <a href="javascript:void(0);"
+                      onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'meta_trainspread_CustomCancel', $('#meta_trainspread_CustomCancel').val())"><i
+                        class="text-muted glyphicon glyphicon-remove"></i></a>
+                    <a href="javascript:void(0);"
+                      onclick="meta('save', '<?php echo $information->ic_id; ?>', 'meta_trainspread_CustomCancel', $('#meta_trainspread_CustomCancel').val())"><i
+                        class="text-muted glyphicon glyphicon-hdd"></i></a>
+                    <a href="javascript:void(0);"
+                      title="自定义取消条款，应对特殊的产品，如果录入了这个信息，前面选择的条款类型无效，显示这个。"><i
+                        class="text-muted glyphicon glyphicon-question-sign"></i></a>
+                  </label>
+                  <input type="text" name="meta_trainspread_CustomCancel" class="form-control"
+                    value="<?php echo get_meta($information->ic_id, 'meta_trainspread_CustomCancel'); ?>"
+                    id="meta_trainspread_CustomCancel" />
+                </div>
+              </div>
             <?php }?>
 
             <!-- 自定义选项 -->
diff --git a/application/views/mobile_first/trainspread-daydetail-form.php b/application/views/mobile_first/trainspread-daydetail-form.php
index 67e3aef6..14ce8d80 100644
--- a/application/views/mobile_first/trainspread-daydetail-form.php
+++ b/application/views/mobile_first/trainspread-daydetail-form.php
@@ -285,7 +285,7 @@
             <div class="grade-btn">
                 <a href="javascript:;" class="btn btn-red block js_select" role="button">Book now</a>
                 <input type="hidden" class="js_PAG_Code" value="<?php echo $Item->productdetail->PAG_Code ?>" />
-                <?php 
+                <?php  //传递参数
                     $selectItemData = new stdClass();
                     $selectItemData->PAG_SN = $Item->productdetail->PAG_SN;
                     $selectItemData->PAG_Code = $Item->productdetail->PAG_Code;
@@ -296,6 +296,9 @@
                     $selectItemData->t_Type = $InfoData->t_Type;
                     $selectItemData->t_hoteladdress = $InfoData->t_hoteladdress; //是否需要酒店
                     $selectItemData->PAG_Name = $TITLE;    //大标题
+                    $selectItemData->t_CustomCancel = $InfoData->t_CustomCancelText;
+                    $selectItemData->t_Cancellation = $InfoData->t_Cancellation;
+                    
                 ?>
                 <input type="hidden" class="js_selectItemData" value="<?php echo htmlspecialchars(json_encode($selectItemData)) ?>" />   
                 <input type="hidden" class="js_totalPrice" value="0" />       
diff --git a/application/views/mobile_first/trainspread-train-index.php b/application/views/mobile_first/trainspread-train-index.php
index 7e708781..4fc6c687 100644
--- a/application/views/mobile_first/trainspread-train-index.php
+++ b/application/views/mobile_first/trainspread-train-index.php
@@ -18,12 +18,12 @@
           <div class="flex-row">
             <div class="flex-col-3">
               <input name="Txt_FZ_1" id="Txt_FZ_1" type="text" class="inputBox form-control" autocomplete="off"
-                placeholder="From">
+                placeholder="From" value="<?php echo isset($from)?$from:"" ?>">
               <input default="" id="Code_Txt_FZ_1" name="Code_Txt_FZ_1" type="hidden" value="" />
             </div>
             <div class="flex-col-3">
               <input name="Txt_DZ_1" id="Txt_DZ_1" type="text" class="inputBox form-control" autocomplete="off"
-                placeholder="To">
+                placeholder="To" value="<?php echo isset($to)?$to:"" ?>">
               <input default="" id="Code_Txt_DZ_1" name="Code_Txt_DZ_1" type="hidden" value="" />
             </div>
             <div class="flex-col-3">
@@ -86,7 +86,7 @@
 
   </div>
 </div>
-  <link href="http://202.103.68.104:71/css/flatpickr.css" rel="stylesheet" type="text/css" />
-  <link href="http://202.103.68.104:71/js/mobile-first/train/train-search.css" rel="stylesheet" type="text/css" />
+  <link href="https://www.trainspread.com/css/flatpickr.css" rel="stylesheet" type="text/css" />
+  <link href="https://www.trainspread.com/js/mobile-first/train/train-search.css" rel="stylesheet" type="text/css" />
   <script defer type="text/javascript" src="https://data.chinahighlights.com/js/train/StationInfo.js"></script>
-  <script src="http://202.103.68.104:71/js/mobile-first/train/train.js" ></script>
\ No newline at end of file
+  <script src="https://www.trainspread.com/js/mobile-first/train/train.js" ></script>
\ No newline at end of file
diff --git a/application/views/mobile_first/trainspread.php b/application/views/mobile_first/trainspread.php
index 6b15aca1..76c306c4 100644
--- a/application/views/mobile_first/trainspread.php
+++ b/application/views/mobile_first/trainspread.php
@@ -35,7 +35,7 @@
     <!--header-->
     <header class="headerbar flex justify-start items-center top-0 left-0 right-0 pl2 pr4 pt2 md-pt0" id="header">
         <div role="button" tabindex="0" class="mobile-top">
-            <a href="/" class="toplogo"><img src="https://data.trainspread.com/css/images/logo.png" alt="trainspread logo" width="200" height="37" class="img-responsive"></a>
+            <a href="/" class="toplogo"><img src="https://data.trainspread.com/css/images/logo.png" alt="trainspread logo" width="180" height="37" class="img-responsive"></a>
             <div class="topnavitailor">
                 <a href="javascript:;" class="mobile-ser search--open" aria-label="SearchOpen"><i class="fa fa-search" aria-hidden="true"></i></a>
                 <a href="#modal-cell"><em class="fa fa-phone"></em></a>