From 5abe7a6bbb5665f3f02a85585385dbee47c0ee9d Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 19 Jun 2023 17:00:05 +0800
Subject: [PATCH 01/17] 11

---
 application/views/mobile_first/gh-feedback-newest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/views/mobile_first/gh-feedback-newest.php b/application/views/mobile_first/gh-feedback-newest.php
index 2474ecba..acda1f68 100644
--- a/application/views/mobile_first/gh-feedback-newest.php
+++ b/application/views/mobile_first/gh-feedback-newest.php
@@ -1,4 +1,5 @@
 
+<div class="list_content">
 <div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;">
   98.8% positive customer reviews among 10,000+
   <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20" ><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
@@ -42,4 +43,5 @@
       </tr>
     </tbody>
   </table>
+</div>
 </div>
\ No newline at end of file

From bb539a512b312a27175b4e9fe354596fe81ae005 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 19 Jun 2023 17:00:34 +0800
Subject: [PATCH 02/17] 11

---
 application/views/mobile_first/gh-feedback-newest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/mobile_first/gh-feedback-newest.php b/application/views/mobile_first/gh-feedback-newest.php
index acda1f68..25e71730 100644
--- a/application/views/mobile_first/gh-feedback-newest.php
+++ b/application/views/mobile_first/gh-feedback-newest.php
@@ -10,7 +10,7 @@
   <img alt="Tour Review" class="img-responsive" src="https://data.asiahighlights.com/image/about/logo-black.png"
     style="width: 180px; margin: 0 auto 10px auto">
 </p>
-<div class="table-responsive">
+<div class="table-responsive" style="margin-top: 50px;">
   <table>
     <tbody>
       <tr>

From 402eee693bb893315442885f79060cf40a658ed1 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 19 Jun 2023 17:01:20 +0800
Subject: [PATCH 03/17] 11

---
 application/views/mobile_first/gh-feedback-newest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/views/mobile_first/gh-feedback-newest.php b/application/views/mobile_first/gh-feedback-newest.php
index 25e71730..3f717ee2 100644
--- a/application/views/mobile_first/gh-feedback-newest.php
+++ b/application/views/mobile_first/gh-feedback-newest.php
@@ -7,8 +7,7 @@
     </div>
   </div>
 <p class="visible-xs" style="margin-bottom: 0; ">
-  <img alt="Tour Review" class="img-responsive" src="https://data.asiahighlights.com/image/about/logo-black.png"
-    style="width: 180px; margin: 0 auto 10px auto">
+  <img alt="Tour Review" class="img-responsive" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 180px; margin: 0 auto 10px auto">
 </p>
 <div class="table-responsive" style="margin-top: 50px;">
   <table>

From d959bb9051752d71d722f68a761c550738f7dcd0 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 19 Jun 2023 17:04:48 +0800
Subject: [PATCH 04/17] 11

---
 application/views/mobile_first/gh-feedback-newest.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/views/mobile_first/gh-feedback-newest.php b/application/views/mobile_first/gh-feedback-newest.php
index 3f717ee2..c1162fed 100644
--- a/application/views/mobile_first/gh-feedback-newest.php
+++ b/application/views/mobile_first/gh-feedback-newest.php
@@ -1,10 +1,8 @@
 
 <div class="list_content">
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;">
+<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 100px;margin-bottom: -50px;">
   98.8% positive customer reviews among 10,000+
   <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20" ><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
-  <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; " width="1133">
-    </div>
   </div>
 <p class="visible-xs" style="margin-bottom: 0; ">
   <img alt="Tour Review" class="img-responsive" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 180px; margin: 0 auto 10px auto">
@@ -15,7 +13,7 @@
       <tr>
         <td class="hidden-xs">
           <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;">
-            <div style="text-align:center;font-weight: 600;font-size:19px;font-style: italic;line-height: 20px;margin-top: 25px; margin-bottom: 15px;">98.8% positive customer reviews among 10,000+</div>
+            <div style="text-align:center;font-weight: 600;font-size:19px;font-style: italic;line-height: 20px;margin-top: 50px; margin-bottom: 15px;">98.8% positive customer reviews among 10,000+</div>
             <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
             
             </div>

From 63f442452ad148fe5973602832941ad0ea692129 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 19 Jun 2023 17:08:28 +0800
Subject: [PATCH 05/17] 11

---
 application/views/mobile_first/gh-feedback-newest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/gh-feedback-newest.php b/application/views/mobile_first/gh-feedback-newest.php
