From c56e08716f9705a4ec763e5e59b9598d07403789 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Sun, 25 Jun 2023 10:12:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E9=9B=86=E5=90=88?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=8D=E9=A6=88=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 74 ++++++++++++++++++++++++-
 1 file changed, 72 insertions(+), 2 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index ada1596e..f45d277b 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -656,6 +656,28 @@ class Information extends CI_Controller
             }
         }
 
+        // 动态加载反馈标签，每个城市三十条反馈。
+        // HTLM: <div><!--@FEEDBACK-30_Bangkok@--></div>
+        // 解析结果：<!--@FEEDBACK-30_Bangkok@-->; Bangkok
+        $feedback30_array = [];
+        preg_match_all('^<!--@FEEDBACK-30_(.*)@-->^', $information->ic_content, $feedback30_array);
+        if (!empty($feedback30_array)) {
+          foreach ($feedback30_array[0] as $index => $tag_name) {
+            $city_name = $feedback30_array[1][$index];
+            $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name);
+            $feedback_30_content = $this->load->view(
+              'mobile_first/ch-feedback-30-list',
+              array('feedback_list' => $feedback_list),
+              true
+            );
+            $information->ic_content = str_replace(
+                $tag_name,
+                $feedback_30_content,
+                $information->ic_content
+            );
+          }
+        }
+
         $feedback_newest = $this->Feedback_model->get_feedback_newest();
         $feedback_newest_content = $this->load->view(
             $template_path . '-feedback-newest',
@@ -1397,6 +1419,28 @@ class Information extends CI_Controller
           $information->ic_content = str_replace('<!--@TOUR-FORM-TAG@-->', $tour_form_content, $information->ic_content);
         }
 
+        // 动态加载反馈标签，每个城市三十条反馈。
+        // HTLM: <div><!--@FEEDBACK-30_Bangkok@--></div>
+        // 解析结果：<!--@FEEDBACK-30_Bangkok@-->; Bangkok
+        $feedback30_array = [];
+        preg_match_all('^<!--@FEEDBACK-30_(.*)@-->^', $information->ic_content, $feedback30_array);
+        if (!empty($feedback30_array)) {
+          foreach ($feedback30_array[0] as $index => $tag_name) {
+            $city_name = $feedback30_array[1][$index];
+            $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name);
+            $feedback_30_content = $this->load->view(
+              'mobile_first/gh-feedback-30-list',
+              array('feedback_list' => $feedback_list),
+              true
+            );
+            $information->ic_content = str_replace(
+                $tag_name,
+                $feedback_30_content,
+                $information->ic_content
+            );
+          }
+        }
+
         $feedback_newest = $this->Feedback_model->get_feedback_newest();
         $feedback_newest_content = $this->load->view(
             $template_path . '-feedback-newest',
@@ -1729,14 +1773,40 @@ class Information extends CI_Controller
           foreach ($feedback30_array[0] as $index => $tag_name) {
             $city_name = $feedback30_array[1][$index];
             $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name);
-            $feedback_content = $this->load->view(
+            $feedback_30_content = $this->load->view(
               'mobile_first/ah-feedback-30-list',
               array('feedback_list' => $feedback_list),
               true
             );
             $information->ic_content = str_replace(
                 $tag_name,
-                $feedback_content,
+                $feedback_30_content,
+                $information->ic_content
+            );
+          }
+        }
+
+        // 集合页面反馈标签        
+        $feedback_city_array = [];
+        preg_match_all('^<!--@FEEDBACK-CITY-LIST_(.*)@-->^', $information->ic_content, $feedback_city_array);
+        if (!empty($feedback_city_array)) {
+          foreach ($feedback_city_array[0] as $index => $tag_name) {
+            $city_name_string = $feedback_city_array[1][$index];
+            $city_name_list = explode(',', $city_name_string);
+            $feedback_city_list = [];
+            foreach ($city_name_list as $index => $city_name) {
+              $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name, 5);
+              $feedback_city_list[$city_name] = $feedback_list;
+            }
+            
+            $feedback_city_content = $this->load->view(
+              'mobile_first/ah-feedback-city-list',
+              $feedback_city_list,
+              true
+            );
+            $information->ic_content = str_replace(
+                $tag_name,
+                $feedback_city_content,
                 $information->ic_content
             );
           }

From 5a79a923edd9e4e1bccbf4f4cdd7f1e5ec58e6a3 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Sun, 25 Jun 2023 10:45:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile_first/ah-feedback-city-list.php    | 105 +++++++++++-------
 1 file changed, 63 insertions(+), 42 deletions(-)

diff --git a/application/views/mobile_first/ah-feedback-city-list.php b/application/views/mobile_first/ah-feedback-city-list.php
index 7db0ef9f..cbd8bae9 100644
--- a/application/views/mobile_first/ah-feedback-city-list.php
+++ b/application/views/mobile_first/ah-feedback-city-list.php
@@ -1,22 +1,4 @@
 
