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

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':

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);
     }
 
     //根据路径获取某一级别节点详细页

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>

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>