index c1162fed..75901704 100644
--- a/application/views/mobile_first/gh-feedback-newest.php
+++ b/application/views/mobile_first/gh-feedback-newest.php
@@ -1,10 +1,10 @@
 
 <div class="list_content">
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 100px;margin-bottom: -50px;">
+<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 100px;">
   98.8% positive customer reviews among 10,000+
   <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20" ><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
   </div>
-<p class="visible-xs" style="margin-bottom: 0; ">
+<p class="visible-xs" style="margin-bottom: -50px;">
   <img alt="Tour Review" class="img-responsive" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 180px; margin: 0 auto 10px auto">
 </p>
 <div class="table-responsive" style="margin-top: 50px;">

From 7e8c3c0f6e14fbf9c1e496213f1970c9451761fe Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 20 Jun 2023 10:06:42 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AF=BB=E5=8F=96?=
 =?UTF-8?q?=E6=B3=B0=E5=9B=BD30=E6=9D=A1=E5=8F=8D=E9=A6=88=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 41 +++++++++++++++++++++++++
 application/models/feedback_model.php   |  6 ++--
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 5385bd72..71039b7b 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1031,6 +1031,24 @@ class Information extends CI_Controller
       var_dump($feedback_newest);
     }
 
+    public function test_feedback30()
+    {
+      $feedback30_array = [];
+      preg_match_all('^<!--@FEEDBACK-30_(.*)@-->^', '<div><!--@FEEDBACK-30_Thailand@--></div>', $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_content = $this->load->view(
+                  $template_path . '-feedback-30-list',
+                  array('feedback_list' => $feedback_list),
+                  true
+              );
+              echo $feedback_content;
+          }
+      }
+    }
+
     public function test_price()
     {
       $price_rule = '<div style="color: red;">#ah-8,st,2#</div><div style="color: red;">#ah-8,st,2#</div>';
@@ -1675,6 +1693,29 @@ class Information extends CI_Controller
             }
         }
 
