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

8 months ago · c0b18e454c
parent 9868073381 2553b98ea0
commit c0b18e454c
9 changed files with 20 additions and 21 deletions
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@ -4308,8 +4308,8 @@ class Information extends CI_Controller {
  public function make_www_cache_ts($information) {
    $data = [];

-                                              #region 公用数据
-                                              //$apiurl = "http://202.103.68.104:61/info.php"; //本地测试
+    #region 公用数据
+    //$apiurl = "http://202.103.68.104:61/info.php"; //本地测试
    $apiurl = "https://ct.mycht.cn/info.php"; //网前

    //先准备数据，采用直接赋值视图然后返回视图字符串的模式，不使用一次次替换视图模板内容的模式。
@ -4511,7 +4511,7 @@ class Information extends CI_Controller {
      if (! empty($meta_ct_page_value)) {
        $productCode = $meta_ct_page_value;
      }
-      $addonJs .= '<script src="' . $apiweb . '/js/mobile-first/daytripdetail.js" defer></script>';
+      $addonJs .= '<script src="' . $apiweb . '/js/mobile-first/daytripdetail.js?v='. time().'"  defer></script>';
      // $addonJs .= '<script src="'.$apiweb.'/js/mobile-first/flatpickr.js"></script>';
      $data["ADDONCSS"] .= '<link href="' . $apiweb . '/css/flatpickr.css" rel="preload" as="style" onload="this.rel=\'stylesheet\'" />';

--- a/application/third_party/order/views/confirm_order.php
+++ b/application/third_party/order/views/confirm_order.php
@ -1064,7 +1064,7 @@ select.gender_pick {border: 1px solid #d1d1d1;

 <!-- 🔜上传护照图片 -->
 				<div id="inquiryBox">
-					<h2>Please upload your passport photo (ID page)</h2>
+					<h2>Please upload a photocopy of your passport (ID page)</h2>

          <div class="upload-section">
            <input type="file" id="fileInput" accept="image/*" multiple>
--- a/application/third_party/trainsystem/controllers/innerTrainSearch.php
+++ b/application/third_party/trainsystem/controllers/innerTrainSearch.php
@ -1210,7 +1210,7 @@ class innerTrainSearch extends CI_Controller{
 						$return_data->result[$i]->SeatList[$j]->SeatPrice = $this->currency->GetSiteMoney($value);
 						$return_data->result[$i]->SeatList[$j]->SeatPriceRMB = $value;
 						if($fromStation == 'LSO' || $toStation == 'LSO'){
-							$return_data->result[$i]->SeatList[$j]->ServiceCharge = 33;
+							$return_data->result[$i]->SeatList[$j]->ServiceCharge = 65;
 						}else{
 							$return_data->result[$i]->SeatList[$j]->ServiceCharge = 6;
 						}
--- a/application/views/mobile_first/beijing.php
+++ b/application/views/mobile_first/beijing.php
@ -76,12 +76,11 @@
        <input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search" name="q">
        <button type="submit" class="submits" name="searchbtn" aria-label="Search"><i class="fa fa-search" aria-hidden="true"></i></button>
      </form>
-     <ul class="circle-ul font20 m-top30">
-    <li><a href="/beijing-attractions/beijing-hutong/">Beijing Hutong</a></li>
-    <li><a href="/beijing-attractions/the-great-wall/">Great Wall of China</a></li>
-    <li><a href="/travel-guide/">Beijing Travel Guide</a></li>
-    <li><a href="/day-trips/mutianyu-great-wall-tour">Mutianyu Great Wall Tour</a></li>
-    </ul>
+      <ul class="circle-ul font20 m-top30">
+        <li><a href="/travelguide/beijing-weather">Beijing Weather</a></li>
+        <li><a href="/day-trips/mutianyu-great-wall-tour">Mutianyu Great Wall Tour</a></li>
+        <li><a href="/travelguide/great-wall-of-china">Great Wall of China</a></li>
+      </ul>
    </div>
  </div>
 </nav>
--- a/application/views/mobile_first/gh-feedback-30-list.php
+++ b/application/views/mobile_first/gh-feedback-30-list.php
@ -7,7 +7,7 @@
              <?php foreach ($feedback_list as $index => $feedback) {?>
                <div class="feedback_content">
                <strong><?php echo $feedback['title'] ?></strong>
-                <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/8bebcc898ce54b64a46ced58580966d4_cut_104x19_241.jpg'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
+                <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.chinahighlights.com/allpicture/2024/12/c81b67573a2d40d6922e95b33aeaf03d_cut_80x14_241_1733323252.png'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
                <p><?php echo $feedback['content'] ?></p>
                <a href="<?php echo $feedback['url'] ?>" target="_blank" rel="nofollow">More</a>
                <div class="customer_name"><?php echo $feedback['customer'] ?>, <?php echo $feedback['createdOn'] ?></div>
--- a/application/views/mobile_first/gh-feedback-advisor-list.php
+++ b/application/views/mobile_first/gh-feedback-advisor-list.php
@ -16,7 +16,7 @@
              <strong>
                <?php echo $feedback['title'] ?>
              </strong>
-              <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/8bebcc898ce54b64a46ced58580966d4_cut_104x19_241.jpg'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
+              <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.chinahighlights.com/allpicture/2024/12/c81b67573a2d40d6922e95b33aeaf03d_cut_80x14_241_1733323252.png'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
              <p>
                <?php echo $feedback['content'] ?>
              </p>
--- a/application/views/mobile_first/gh-feedback-city-list.php
+++ b/application/views/mobile_first/gh-feedback-city-list.php
@ -5,7 +5,7 @@
                    <?php foreach ($Bangkok as $index => $feedback) {?>
                    <div class="feedback_content">
                      <strong><?php echo $feedback['title'] ?></strong>
-                      <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/8bebcc898ce54b64a46ced58580966d4_cut_104x19_241.jpg'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
+                      <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.chinahighlights.com/allpicture/2024/12/c81b67573a2d40d6922e95b33aeaf03d_cut_80x14_241_1733323252.png'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
                      <p><?php echo $feedback['content'] ?></p>
                      <a href="<?php echo $feedback['url'] ?>" target="_blank" rel="nofollow">More</a>
                      <div class="customer_name"><?php echo $feedback['customer'] ?>, <?php echo $feedback['createdOn'] ?></div>
@ -19,7 +19,7 @@
                    <?php foreach ($Hanoi as $index => $feedback) {?>
                    <div class="feedback_content">
                      <strong><?php echo $feedback['title'] ?></strong>
-                      <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/8bebcc898ce54b64a46ced58580966d4_cut_104x19_241.jpg'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
+                      <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.chinahighlights.com/allpicture/2024/12/c81b67573a2d40d6922e95b33aeaf03d_cut_80x14_241_1733323252.png'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
                      <p><?php echo $feedback['content'] ?></p>
                      <a href="<?php echo $feedback['url'] ?>" target="_blank" rel="nofollow">More</a>
                      <div class="customer_name"><?php echo $feedback['customer'] ?>, <?php echo $feedback['createdOn'] ?></div>
@ -34,7 +34,7 @@
                      <?php foreach ($Siem_Reap as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?php echo $feedback['title'] ?></strong>
-                        <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/8bebcc898ce54b64a46ced58580966d4_cut_104x19_241.jpg'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
+                        <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.chinahighlights.com/allpicture/2024/12/c81b67573a2d40d6922e95b33aeaf03d_cut_80x14_241_1733323252.png'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
                        <p><?php echo $feedback['content'] ?></p>
                        <a href="<?php echo $feedback['url'] ?>" target="_blank" rel="nofollow">More</a>
                        <div class="customer_name"><?php echo $feedback['customer'] ?>, <?php echo $feedback['createdOn'] ?></div>
@ -49,7 +49,7 @@
                    <?php foreach ($Tokyo as $index => $feedback) {?>
                    <div class="feedback_content">
                      <strong><?php echo $feedback['title'] ?></strong>
-                      <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/8bebcc898ce54b64a46ced58580966d4_cut_104x19_241.jpg'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
+                      <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.chinahighlights.com/allpicture/2024/12/c81b67573a2d40d6922e95b33aeaf03d_cut_80x14_241_1733323252.png'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
                      <p><?php echo $feedback['content'] ?></p>
                      <a href="<?php echo $feedback['url'] ?>" target="_blank" rel="nofollow">More</a>
                      <div class="customer_name"><?php echo $feedback['customer'] ?>, <?php echo $feedback['createdOn'] ?></div>
@ -65,7 +65,7 @@
                      <?php foreach ($Yangon as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?php echo $feedback['title'] ?></strong>
-                        <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/8bebcc898ce54b64a46ced58580966d4_cut_104x19_241.jpg'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
+                        <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.chinahighlights.com/allpicture/2024/12/c81b67573a2d40d6922e95b33aeaf03d_cut_80x14_241_1733323252.png'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
                        <p><?php echo $feedback['content'] ?></p>
                        <a href="<?php echo $feedback['url'] ?>" target="_blank" rel="nofollow">More</a>
                        <div class="customer_name"><?php echo $feedback['customer'] ?>, <?php echo $feedback['createdOn'] ?></div>
@ -80,7 +80,7 @@
                      <?php foreach ($Beijing as $index => $feedback) {?>
                      <div class="feedback_content">
                        <strong><?php echo $feedback['title'] ?></strong>
-                        <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/8bebcc898ce54b64a46ced58580966d4_cut_104x19_241.jpg'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
+                        <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.chinahighlights.com/allpicture/2024/12/c81b67573a2d40d6922e95b33aeaf03d_cut_80x14_241_1733323252.png'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
                        <p><?php echo $feedback['content'] ?></p>
                        <a href="<?php echo $feedback['url'] ?>" target="_blank" rel="nofollow">More</a>
                        <div class="customer_name"><?php echo $feedback['customer'] ?>, <?php echo $feedback['createdOn'] ?></div>
--- a/application/views/mobile_first/gh-feedback-list.php
+++ b/application/views/mobile_first/gh-feedback-list.php
@ -17,7 +17,7 @@
              <strong>
                <?php echo $feedback['title'] ?>
              </strong>
-              <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/8bebcc898ce54b64a46ced58580966d4_cut_104x19_241.jpg'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
+              <img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://images.asiahighlights.com/allpicture/2024/04/eba8a46e43514b55bb4e1dd15d9b5712_cut_211x40_241.jpg'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.chinahighlights.com/allpicture/2024/12/c81b67573a2d40d6922e95b33aeaf03d_cut_80x14_241_1733323252.png'; }  ?>" style="height: 17px;  width: auto;filter: brightness(170%);" alt="Tour Review">
              <p>
                <?php echo $feedback['content'] ?>
              </p>
--- a/application/views/mobile_first/gh-feedback-newest.php
+++ b/application/views/mobile_first/gh-feedback-newest.php
@ -19,7 +19,7 @@
              <strong>
                <?php echo $feedback['title'] ?>
              </strong>
-              <p class="feedback_rating"><img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://data.asiahighlights.com/pic/trustpilot-new-icon.png'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://data.chinahighlights.com/image/aboutus/feedback/five-star.png'; }  ?>" alt="Tour Review" style="filter: brightness(170%);"></p>
+              <p class="feedback_rating"><img src="<?php if (strpos($feedback['url'], 'trustpilot.com') == true) { echo 'https://data.asiahighlights.com/pic/trustpilot-new-icon.png'; } else if (strpos($feedback['url'], 'tripadvisor.com') == true) { echo 'https://images.chinahighlights.com/allpicture/2024/12/c81b67573a2d40d6922e95b33aeaf03d_cut_80x14_241_1733323252.png'; }  ?>" alt="Tour Review" style="height: 17px;  width: auto;filter: brightness(170%);"></p>
              <p>
                <?php echo $feedback['content'] ?>
              </p>