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

mm

application/third_party/ctrip/controllers/ctrip_train.php

@@ -244,5 +244,20 @@ class ctrip_train extends CI_Controller{
 		}
 	}
 	
-	
+	//获取回调信息
+	public function receiveinfo(){
+		echo '<?xml version="1.0"?>
+				<OrderProcessRequest xsi="http://www.w3.org/2001/XMLSchema-instance">
+				  <TrainOrderService>
+					<OrderInfo>
+					  <OrderNumber>hainatravel123</OrderNumber>
+					</OrderInfo>
+				  </TrainOrderService>
+				</OrderProcessRequest>
+			';
+		$back_xml = file_get_contents('php://input');
+		$xml = simplexml_load_string($back_xml);
+		$json = json_encode($xml);
+		log_message('error','携程回调信息：'.$json);
+	}
 }   

application/third_party/htmlcompressor/views/amp-template/ah.php

@@ -96,7 +96,6 @@
 <!-- End Sidebar --> 
 <!-- End Navbar -->
 <div class="headerbottom" id="top-page"></div>
-<amp-addthis width="320" height="40" layout="responsive" data-pub-id="ra-598408c3e2fb90c3" data-widget-id="lgbo"></amp-addthis>
 <!--@CUSTOM-CONENT@-->
 
 <footer class="commerce-footer center">
@@ -105,7 +104,7 @@
   <div class="copyright">Copyright © 2018 Asia Highlights</div> 
   </nav>
 </footer>
-<div class="fixed-addthis"><amp-addthis width="320" height="40" layout="responsive" data-pub-id="ra-598408c3e2fb90c3" data-widget-id="lgbo"></amp-addthis></div>
+<div class="fixed-addthis"><amp-addthis width="320" height="40" layout="responsive" data-pub-id="ra-598408c3e2fb90c3" data-widget-id="o2ei"></amp-addthis></div>
 <amp-animation id="showAnim"layout="nodisplay"><script type="application/json">{"duration":"200ms","fill":"both","iterations":"1","direction":"alternate","animations":[{"selector":"#scrollToTopButton","keyframes":[{"opacity":"1","visibility":"visible"}]}]}</script></amp-animation><amp-animation id="hideAnim"layout="nodisplay"><script type="application/json">{"duration":"200ms","fill":"both","iterations":"1","direction":"alternate","animations":[{"selector":"#scrollToTopButton","keyframes":[{"opacity":"0","visibility":"hidden"}]}]}</script></amp-animation><div id="marker"><amp-position-observer on="enter:hideAnim.start; exit:showAnim.start"layout="nodisplay"></amp-position-observer></div><a id="scrollToTopButton"on="tap:top-page.scrollTo(duration=200)"class="scrollToTop"></a>
 @AMP-GOOGLE-ANALYTICS@
 <!--AMP Builder-->