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

application/third_party/trainsystem/controllers/innerTrainSearch.php

@@ -612,7 +612,7 @@ class innerTrainSearch extends CI_Controller{
 		$post_data_train->searchTrainsParam = new stdClass();
 		$post_data_train->searchTrainsParam->departDate = "2022-07-22";
 		$post_data_train->searchTrainsParam->fromStationName = "北京";
-		$post_data_train->searchTrainsParam->toStationName = "GZQ";
+		$post_data_train->searchTrainsParam->toStationName = "深圳";
 
 		echo json_encode($post_data_train);
 
@@ -753,10 +753,10 @@ class innerTrainSearch extends CI_Controller{
 
 						if(in_array($key, array('A3', 'A4', 'A5', 'A6', '3', '4', '5', '6', 'A', 'F', 'S','YDW','EDW'))){
 							if (stripos($return_data->result[$i]->TrainNo, "D") !== false || stripos($return_data->result[$i]->TrainNo, "G") !== false) {
-								$value = $value * 1.2;
+								//$value = $value * 1.2;     //直接读取接口的最高价，无需再自己定义下铺价格。 2022-7-21 zp
 								$return_data->result[$i]->SeatList[$j]->ChildDiscut = 1;
 							}else{
-								$value = $value * 1.15;
+								//$value = $value * 1.15;    //直接读取接口的最高价，无需再自己定义下铺价格。 2022-7-21 zp
 								$return_data->result[$i]->SeatList[$j]->ChildDiscut = 0.75;
 							}
 						}else{

application/views/mobile_first/ch-pc.php

@@ -174,9 +174,11 @@
             <!--@TRAIN-SEARCH@-->
             <!--@CUSTOM-CONENT@-->
 </article>
+<div class="wechat_button"><a href="/contactus/" id="wechat_button"><img src="https://data.chinahighlights.com/image/forms/china-highlights-wechat-button-all.png" class="img-responsive" alt="China Highlights' wechat"></a></div>
         </div>
         <!--@TIPS-RIGHT-TOP@-->
         <!--@TIPS-RIGHT@-->
+       
     </div>
 </div>
 <!--PC底部-->

application/views/mobile_first/ch.php

@@ -208,6 +208,7 @@
 
     <!--@ARTICLENEXT@-->
 </article>
+<div class="wechat_button"><a href="/contactus/" id="wechat_button"><img src="https://data.chinahighlights.com/image/forms/china-highlights-wechat-button-all.png" class="img-responsive" alt="China Highlights' wechat"></a></div>
 </div>
 
 <footer>