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

application/controllers/information.php

@@ -105,6 +105,8 @@ class Information extends CI_Controller
     return true;
   }
 
+  //复制节点结构到任意站点的节点下面。-- lmr - 1225
+  //is_id 信息结构ID，
   //复制节点结构到任意站点的节点下面。-- lmr
   //is_id 信息结构ID，
   public function copy_by_is_id($src_is_id, $dest_is_id)
@@ -1256,7 +1258,10 @@ class Information extends CI_Controller
 
   public function test_feedback()
   {
-    $feedback_newest = $this->Feedback_model->test_feedback_newest();
+    $feedback_newest = $this->Feedback_model->get_feedback_newest();
+    var_dump($feedback_newest);
+    echo '------------------------------------------------------';
+    $feedback_newest = $this->Feedback_model->get_feedback_newest(10);
     var_dump($feedback_newest);
   }
 
@@ -1925,6 +1930,18 @@ class Information extends CI_Controller
 
     $template = str_replace('<!--@TIPS-RIGHT-LIST@-->', $tips_right_list_content, $template);
 
+    //
+    $feedback_newest_10 = $this->Feedback_model->get_feedback_newest(10);
+    $feedback_newest_10_content = $this->load->view(
+      'mobile_first/ah-feedback-newest-10',
+      array('feedback_list' => $feedback_newest_10),
+      true
+    );
+    str_replace(
+      '<!--@NEWEST_FEEDBACK_10@-->', 
+      $feedback_newest_10_content, 
+      $template);
+
     //文中的信息推荐
     if (strpos($information->ic_content, '<!--@Content-Recommends-Article@-->') !== false) {
       $information->ic_content = str_replace('<!--@Content-Recommends-Article@-->', $this->load->view($template_path . '-recommends-article', array('recommands' => $template_recommand), true), $information->ic_content);
@@ -2095,9 +2112,10 @@ class Information extends CI_Controller
       }
     }
 
+    //
     $feedback_newest = $this->Feedback_model->get_feedback_newest();
     $feedback_newest_content = $this->load->view(
-      $template_path . '-feedback-newest',
+      'mobile_first/ah-feedback-newest',
       array('feedback_list' => $feedback_newest),
       true
     );

application/models/feedback_model.php

@@ -8,43 +8,43 @@ class Feedback_model extends CI_Model {
     }
 
     /**
-     * 返回最新八条反馈信息
+     * 返回最新反馈信息，默认 20条
     */
-    function get_feedback_newest() {
-
-        $feedback_query =
-            $this->HT->query("
-            select top 40
-              tad_content, tai_customerid, tai_title, tai_getdate, tai_url
-            from Eva_TAInfo tai
-              left join Eva_TADetail on TAD_TAI_SN=TAI_SN
-              left join Eva_TAGuidePrize tgp on tgp.TGP_TAI_SN = tai.TAI_SN
-            where TAD_Content is not null 
-              and isnull(TAI_DeleteFlag,0) = 0 and isnull(tgp.TGP_CheckState, 0) = 136002
-            order by tai_getdate desc");
+    function get_feedback_newest($row_limit = 20) {
+      $total_limit = $row_limit * 2;
+      $feedback_query =
+        $this->HT->query("
+          select top ?
+            tad_content, tai_customerid, tai_title, tai_getdate, tai_url
+          from Eva_TAInfo tai
+            left join Eva_TADetail on TAD_TAI_SN=TAI_SN
+            left join Eva_TAGuidePrize tgp on tgp.TGP_TAI_SN = tai.TAI_SN
+          where TAD_Content is not null 
+            and isnull(TAI_DeleteFlag,0) = 0 and isnull(tgp.TGP_CheckState, 0) = 136002
+          order by tai_getdate desc", $total_limit);
 
-        $feedback_result = $feedback_query->result();
-        $feedback_list = [];
-        $customer_id_list = [];
+      $feedback_result = $feedback_query->result();
+      $feedback_list = [];
+      $customer_id_list = [];
 
-        foreach ($feedback_result as $feedback_row) {
-            $createdOn = new DateTime($feedback_row->tai_getdate);
-            $createdOnString = $createdOn->format('M Y');
-            $feedback_count = COUNT($feedback_list);
-            if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < 20) {  
-              $feedback = [
-                'title' => $feedback_row->tai_title,
-                'customer' => $feedback_row->tai_customerid,
-                'content' => $feedback_row->tad_content,
-                'url' => $feedback_row->tai_url,
-                'createdOn' => $createdOnString
-              ];
-              $feedback_list[] = $feedback;
-              $customer_id_list[] = $feedback_row->tai_customerid;
-            }
+      foreach ($feedback_result as $feedback_row) {
+        $createdOn = new DateTime($feedback_row->tai_getdate);
+        $createdOnString = $createdOn->format('M Y');
+        $feedback_count = COUNT($feedback_list);
+        if (!in_array($feedback_row->tai_customerid, $customer_id_list) && $feedback_count < $row_limit) {  
+          $feedback = [
+            'title' => $feedback_row->tai_title,
+            'customer' => $feedback_row->tai_customerid,
+            'content' => $feedback_row->tad_content,
+            'url' => $feedback_row->tai_url,
+            'createdOn' => $createdOnString
+          ];
+          $feedback_list[] = $feedback;
+          $customer_id_list[] = $feedback_row->tai_customerid;
         }
+      }
 
-        return $feedback_list;
+      return $feedback_list;
     }
 
     function test_feedback_newest() {

application/views/mobile_first/ah-feedback-newest-10.php

@@ -0,0 +1,23 @@
+<div class="right_tour">
+  <div class="feedback_logo" style="width: auto; display: flex;">
+    <img height="65" style="margin: 0px auto; " width="150"
+        src="https://data.asiahighlights.com/image/forms/ah-ta-2023-certificate.png" />
+    <img alt="Tour Review" class="img-responsive" height="278"
+        style="width: 140px; display: block; margin: 0 auto; " width="1133"
+        src="https://data.asiahighlights.com/image/forms/ah-ch-gh-tp-rating.png" />
+  </div>
+  <?php foreach ($feedback_list as $index => $feedback) {?>
+  <div class="tour_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>
+  <?php }?>
+</div>