+        // 动态加载反馈标签，每个城市不足三十条反馈。
+        // HTLM: <div><!--@FEEDBACK-30_Thailand@--></div>
+        // 解析结果：<!--@FEEDBACK-30_Thailand@-->; Thailand
+        $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_string = $feedback30_array[1][$index];
+                $city_name_list = explode(',', $city_name_string);
+                $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list);
+                $feedback_content = $this->load->view(
+                    $template_path . '-feedback-30-list',
+                    array('feedback_list' => $feedback_list),
+                    true
+                );
+                $information->ic_content = str_replace(
+                    $tag_name,
+                    $feedback_content,
+                    $information->ic_content
+                );
+            }
+        }
+
         $feedback_newest = $this->Feedback_model->get_feedback_newest();
         $feedback_newest_content = $this->load->view(
             $template_path . '-feedback-newest',
diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php
index e270ad81..51f4e74d 100644
--- a/application/models/feedback_model.php
+++ b/application/models/feedback_model.php
@@ -158,13 +158,13 @@ class Feedback_model extends CI_Model {
     }
 
     /**
-     * 根据城市英文名查找最新一条反馈信息
+     * 根据城市英文名查找反馈信息
     */
-    function get_feedback_by_city($city_name) {
+    function get_feedback_by_city_name($city_name) {
 
         $feedback_query =
             $this->HT->query("
-            select top 1
+            select top 30
               tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name
             from Eva_TAInfo 
                 left join Eva_TADetail on TAD_TAI_SN=TAI_SN

From 962165460bc30881ebb5ff3349ea4f4b859c76b2 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 20 Jun 2023 10:19:35 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php       |  4 +-
 application/models/feedback_model.php         | 29 +++++++------
 .../ah-ch-gh-feedback-30-list.php             | 41 +++++++++++++++++++
 3 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 application/views/mobile_first/ah-ch-gh-feedback-30-list.php

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 71039b7b..707c1222 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1034,13 +1034,13 @@ class Information extends CI_Controller
     public function test_feedback30()
     {
       $feedback30_array = [];
-      preg_match_all('^<!--@FEEDBACK-30_(.*)@-->^', '<div><!--@FEEDBACK-30_Thailand@--></div>', $feedback30_array);
+      preg_match_all('^<!--@FEEDBACK-30_(.*)@-->^', '<div><!--@FEEDBACK-30_Bangkok@--></div>', $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_content = $this->load->view(
-                  $template_path . '-feedback-30-list',
+                  $template_path . 'ah-ch-gh-feedback-30-list',
                   array('feedback_list' => $feedback_list),
                   true
               );
diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php
index 51f4e74d..ef25e163 100644
--- a/application/models/feedback_model.php
+++ b/application/models/feedback_model.php
@@ -162,21 +162,24 @@ class Feedback_model extends CI_Model {
     */
     function get_feedback_by_city_name($city_name) {
 
-        $feedback_query =
-            $this->HT->query("
-            select top 30
-              tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name
-            from Eva_TAInfo 
-                left join Eva_TADetail on TAD_TAI_SN=TAI_SN
-                left join  V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1
-            where TAD_Content is not null and vci.cii2_name = ?
-            order by tai_getdate desc",
-                array($city_name));
+      $feedback_query =
+        $this->HT->query("
+        select top 30
+          tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name
+        from Eva_TAInfo 
+            left join Eva_TADetail on TAD_TAI_SN=TAI_SN
+            left join  V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1
+        where TAD_Content is not null and vci.cii2_name = ?
+        order by tai_getdate desc",
+            array($city_name));
 
-        $feedback_row = $feedback_query->row();
+      $feedback_result = $feedback_query->result();
+      $feedback_list = [];
 
+      foreach ($feedback_result as $feedback_row) {
         $createdOn = new DateTime($feedback_row->tai_getdate);
         $createdOnString = $createdOn->format('M Y');
+        $feedback_count = COUNT($feedback_list);
 
         $feedback = [
             'title' => $feedback_row->tai_title,
@@ -185,7 +188,9 @@ class Feedback_model extends CI_Model {
             'url' => $feedback_row->tai_url,
             'createdOn' => $createdOnString
         ];
+        $feedback_list[] = $feedback;
+      }
 
-        return $feedback;
+      return $feedback_list;
     }
 }
diff --git a/application/views/mobile_first/ah-ch-gh-feedback-30-list.php b/application/views/mobile_first/ah-ch-gh-feedback-30-list.php
new file mode 100644
index 00000000..a3eb74d5
--- /dev/null
+++ b/application/views/mobile_first/ah-ch-gh-feedback-30-list.php
@@ -0,0 +1,41 @@
+
+                <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>
+<!--单个目的地反馈 展示30条反馈内容，每条反馈包括：标题，正文，客人名字，反馈时间，反馈链接-->           
+              <?php foreach ($feedback_list 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="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

From 0be9ce25d2a7bd1ab6d74603f553cf36b2fec906 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 20 Jun 2023 10:21:01 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 707c1222..fd7c3ee9 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1040,7 +1040,7 @@ class Information extends CI_Controller
               $city_name = $feedback30_array[1][$index];
               $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name);
               $feedback_content = $this->load->view(
-                  $template_path . 'ah-ch-gh-feedback-30-list',
+                  'mobile_first/ah-ch-gh-feedback-30-list',
                   array('feedback_list' => $feedback_list),
                   true
               );

From e12d0b16850ee1787a323c425cca233cf3d14566 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 20 Jun 2023 10:31:46 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 57 ++++++++++++-------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index fd7c3ee9..8048ea76 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1036,16 +1036,16 @@ class Information extends CI_Controller
       $feedback30_array = [];
       preg_match_all('^<!--@FEEDBACK-30_(.*)@-->^', '<div><!--@FEEDBACK-30_Bangkok@--></div>', $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_content = $this->load->view(
-                  'mobile_first/ah-ch-gh-feedback-30-list',
-                  array('feedback_list' => $feedback_list),
-                  true
-              );
-              echo $feedback_content;
-          }
+        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(
+            'mobile_first/ah-ch-gh-feedback-30-list',
+            array('feedback_list' => $feedback_list),
+            true
+          );
+          echo $feedback_content;
+        }
       }
     }
 
@@ -1693,27 +1693,26 @@ class Information extends CI_Controller
             }
         }
 
-        // 动态加载反馈标签，每个城市不足三十条反馈。
-        // HTLM: <div><!--@FEEDBACK-30_Thailand@--></div>
-        // 解析结果：<!--@FEEDBACK-30_Thailand@-->; Thailand
+        // 动态加载反馈标签，每个城市三十条反馈。
+        // HTLM: <div><!--@FEEDBACK-30_Bangkok@--></div>
+        // 解析结果：<!--@FEEDBACK-30_Bangkok@-->; Bangkok
         $feedback30_array = [];
-        preg_match_all('^<!--@FEEDBACK-30_(.*)@-->^', $information->ic_content, $feedback30_array);
+        preg_match_all('^<!--@FEEDBACK-30_(.*)@-->^', '<div><!--@FEEDBACK-30_Bangkok@--></div>', $feedback30_array);
         if (!empty($feedback30_array)) {
-            foreach ($feedback30_array[0] as $index => $tag_name) {
-                $city_name_string = $feedback30_array[1][$index];
-                $city_name_list = explode(',', $city_name_string);
-                $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list);
-                $feedback_content = $this->load->view(
-                    $template_path . '-feedback-30-list',
-                    array('feedback_list' => $feedback_list),
-                    true
-                );
-                $information->ic_content = str_replace(
-                    $tag_name,
-                    $feedback_content,
-                    $information->ic_content
-                );
-            }
+          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(
+              'mobile_first/ah-ch-gh-feedback-30-list',
+              array('feedback_list' => $feedback_list),
+              true
+            );
+            $information->ic_content = str_replace(
+                $tag_name,
+                $feedback_content,
+                $information->ic_content
+            );
+          }
         }
 
         $feedback_newest = $this->Feedback_model->get_feedback_newest();

