From 51c487d8484fa8d906798b19a50b3639f5df1957 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Mon, 4 Jun 2018 19:44:20 +0800
Subject: [PATCH 01/22] add is_path

---
 application/views/bootstrap3/information_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 7c672607..3d02cca8 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -555,7 +555,7 @@
                                     $amp_photo = $this->config->item('site_image_url').$information->ic_photo;
                                 }
                                 ?>
-                                <label title="AMP页面编辑"><a href="/amp_app/?icid=<?php echo($information->ic_id); ?>&usr=<?php echo(urlencode($amp_user['OPI_Name'])); ?>&url=<?php echo(urlencode($information->ic_url)); ?>&photo=<?php echo(urlencode($amp_photo)); ?>&site=<?php echo(urlencode($this->config->item('site_url'))); ?>&imgurl=<?php echo(urlencode($this->config->item('site_image_url'))); ?>" target="_blank">AMP构建工具</a></label> |
+                                <label title="AMP页面编辑"><a href="/amp_app/?icid=<?php echo($information->ic_id); ?>&is_path=<?php echo($information->is_path); ?>&usr=<?php echo(urlencode($amp_user['OPI_Name'])); ?>&url=<?php echo(urlencode($information->ic_url)); ?>&photo=<?php echo(urlencode($amp_photo)); ?>&site=<?php echo(urlencode($this->config->item('site_url'))); ?>&imgurl=<?php echo(urlencode($this->config->item('site_image_url'))); ?>" target="_blank">AMP构建工具</a></label> |
                                 <?php if (get_meta($information->ic_id, 'AMP_STATUS') === '1') {?>
                                     <label title="AMP页面编辑"><a href="<?php echo site_url('amp/edit/' . $information->ic_id); ?>" target="_blank"><i class="glyphicon glyphicon-flash"></i></a></label>
                                 <?php } else {?>

From 28313e4217d47caa3ae0f9f62ce3afbd9bb59e2a Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Mon, 4 Jun 2018 20:23:50 +0800
Subject: [PATCH 02/22] add is_path 2

---
 application/models/infoMetas_model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/models/infoMetas_model.php b/application/models/infoMetas_model.php
index b8bf51e2..a7ece6e9 100644
--- a/application/models/infoMetas_model.php
+++ b/application/models/infoMetas_model.php
@@ -71,7 +71,8 @@ class InfoMetas_model extends CI_Model {
             . "       INNER JOIN infoContents ic ON ic.ic_id = is1.is_ic_id \n"
             . "            AND ic.ic_sitecode = is1.is_sitecode \n"
             . "       LEFT JOIN infoMetas im ON im.im_ic_id = ic.ic_id AND im.im_key=?"
-            . " WHERE  is1.is_path LIKE '$is_path%' AND is_sitecode = ? AND ic_status = 1";
+            . " WHERE  is1.is_path LIKE '$is_path%' AND is_sitecode = ? AND ic_status = 1"
+            . " ORDER BY is1.is_level, is1.is_sort, is1.is_path";
         $query = $this->HT->query($sql, array('AMP_JSON', $site_code));
         //print_r($this->HT->queries);
         return $query->result();

From ec58d5f0ddda13bdd5444c0f0a6895772eb5f814 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Mon, 4 Jun 2018 20:26:45 +0800
Subject: [PATCH 03/22] add is_path 3

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

diff --git a/application/models/infoMetas_model.php b/application/models/infoMetas_model.php
index a7ece6e9..0fcdf17b 100644
--- a/application/models/infoMetas_model.php
+++ b/application/models/infoMetas_model.php
@@ -72,7 +72,7 @@ class InfoMetas_model extends CI_Model {
             . "            AND ic.ic_sitecode = is1.is_sitecode \n"
             . "       LEFT JOIN infoMetas im ON im.im_ic_id = ic.ic_id AND im.im_key=?"
             . " WHERE  is1.is_path LIKE '$is_path%' AND is_sitecode = ? AND ic_status = 1"
-            . " ORDER BY is1.is_level, is1.is_sort, is1.is_path";
+            . " ORDER BY len(is1.is_path), is1.is_sort";
         $query = $this->HT->query($sql, array('AMP_JSON', $site_code));
         //print_r($this->HT->queries);
         return $query->result();

From 639891b3393db1682803050be3096f2db3cbe514 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Mon, 4 Jun 2018 20:29:28 +0800
Subject: [PATCH 04/22] add is_path 4

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

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index 873127d8..87424c67 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -242,7 +242,7 @@ class Info_amp extends CI_Controller
         if (!empty($rs)) {
             $newrs = array();
             foreach ($rs as $info) {
-                if (!empty($info->ic_content) && !empty($info->ic_url)) {
+                if (!empty($info->ic_content) && !empty($info->ic_url) && stripos($info->ic_url, '/test/')===false) {
                     array_push($newrs, array(
                         'ic_url' => $info->ic_url,
                         'ic_id' => $info->ic_id,

From 4aed86a2c022ef1105fac8d75daf12218df7649d Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Mon, 4 Jun 2018 20:33:33 +0800
Subject: [PATCH 05/22] add is_path

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

diff --git a/application/models/infoMetas_model.php b/application/models/infoMetas_model.php
index 0fcdf17b..a7ece6e9 100644
--- a/application/models/infoMetas_model.php
+++ b/application/models/infoMetas_model.php
@@ -72,7 +72,7 @@ class InfoMetas_model extends CI_Model {
             . "            AND ic.ic_sitecode = is1.is_sitecode \n"
             . "       LEFT JOIN infoMetas im ON im.im_ic_id = ic.ic_id AND im.im_key=?"
             . " WHERE  is1.is_path LIKE '$is_path%' AND is_sitecode = ? AND ic_status = 1"
-            . " ORDER BY len(is1.is_path), is1.is_sort";
+            . " ORDER BY is1.is_level, is1.is_sort, is1.is_path";
         $query = $this->HT->query($sql, array('AMP_JSON', $site_code));
         //print_r($this->HT->queries);
         return $query->result();

From 78cfb2b5ea55177d738b8362fe0a91d2f0c1ad2f Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Tue, 5 Jun 2018 08:55:21 +0800
Subject: [PATCH 06/22] add is path

---
 application/controllers/info_amp.php   | 1 +
 application/models/infoMetas_model.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index 873127d8..8ca8c071 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -244,6 +244,7 @@ class Info_amp extends CI_Controller
             foreach ($rs as $info) {
                 if (!empty($info->ic_content) && !empty($info->ic_url)) {
                     array_push($newrs, array(
+                        'is_path' => $info->is_path,
                         'ic_url' => $info->ic_url,
                         'ic_id' => $info->ic_id,
                         'title' => $info->ic_title,
diff --git a/application/models/infoMetas_model.php b/application/models/infoMetas_model.php
index b8bf51e2..fb8f3252 100644
--- a/application/models/infoMetas_model.php
+++ b/application/models/infoMetas_model.php
@@ -58,6 +58,7 @@ class InfoMetas_model extends CI_Model {
     //按节点列表信息（含meta数据）
     function list_info_by_path_with_meta($is_path, $site_code) {
         $sql = "SELECT  is1.is_id, \n"
+            . "       is1.is_path, \n"
             . "       ic.ic_id, \n"
             . "       ic.ic_url, \n"
             . "       ic.ic_status, \n"

From 411bdce7b7bd0426e4e7a77ea53dbb13b8ac93e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Tue, 5 Jun 2018 14:28:02 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=8A=82=E7=82=B9=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/config/config.php    |  1 +
 application/controllers/home.php | 42 ++++++++++++++++++++++++++++++++
 application/views/welcome.php    |  4 ++-
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/home.php

diff --git a/application/config/config.php b/application/config/config.php
index 339d9712..2e23c280 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -615,6 +615,7 @@ $config['area_type'] = array(
     '大使馆' => 'y',
     '公民游' => 'z',
     '交换链接' => 'k',
+    '首页' => 'h',
     'FAQ' => 'q'
 );
 
diff --git a/application/controllers/home.php b/application/controllers/home.php
new file mode 100644
index 00000000..c351dfc8
--- /dev/null
+++ b/application/controllers/home.php
@@ -0,0 +1,42 @@
+<?php
+
+if (!defined('BASEPATH'))
+    exit('No direct script access allowed');
+
+class Home extends CI_Controller
+{
+
+    function __construct()
+    {
+        parent::__construct();
+        $this->permission->is_admin();
+        //$this->output->enable_profiler(TRUE);
+        $this->load->model('Area_model');
+        $this->load->model('Information_model');
+        $this->load->model('InfoContents_model');
+        $this->load->model('InfoStructures_model');
+    }
+
+	//站点首页
+    public function index()
+    {
+		$home_id=1;
+        //查询结构根节点，当为空则建立
+        $rootStructure = $this->Information_model->GetRoot('h', $home_id);
+        if ($rootStructure == FALSE)
+        {
+            $this->InfoContents_model->Add('', 'HomePage', 'root', '', '', '', '', '', '', 0, 0, '', '', 0, 0, '', '', $home_id, 'h', 0,
+                    '','');
+            $this->InfoStructures_model->Add(0, $this->InfoContents_model->insert_id);
+            $is_id = $this->InfoStructures_model->insert_id;
+        }
+        else
+        {
+            $is_id = $rootStructure->is_id;
+        }
+        redirect(site_url('information/edit/' . $is_id));
+    }
+
+
+}
+
diff --git a/application/views/welcome.php b/application/views/welcome.php
index e123e34e..7757fce0 100644
--- a/application/views/welcome.php
+++ b/application/views/welcome.php
@@ -5,7 +5,9 @@
         <dl>
 		
 		   <dt>系统模块</dt>
-
+            <dd>
+                <a href="<?php echo site_url('home') ?>">站点首页</a>  
+            </dd>  
             <dd>
                 <a href="<?php echo site_url('special') ?>">专题管理</a>  
             </dd>  

From 8c0678e4c00bbd131842b680294e832c613ec85e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Tue, 5 Jun 2018 14:32:27 +0800
Subject: [PATCH 08/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=8A=82=E7=82=B9=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/bootstrap/welcome.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/views/bootstrap/welcome.php b/application/views/bootstrap/welcome.php
index 4a6d3a78..87d68d28 100644
--- a/application/views/bootstrap/welcome.php
+++ b/application/views/bootstrap/welcome.php
@@ -10,6 +10,7 @@
             <li class="divider"></li>
 
             <li class="nav-header">信息模块</li>
+            <li><a href="<?php echo site_url('home') ?>">首页</a></li>
             <li><a href="<?php echo site_url('special') ?>">专题管理</a></li>
             <li><a href="<?php echo site_url('link') ?>">交换链接</a></li>
             <li><a href="<?php echo site_url('airport') ?>">机场信息</a></li>

From e42f63722af971f8db515c4264c146908b4940e7 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 5 Jun 2018 15:30:35 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95AMP?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/views/amp_editor.php b/application/views/amp_editor.php
index 86773135..27edf2a6 100644
--- a/application/views/amp_editor.php
+++ b/application/views/amp_editor.php
@@ -40,7 +40,7 @@
             </div>
             <div class="col-sm-4">
                 <button type="button" class="btn btn-primary" onclick="submit_amp_editor();">保存</button>
-			    <a href="http://192.155.224.195:8080/guide-use.php/amp_loader/load/?info_url=<?php echo $information->ic_url ?>" target="_blank">看看</a>
+			    <a href="http://192.155.224.195:8080/guide-use.php/amp_loader/test/?info_url=<?php echo $information->ic_url ?>" target="_blank">看看</a>
             </div>
             <div class="col-sm-4"> <button type="button" class="btn btn-default" onclick="meta('delete', '<?php echo $information->ic_id; ?>', 'AMP', ''); meta('delete', '<?php echo $information->ic_id; ?>', 'AMP_STATUS', '');">删除</button> </div>
         </div>

From b9929b28984f49f87d66fd6e4fa7106e9ed00c0e Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 6 Jun 2018 09:12:50 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E8=A7=A3=E5=86=B3AMP=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8TEXTAREA=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/amp_editor.php | 73 ++++++++++++++++----------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/application/views/amp_editor.php b/application/views/amp_editor.php
index 27edf2a6..b6d6e06e 100644
--- a/application/views/amp_editor.php
+++ b/application/views/amp_editor.php
@@ -12,7 +12,6 @@
     }
 </style>
 
-
 <div class="container-fluid">
     <div class="row">
         <div class="preview_box" id="iframe_box" ></div>
@@ -20,7 +19,7 @@
     </div>
     <hr/>
     <form name="form_amp_code" id="form_amp_code" method="post" action="<?php echo site_url('amp/edit_save') ?>">
-        <textarea id="textarea_htmlcode" name="textarea_htmlcode" style="display: none;"><?php echo get_meta($information->ic_id, 'AMP'); ?></textarea>
+        <textarea id="textarea_htmlcode" name="textarea_htmlcode" style="display: none;"></textarea>
         <input type="hidden" name="ic_id" value="<?php echo $information->ic_id; ?>" />
 
         <div class="row">
@@ -48,45 +47,47 @@
     <hr/>
 </div>
 
-
-
-
-
+<script type="text/x-template" id="amp_html">
+<?php echo htmlentities(get_meta($information->ic_id, 'AMP')); ?>
+</script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" type="text/javascript" charset="utf-8"></script>
 <script>
-                var editor = ace.edit("editor");
-                editor.setTheme("ace/theme/eclipse");
-                editor.session.setMode("ace/mode/html");
-                editor.setOptions({
-                    autoScrollEditorIntoView: true,
-                    wrap: true
-                });
+    var editor = ace.edit("editor");
+    editor.setTheme("ace/theme/eclipse");
+    editor.session.setMode("ace/mode/html");
+    editor.setOptions({
+        autoScrollEditorIntoView: true,
+        wrap: true
+    });
+
+    editor.getSession().on('change', function (e) {
+        update_preview();
+    });
 
-                editor.getSession().on('change', function (e) {
-                    update_preview();
-                });
-                editor.session.setValue($('#textarea_htmlcode').html($('#textarea_htmlcode').html()).text());
+    var temp_div = document.createElement("div");
+    temp_div.innerHTML = $('#amp_html').html();
+    editor.session.setValue(temp_div.textContent);
 
-                function update_preview() {
-                    //考虑做成异步操作，降低页面卡顿
-                    var iframe = document.createElement('iframe');
-                    iframe.setAttribute('frameBorder', '0');
-                    iframe.setAttribute('id', 'previewIframe');
-                    iframe.setAttribute('height', '100%');
-                    iframe.setAttribute('width', '100%');
-                    iframe.setAttribute('name', 'AMP Playground Output');
-                    $('#iframe_box').html('');
-                    $('#iframe_box').append(iframe);
-                    var doc = iframe.contentDocument || iframe.document;
-                    doc.open();
-                    doc.write(editor.getValue());
-                    doc.close();
-                }
+    function update_preview() {
+        //考虑做成异步操作，降低页面卡顿
+        var iframe = document.createElement('iframe');
+        iframe.setAttribute('frameBorder', '0');
+        iframe.setAttribute('id', 'previewIframe');
+        iframe.setAttribute('height', '100%');
+        iframe.setAttribute('width', '100%');
+        iframe.setAttribute('name', 'AMP Playground Output');
+        $('#iframe_box').html('');
+        $('#iframe_box').append(iframe);
+        var doc = iframe.contentDocument || iframe.document;
+        doc.open();
+        doc.write(editor.getValue());
+        doc.close();
+    }
 
-                function submit_amp_editor() {
-                    $('#textarea_htmlcode').text(editor.getValue()).html();
-                    submitForm('form_amp_code');
-                }
+    function submit_amp_editor() {
+        $('#textarea_htmlcode').text(editor.getValue()).html();
+        submitForm('form_amp_code');
+    }
 </script>
 
 

From aa5fca5429b0d1c2eedaaed1f4b462fdb7144893 Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Wed, 6 Jun 2018 09:34:17 +0800
Subject: [PATCH 11/22] add image fix

---
 application/controllers/info_amp.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index f683e70c..7f5298e0 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -268,11 +268,17 @@ class Info_amp extends CI_Controller
         if ($icid) {
             $ic = $this->InfoContents_model->get_ic_contents2($icid);
             if ($ic) {
+                $show_photo_meta = $this->InfoMetas_model->get($icid, 'meta_use_list_picture');
+                if ($show_photo_meta === 'no') {
+                    $use_photo = '';
+                } else {
+                    $use_photo = $this->config->item('site_image_url').$ic->ic_photo;
+                }
                 echo json_encode(array(
                     "succ" => true,
                     "info" => $ic->ic_content,
 					"title" => $ic->ic_title,
-                    "photo" => $this->config->item('site_image_url').$ic->ic_photo,
+                    "photo" => $use_photo,
                     "url" => $ic->ic_url,
                     "site" => $this->config->item('site_url')
                 ));

From 2695300715943cb9bc438d83243e1e88c0c68832 Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Wed, 6 Jun 2018 09:39:06 +0800
Subject: [PATCH 12/22] add image fix

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

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index 7f5298e0..74f8f499 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -269,7 +269,7 @@ class Info_amp extends CI_Controller
             $ic = $this->InfoContents_model->get_ic_contents2($icid);
             if ($ic) {
                 $show_photo_meta = $this->InfoMetas_model->get($icid, 'meta_use_list_picture');
-                if ($show_photo_meta === 'no') {
+                if ($show_photo_meta == 'no') {
                     $use_photo = '';
                 } else {
                     $use_photo = $this->config->item('site_image_url').$ic->ic_photo;

From 87b0edc6fef83256f602062f883d5537b1ee2845 Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Wed, 6 Jun 2018 09:48:23 +0800
Subject: [PATCH 13/22] test

---
 application/views/bootstrap3/information_edit.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 3d02cca8..4b0f3cd8 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -550,8 +550,9 @@
                             <div class="col-xs-17 text-right">
                                 <?php
                                 $amp_user = $this->session->userdata('session_admin');
+                                $show_photo_meta = get_meta($information->ic_id, 'meta_use_list_picture');
                                 $amp_photo = '';
-                                if ($information->ic_photo) {
+                                if ($information->ic_photo && $show_photo_meta !== 'no') {
                                     $amp_photo = $this->config->item('site_image_url').$information->ic_photo;
                                 }
                                 ?>

From 2eed75fad1bfef7d4c1d26f59f807bb22f8ea42a Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Wed, 6 Jun 2018 09:52:36 +0800
Subject: [PATCH 14/22] ic_photo

---
 application/controllers/info_amp.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index 74f8f499..eaeb1d7e 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -242,13 +242,19 @@ class Info_amp extends CI_Controller
         if (!empty($rs)) {
             $newrs = array();
             foreach ($rs as $info) {
+                $show_photo_meta = $this->InfoMetas_model->get($info->ic_id, 'meta_use_list_picture');
+                if ($show_photo_meta == 'no') {
+                    $use_photo = '';
+                } else {
+                    $use_photo = $this->config->item('site_image_url').$ic->ic_photo;
+                }
                 if (!empty($info->ic_content) && !empty($info->ic_url) && stripos($info->ic_url, '/test/')===false) {
                     array_push($newrs, array(
                         'is_path' => $info->is_path,
                         'ic_url' => $info->ic_url,
                         'ic_id' => $info->ic_id,
                         'title' => $info->ic_title,
-                        'photo' => $this->config->item('site_image_url').$info->ic_photo,
+                        'photo' => $use_photo,
                         'im_id' => $info->im_id
                     ));
                 }

From c3cfe3c5798f7f94a2948887309b220acae70088 Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Wed, 6 Jun 2018 09:55:20 +0800
Subject: [PATCH 15/22] ic_photo 2

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

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index eaeb1d7e..64e6d396 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -246,7 +246,7 @@ class Info_amp extends CI_Controller
                 if ($show_photo_meta == 'no') {
                     $use_photo = '';
                 } else {
-                    $use_photo = $this->config->item('site_image_url').$ic->ic_photo;
+                    $use_photo = $this->config->item('site_image_url').$info->ic_photo;
                 }
                 if (!empty($info->ic_content) && !empty($info->ic_url) && stripos($info->ic_url, '/test/')===false) {
                     array_push($newrs, array(

From bda469fe2b30f7c97d9301b2c50e2fa629a0240b Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Wed, 6 Jun 2018 09:58:46 +0800
Subject: [PATCH 16/22] ic_photo

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

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index 64e6d396..e3e9c41e 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -246,7 +246,7 @@ class Info_amp extends CI_Controller
                 if ($show_photo_meta == 'no') {
                     $use_photo = '';
                 } else {
-                    $use_photo = $this->config->item('site_image_url').$info->ic_photo;
+                    //$use_photo = $this->config->item('site_image_url').$info->ic_photo;
                 }
                 if (!empty($info->ic_content) && !empty($info->ic_url) && stripos($info->ic_url, '/test/')===false) {
                     array_push($newrs, array(

From b2499dbf01e65334099ce1fb9d9a1552a8c3e752 Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Wed, 6 Jun 2018 10:00:21 +0800
Subject: [PATCH 17/22] ic_photo 3

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

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index e3e9c41e..64e6d396 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -246,7 +246,7 @@ class Info_amp extends CI_Controller
                 if ($show_photo_meta == 'no') {
                     $use_photo = '';
                 } else {
-                    //$use_photo = $this->config->item('site_image_url').$info->ic_photo;
+                    $use_photo = $this->config->item('site_image_url').$info->ic_photo;
                 }
                 if (!empty($info->ic_content) && !empty($info->ic_url) && stripos($info->ic_url, '/test/')===false) {
                     array_push($newrs, array(

From e6569702d04239bff6a4a7f44589927ca5712ea5 Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Wed, 6 Jun 2018 11:22:17 +0800
Subject: [PATCH 18/22] fix list info

---
 application/controllers/info_amp.php      | 9 +++++++--
 application/models/infoContents_model.php | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index 64e6d396..5ac2c0eb 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -248,7 +248,12 @@ class Info_amp extends CI_Controller
                 } else {
                     $use_photo = $this->config->item('site_image_url').$info->ic_photo;
                 }
-                if (!empty($info->ic_content) && !empty($info->ic_url) && stripos($info->ic_url, '/test/')===false) {
+                if ($data['detail']->ic_type === 'c_attraction' || $data['detail']->ic_template === 'city_info_attractions_list' || $data['detail']->ic_template === 'r_tpl_empty_navi1p') {
+                    $list_info = true;
+                } else {
+                    $list_info = false;
+                }
+                if ($list_info || !empty($info->ic_content) && !empty($info->ic_url) && stripos($info->ic_url, '/test/')===false) {
                     array_push($newrs, array(
                         'is_path' => $info->is_path,
                         'ic_url' => $info->ic_url,
@@ -282,7 +287,7 @@ class Info_amp extends CI_Controller
                 }
                 echo json_encode(array(
                     "succ" => true,
-                    "info" => $ic->ic_content,
+                    "info" => $ic->ic_content || $ic->ic_seo_description,
 					"title" => $ic->ic_title,
                     "photo" => $use_photo,
                     "url" => $ic->ic_url,
diff --git a/application/models/infoContents_model.php b/application/models/infoContents_model.php
index 25667ef8..5f99c142 100644
--- a/application/models/infoContents_model.php
+++ b/application/models/infoContents_model.php
@@ -126,7 +126,7 @@ class InfoContents_model extends CI_Model
 
     public function get_ic_contents2($ic_id)
     {
-        $sql="SELECT top 1 ic_id, ic_content, ic_title, ic_url, ic_photo, ic_sitecode from infoContents where ic_id=?";
+        $sql="SELECT top 1 ic_id, ic_content, ic_title, ic_url, ic_photo, ic_sitecode, ic_seo_description from infoContents where ic_id=?";
         $query=$this->HT->query($sql,array($ic_id));
         if ($query->result())
         {

From b2357bda8872de58751769715a36372f65f6ba00 Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Wed, 6 Jun 2018 11:23:20 +0800
Subject: [PATCH 19/22] fix list info 2

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

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index 5ac2c0eb..550b1eff 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -248,7 +248,7 @@ class Info_amp extends CI_Controller
                 } else {
                     $use_photo = $this->config->item('site_image_url').$info->ic_photo;
                 }
-                if ($data['detail']->ic_type === 'c_attraction' || $data['detail']->ic_template === 'city_info_attractions_list' || $data['detail']->ic_template === 'r_tpl_empty_navi1p') {
+                if ($info->ic_type === 'c_attraction' || $info->ic_template === 'city_info_attractions_list' || $info->ic_template === 'r_tpl_empty_navi1p') {
                     $list_info = true;
                 } else {
                     $list_info = false;

From 498791988f8332ddd8108d41bb7a2939f6bc8a7b Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Wed, 6 Jun 2018 11:25:30 +0800
Subject: [PATCH 20/22] fix list info 3

---
 application/models/infoMetas_model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/models/infoMetas_model.php b/application/models/infoMetas_model.php
index a2dff370..d95b1def 100644
--- a/application/models/infoMetas_model.php
+++ b/application/models/infoMetas_model.php
@@ -67,6 +67,7 @@ class InfoMetas_model extends CI_Model {
             . "       ic.ic_content, \n"
             . "       ic.ic_photo, \n"
             . "       ic.ic_title, \n"
+            . "       ic.ic_type, \n"
             . "       im.im_id \n"
             . "       FROM   infoStructures is1 \n"
             . "       INNER JOIN infoContents ic ON ic.ic_id = is1.is_ic_id \n"

From 158b552d8e7669f5b952b936d7a073f4eec91659 Mon Sep 17 00:00:00 2001
From: lmrwork <59361885@qq.com>
Date: Wed, 6 Jun 2018 11:31:40 +0800
Subject: [PATCH 21/22] fix list info 4

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

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index 550b1eff..cd5e1b93 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -287,7 +287,7 @@ class Info_amp extends CI_Controller
                 }
                 echo json_encode(array(
                     "succ" => true,
-                    "info" => $ic->ic_content || $ic->ic_seo_description,
+                    "info" => $ic->ic_content ? $ic->ic_content : $ic->ic_seo_description,
 					"title" => $ic->ic_title,
                     "photo" => $use_photo,
                     "url" => $ic->ic_url,

From 1c5a135eba200dc8717f57b1d64e8adc4027bffe Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 6 Jun 2018 18:57:40 +0800
Subject: [PATCH 22/22] ic desf

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

diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php
index cd5e1b93..990f7f65 100644
--- a/application/controllers/info_amp.php
+++ b/application/controllers/info_amp.php
@@ -287,7 +287,7 @@ class Info_amp extends CI_Controller
                 }
                 echo json_encode(array(
                     "succ" => true,
-                    "info" => $ic->ic_content ? $ic->ic_content : $ic->ic_seo_description,
+                    "info" => $ic->ic_content ? $ic->ic_content : "<p>".$ic->ic_seo_description."</p>",
 					"title" => $ic->ic_title,
                     "photo" => $use_photo,
                     "url" => $ic->ic_url,