-                <h2 style="margin-top: 0;">98.8% positive customer reviews among 10,000+</h2>   
-                <div class="listtour">
-                                <div style="margin: 0 10px;"> <img alt="" class="img-responsive" height="69"
-                                        src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png"
-                                        width="175">
-                                    <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png"
-                                        class="img-responsive" style="margin: 5px auto;">
-                                    </div>
-                                    <div style="margin: 0 10px;">
-                                    <img alt="Tour Review" class="img-responsive" height="278"
-                                        src="https://data.asiahighlights.com/image/about/logo-black.png" width="175px">
-                                    <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png"
-                                        width="175px" class="img-responsive">
-                                </div>           
-                            </div>
-                <!--反馈集合页 每个目的地展示5条反馈，共7个目的地：
-                    泰国，越南，柬埔寨，日本，印度，缅甸,中国
-                    每条反馈包括：标题，正文，客人名字，反馈时间，反馈链接-->
                     <!-- Bangkok -->
                     <?php if (!empty($Bangkok)) {?>
                     <?php foreach ($Bangkok as $index => $feedback) {?>
@@ -26,9 +8,11 @@
                       <a href="<?php echo $feedback['url'] ?>" target="_blank">More</a>
                       <div class="customer_name"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                     </div>
+                    <?php }?> <div class="more_tours"><a href="/reviews/thailand">More Thailand reviews</a></div>
                     <?php }?>
-                    <?php }?>
-                    <!-- Hanoi -->
+                   
+
+                    <!-- Vietnam -->
                     <?php if (!empty($Hanoi)) {?>
                     <?php foreach ($Hanoi as $index => $feedback) {?>
                     <div class="feedback_content">
@@ -37,34 +21,71 @@
                       <a href="<?php echo $feedback['url'] ?>" target="_blank">More</a>
                       <div class="customer_name"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                     </div>
+                    <?php }?><div class="more_tours"><a href="/reviews/vietnam">More Vietnam reviews</a></div>
                     <?php }?>
-                    <?php }?>
-                    <!-- Yangon -->
-                    <?php if (!empty($Yangon)) {?>
-                    <?php foreach ($Yangon as $index => $feedback) {?>
+                    
+
+                    <!-- Cambodia -->
+                    <?php if (!empty($Siem Reap)) {?>
+                      <?php foreach ($Siem Reap as $index => $feedback) {?>
+                      <div class="feedback_content">
+                        <strong><?php echo $feedback['title'] ?></strong>
+                        <p><?php echo $feedback['content'] ?></p>
+                        <a href="<?php echo $feedback['url'] ?>" target="_blank">More</a>
+                        <div class="customer_name"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
+                      </div>
+                      <?php }?><div class="more_tours"><a href="/reviews/cambodia">More Cambodia reviews</a></div>
+                      <?php }?>
+                        
+
+                    <!-- Japan -->
+                    <?php if (!empty($Tokyo)) {?>
+                    <?php foreach ($Tokyo as $index => $feedback) {?>
                     <div class="feedback_content">
                       <strong><?php echo $feedback['title'] ?></strong>
                       <p><?php echo $feedback['content'] ?></p>
                       <a href="<?php echo $feedback['url'] ?>" target="_blank">More</a>
                       <div class="customer_name"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                     </div>
+                    <?php }?><div class="more_tours"><a href="/reviews/japan">More Japan reviews</a></div>
                     <?php }?>
-                    <?php }?>
-                              
-                              <div class="more_tours"><a href="/thailand/tours/">More Thailand reviews</a></div>
+                      
+                      
+                      <!-- India -->
+                    <?php if (!empty($Delhi)) {?>
+                      <?php foreach ($Delhi as $index => $feedback) {?>
+                      <div class="feedback_content">
+                        <strong><?php echo $feedback['title'] ?></strong>
+                        <p><?php echo $feedback['content'] ?></p>
+                        <a href="<?php echo $feedback['url'] ?>" target="_blank">More</a>
+                        <div class="customer_name"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
+                      </div>
+                      <?php }?><div class="more_tours"><a href="/reviews/india">More India reviews</a></div> 
+                      <?php }?>
+                         
+                        
+                        <!-- Myanmar -->
+                    <?php if (!empty($Yangon)) {?>
+                      <?php foreach ($Yangon as $index => $feedback) {?>
+                      <div class="feedback_content">
+                        <strong><?php echo $feedback['title'] ?></strong>
+                        <p><?php echo $feedback['content'] ?></p>
+                        <a href="<?php echo $feedback['url'] ?>" target="_blank">More</a>
+                        <div class="customer_name"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
+                      </div>
+                      <?php }?><div class="more_tours"><a href="/reviews/myanmar">More Myanmar reviews</a></div>
+                      <?php }?>
+                        
 
-                              <div class="skipBox">
-                                <div class="headerText">Asia Highlights Reviews</div>
-                                
-                                <div class="skipAhead">
-                                <ul>
-                                    <li><a href="#thailand">Thailand reviews</a></li>
-                                    <li><a href="#where">Vietnam reviews</a></li>
-                                    <li><a href="#itinerary">Cambodia reviews</a></li>
-                                    <li><a href="#avoid">Japan reviews</a></li>
-                                    <li><a href="#budget">India reviews</a></li>
-                                    <li><a href="#budget">Myanmar reviews</a></li>
-                                </ul>
-                                </div>
-                                </div>
-                           
\ No newline at end of file
+                        <!-- China -->
+                    <?php if (!empty($Beijing)) {?>
+                      <?php foreach ($Beijing as $index => $feedback) {?>
+                      <div class="feedback_content">
+                        <strong><?php echo $feedback['title'] ?></strong>
+                        <p><?php echo $feedback['content'] ?></p>
+                        <a href="<?php echo $feedback['url'] ?>" target="_blank">More</a>
+                        <div class="customer_name"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
+                      </div>
+                      <?php }?>  <div class="more_tours"><a href="/reviews/china">More China reviews</a></div>
+                      <?php }?>
+                      
\ No newline at end of file