From 99a4b2c9d9dbb02ca28ebb794a4f6559ddecfddf Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 20 Jun 2023 14:28:12 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=9C=B0=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E6=A0=87=E7=AD=BE=E6=8B=86=E5=88=86=E6=88=90=E4=B8=89?=
 =?UTF-8?q?=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/models/feedback_model.php         |  6 +--
 ...ck-30-list.php => ah-feedback-30-list.php} |  0
 .../mobile_first/ch-feedback-30-list.php      | 41 +++++++++++++++++++
 .../mobile_first/gh-feedback-30-list.php      | 41 +++++++++++++++++++
 4 files changed, 85 insertions(+), 3 deletions(-)
 rename application/views/mobile_first/{ah-ch-gh-feedback-30-list.php => ah-feedback-30-list.php} (100%)
 create mode 100644 application/views/mobile_first/ch-feedback-30-list.php
 create mode 100644 application/views/mobile_first/gh-feedback-30-list.php

diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php
index ef25e163..e861a496 100644
--- a/application/models/feedback_model.php
+++ b/application/models/feedback_model.php
@@ -160,18 +160,18 @@ class Feedback_model extends CI_Model {
     /**
      * 根据城市英文名查找反馈信息
     */
-    function get_feedback_by_city_name($city_name) {
+    function get_feedback_by_city_name($city_name, $top = 30) {
 
       $feedback_query =
         $this->HT->query("
-        select top 30
+        select top ?
           tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name
         from Eva_TAInfo 
             left join Eva_TADetail on TAD_TAI_SN=TAI_SN
             left join  V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1
         where TAD_Content is not null and vci.cii2_name = ?
         order by tai_getdate desc",
-            array($city_name));
+            array($top, $city_name));
 
       $feedback_result = $feedback_query->result();
       $feedback_list = [];
diff --git a/application/views/mobile_first/ah-ch-gh-feedback-30-list.php b/application/views/mobile_first/ah-feedback-30-list.php
similarity index 100%
rename from application/views/mobile_first/ah-ch-gh-feedback-30-list.php
rename to application/views/mobile_first/ah-feedback-30-list.php
diff --git a/application/views/mobile_first/ch-feedback-30-list.php b/application/views/mobile_first/ch-feedback-30-list.php
new file mode 100644
index 00000000..a3eb74d5
--- /dev/null
+++ b/application/views/mobile_first/ch-feedback-30-list.php
@@ -0,0 +1,41 @@
+
+                <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>
+<!--单个目的地反馈 展示30条反馈内容，每条反馈包括：标题，正文，客人名字，反馈时间，反馈链接-->           
+              <?php foreach ($feedback_list 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="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
diff --git a/application/views/mobile_first/gh-feedback-30-list.php b/application/views/mobile_first/gh-feedback-30-list.php
new file mode 100644
index 00000000..a3eb74d5
--- /dev/null
+++ b/application/views/mobile_first/gh-feedback-30-list.php
@@ -0,0 +1,41 @@
+
+                <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>
+<!--单个目的地反馈 展示30条反馈内容，每条反馈包括：标题，正文，客人名字，反馈时间，反馈链接-->           
+              <?php foreach ($feedback_list 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="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

From 172302ef65535455bce0868fdd4e5195290914ba Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 20 Jun 2023 14:29:19 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=9F=8E=E5=B8=82?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=95=B0=E6=8D=AE=E6=8C=87=E5=AE=9A=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 8048ea76..f9a67faa 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1038,9 +1038,9 @@ class Information extends CI_Controller
       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_list = $this->Feedback_model->get_feedback_by_city_name($city_name, 2);
           $feedback_content = $this->load->view(
-            'mobile_first/ah-ch-gh-feedback-30-list',
+            'mobile_first/ah-feedback-30-list',
             array('feedback_list' => $feedback_list),
             true
           );
@@ -1703,7 +1703,7 @@ class Information extends CI_Controller
             $city_name = $feedback30_array[1][$index];
             $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name);
             $feedback_content = $this->load->view(
-              'mobile_first/ah-ch-gh-feedback-30-list',
+              'mobile_first/ah-feedback-30-list',
               array('feedback_list' => $feedback_list),
               true
             );

From feeb5e7515a2bd192a9e48b48337cb61e38d2601 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 20 Jun 2023 14:38:02 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=A4=9A=E4=B8=AA=E5=9F=8E=E5=B8=82=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index f9a67faa..13a51f1d 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1049,6 +1049,32 @@ class Information extends CI_Controller
       }
     }
 
+    public function test_feedback_city_list()
+    {
+      $feedback_city_array = [];
+      preg_match_all('^<!--@FEEDBACK-CITY-LIST_(.*)@-->^', '<div><!--@FEEDBACK-CITY-LIST_Bangkok,Hanoi@--></div>', $feedback_city_array);
+      if (!empty($feedback_city_array)) {
+        foreach ($feedback_city_array[0] as $index => $tag_name) {
+          $city_name_string = $feedback_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;
+          }
+
+          var_dump($feedback_city_list);
+          
+          // $feedback_content = $this->load->view(
+          //   'mobile_first/ah-feedback-30-list',
+          //   array('feedback_list' => $feedback_list),
+          //   true
+          // );
+          // echo $feedback_content;
+        }
+      }
+    }
+
     public function test_price()
     {
       $price_rule = '<div style="color: red;">#ah-8,st,2#</div><div style="color: red;">#ah-8,st,2#</div>';

From cb2ad98a4485f0ad1a2adc365c1e296d4c791972 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 20 Jun 2023 14:39:55 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 13a51f1d..53217964 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1055,7 +1055,7 @@ class Information extends CI_Controller
       preg_match_all('^<!--@FEEDBACK-CITY-LIST_(.*)@-->^', '<div><!--@FEEDBACK-CITY-LIST_Bangkok,Hanoi@--></div>', $feedback_city_array);
       if (!empty($feedback_city_array)) {
         foreach ($feedback_city_array[0] as $index => $tag_name) {
-          $city_name_string = $feedback_array[1][$index];
+          $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) {

From 861fda8b78b0fe23c252fb34b6d63af7e8c32115 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 20 Jun 2023 14:46:19 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E8=BE=93=E5=87=BA=20JSON=20=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E6=96=B9=E4=BE=BF=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 53217964..0f4e3526 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1062,8 +1062,9 @@ class Information extends CI_Controller
             $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name, 5);
             $feedback_city_list[$city_name] = $feedback_list;
           }
-
-          var_dump($feedback_city_list);
+        
+          header('Content-Type: application/json');
+          echo json_encode($feedback_city_list);
           
           // $feedback_content = $this->load->view(
           //   'mobile_first/ah-feedback-30-list',

From bdedf0c444aaa7c21f54237cb16951796b176075 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 20 Jun 2023 14:59:11 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9F=8E=E5=B8=82?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E5=88=97=E8=A1=A8=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php       | 12 ++---
 .../mobile_first/ah-feedback-city-list.php    | 53 +++++++++++++++++++
 2 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 application/views/mobile_first/ah-feedback-city-list.php

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 0f4e3526..22c55944 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1066,12 +1066,12 @@ class Information extends CI_Controller
           header('Content-Type: application/json');
           echo json_encode($feedback_city_list);
           
-          // $feedback_content = $this->load->view(
-          //   'mobile_first/ah-feedback-30-list',
-          //   array('feedback_list' => $feedback_list),
-          //   true
-          // );
-          // echo $feedback_content;
+          $feedback_content = $this->load->view(
+            'mobile_first/ah-feedback-city-list',
+            $feedback_city_list,
+            true
+          );
+          echo $feedback_content;
         }
       }
     }
