From 65344c9168242ecf5b013b3055db2b8a1897882d Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Wed, 27 Jan 2021 11:12:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B4=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch-pc.php | 2 +-
 application/views/mobile_first/ch.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index ed07906f..58c6a0bb 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -282,7 +282,7 @@
                  originalsrc="https://data.chinahighlights.com/pic/guide/info-template-bottom-logo.jpg"
                  loader="lazy"
                  class="img-responsive bottomlogopc">
-            <span class="bottomcopyright">© 1998-2020 China Highlights — Discovery Your Way!  </span>
+            <span class="bottomcopyright">© 1998-2021 China Highlights — Discovery Your Way!  </span>
             <span class="bottomprivacy"><a href="/privacy.htm">Privacy Policy</a>  |  <a
                         href="/aboutus/terms.htm">Terms</a></span>
         </div>
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 09af96ae..73e21de9 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -247,7 +247,7 @@
         </div>
     </div>
     <div class="bottomlogo">
-        © 1998-2020 China Highlights <br>— Discovery Your Way!
+        © 1998-2021 China Highlights <br>— Discovery Your Way!
     </div>
 
 </footer>

From 181e2401f76abd07b534e8b3b1253885dd13cf57 Mon Sep 17 00:00:00 2001
From: ycc <ycc@hainatravel.com>
Date: Wed, 27 Jan 2021 12:50:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?url=E5=88=97=E8=A1=A8=EF=BC=8C=E5=87=8F?=
 =?UTF-8?q?=E5=B0=91=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/welcome.php      | 2 +-
 application/models/information_model.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index d17f485c..172bfafc 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -105,7 +105,7 @@ class Welcome extends CI_Controller {
             show_404();
             return false;
         }
-        $data['all_information'] = $this->Information_model->get_list_by_path($structure->is_path);
+        $data['all_information'] = $this->Information_model->get_list_by_path($structure->is_path,false,false,'is_id,ic_url,ic_id,ic_status');
         $this->load->view('bootstrap3/header', $data);
         switch ($view){
             case 'amp':
diff --git a/application/models/information_model.php b/application/models/information_model.php
index ebafb5ca..70e0a4b4 100644
--- a/application/models/information_model.php
+++ b/application/models/information_model.php
@@ -97,14 +97,14 @@ class Information_model extends CI_Model {
     }
 
     //根据根节点路径获取子节点列表
-    function get_list_by_path($path, $level = false, $site_code = false) {
+    function get_list_by_path($path, $level = false, $site_code = false,$filed=false) {
         $this->init();
         if ($level !== false) {
             $this->level = " AND is1.is_level= '$level' ";
         }
         $this->path = " AND is1.is_path LIKE '$path%' ";
         $this->orderBy = ' ORDER BY is1.is_level ASC, is1.is_sort ASC,is1.is_path ASC ';
-        return $this->GetList('', $site_code);
+        return $this->GetList($filed, $site_code);
     }
 
     //根据路径获取某一级别节点详细页