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

mm

application/third_party/order/views/confirm_order.php

@@ -7,13 +7,13 @@
         <meta name="robots" content="noindex,nofollow" />
         <title>China Highlights! Please complete and submit the information.</title>
 
-        <link href="https://www.chinahighlights.com/css/min.php?f=/image/customer_center_data/css/bootstrap.min.css,/image/customer_center_data/css/order.css,/image/customer_center_data/css/bootstrap-datetimepicker.min.css&v=20150506" rel="stylesheet">
+        <link href="https://data.chinahighlights.com/css/min.php?f=/image/customer_center_data/css/bootstrap.min.css,/image/customer_center_data/css/order.css,/image/customer_center_data/css/bootstrap-datetimepicker.min.css&v=20150506" rel="stylesheet">
         <!--[if lte IE 9]>
         <link href="https://www.chinahighlights.com/public/js/fixie/respond-proxy.html" id="respond-proxy" rel="respond-proxy" />
         <link href="https://www.chinahighlights.com/public/js/fixie/respond.proxy.gif" id="respond-redirect" rel="respond-redirect" />
         <script src="https://www.chinahighlights.com/js/min.php?f=/public/js/respond.min.js,/public/js/fixie/respond.proxy.js"></script>
         <![endif]-->
-        <script src="https://www.chinahighlights.com/js/min.php?f=/image/customer_center_data/js/jquery.min.js,/image/customer_center_data/js/bootstrap.min.js,/image/customer_center_data/js/jquery-ui.min.js,/image/customer_center_data/js/jquery-ui-timepicker-addon.js&v=20150506"></script>
+        <script src="https://data.chinahighlights.com/js/min.php?f=/image/customer_center_data/js/jquery.min.js,/image/customer_center_data/js/bootstrap.min.js,/image/customer_center_data/js/jquery-ui.min.js,/image/customer_center_data/js/jquery-ui-timepicker-addon.js&v=20150506"></script>
 		<link rel="shortcut icon" href="https://www.chinahighlights.com/favicon.ico">
 		<style type="text/css">.popover{background-color:#f2f600;}</style>
     </head>