diff --git a/application/views/mobile_first/ah-feedback-city-list.php b/application/views/mobile_first/ah-feedback-city-list.php
new file mode 100644
index 00000000..89b68e08
--- /dev/null
+++ b/application/views/mobile_first/ah-feedback-city-list.php
@@ -0,0 +1,53 @@
+
+                <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个目的地：
+                    泰国，越南，柬埔寨，日本，印度，缅甸,中国
+                    每条反馈包括：标题，正文，客人名字，反馈时间，反馈链接-->
+                    <?php foreach ($Bangkok 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 }?>
+                    <?php foreach ($Hanoi 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="/thailand/tours/">More Thailand reviews</a></div>
+
+                              <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

From 73b172c4e9b30c78cf653f025e7b5c3a7295de62 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 20 Jun 2023 15:02:36 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E5=9F=8E=E5=B8=82=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile_first/ah-feedback-city-list.php    | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/application/views/mobile_first/ah-feedback-city-list.php b/application/views/mobile_first/ah-feedback-city-list.php
index 89b68e08..eec3ec6b 100644
--- a/application/views/mobile_first/ah-feedback-city-list.php
+++ b/application/views/mobile_first/ah-feedback-city-list.php
@@ -18,20 +18,31 @@
                     泰国，越南，柬埔寨，日本，印度，缅甸,中国
                     每条反馈包括：标题，正文，客人名字，反馈时间，反馈链接-->
                     <?php foreach ($Bangkok 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>
+                    <!-- Bangkok -->
+                    <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 }?>
+                    <!-- Hanoi -->
                     <?php foreach ($Hanoi 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>
+                    <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 }?>
+                    <!-- 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="/thailand/tours/">More Thailand reviews</a></div>

From c58564bfa631d5b27fb90989fe4bf764ab527674 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Tue, 20 Jun 2023 15:10:35 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=9E=E7=A9=BA?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E9=80=82=E5=BA=94=E5=9F=8E=E5=B8=82?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php                  | 4 ++--
 application/views/mobile_first/ah-feedback-city-list.php | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 22c55944..48c5ac64 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1063,8 +1063,8 @@ class Information extends CI_Controller
             $feedback_city_list[$city_name] = $feedback_list;
           }
         
-          header('Content-Type: application/json');
-          echo json_encode($feedback_city_list);
+          // header('Content-Type: application/json');
+          // echo json_encode($feedback_city_list);
           
           $feedback_content = $this->load->view(
             'mobile_first/ah-feedback-city-list',
diff --git a/application/views/mobile_first/ah-feedback-city-list.php b/application/views/mobile_first/ah-feedback-city-list.php
index eec3ec6b..7db0ef9f 100644
--- a/application/views/mobile_first/ah-feedback-city-list.php
+++ b/application/views/mobile_first/ah-feedback-city-list.php
@@ -17,8 +17,9 @@
                 <!--反馈集合页 每个目的地展示5条反馈，共7个目的地：
                     泰国，越南，柬埔寨，日本，印度，缅甸,中国
                     每条反馈包括：标题，正文，客人名字，反馈时间，反馈链接-->
-                    <?php foreach ($Bangkok as $index => $feedback) {?>
                     <!-- Bangkok -->
+                    <?php if (!empty($Bangkok)) {?>
+                    <?php foreach ($Bangkok as $index => $feedback) {?>
                     <div class="feedback_content">
                       <strong><?php echo $feedback['title'] ?></strong>
                       <p><?php echo $feedback['content'] ?></p>
@@ -26,7 +27,9 @@
                       <div class="customer_name"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                     </div>
                     <?php }?>
+                    <?php }?>
                     <!-- Hanoi -->
+                    <?php if (!empty($Hanoi)) {?>
                     <?php foreach ($Hanoi as $index => $feedback) {?>
                     <div class="feedback_content">
                       <strong><?php echo $feedback['title'] ?></strong>
@@ -35,7 +38,9 @@
                       <div class="customer_name"><?php echo $feedback['customer'] ?>,<?php echo $feedback['createdOn'] ?></div>
                     </div>
                     <?php }?>
+                    <?php }?>
                     <!-- Yangon -->
+                    <?php if (!empty($Yangon)) {?>
                     <?php foreach ($Yangon as $index => $feedback) {?>
                     <div class="feedback_content">
                       <strong><?php echo $feedback['title'] ?></strong>
@@ -43,6 +48,7 @@
                       <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 }?>
                     <?php }?>
                               
                               <div class="more_tours"><a href="/thailand/tours/">More Thailand reviews</a></div>