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

application/controllers/tools.php

@@ -65,6 +65,7 @@ class Tools extends CI_Controller
     public function amp_check()
     {
         $data['amp'] = $this->input->get_post('amp');
+        if (!$data['amp']) $data['amp'] = 'yes';
         //AMP转化列表
         if ($data['amp'] == 'yes') {
             $data['info'] = $this->InfoMetas_model->list_amp($this->site_code);

application/models/infoMetas_model.php

@@ -75,13 +75,9 @@ class InfoMetas_model extends CI_Model {
                        AND c.ic_sitecode = ?
                        AND c.ic_status = 1
                        AND CONVERT(varchar, im2.im_value) = '1'
-                ) 
-                AND c0.ic_sitecode = ?
-                AND c0.ic_status = 1 
-                AND c0.ic_url <> ''
+                ) AND c0.ic_sitecode = ? AND c0.ic_status = 1 AND c0.ic_url <> ''
         ";
-        echo $sql;
-        $query = $this->HT->query($sql, array($site_code));
+        $query = $this->HT->query($sql, array($site_code, $site_code));
         return $query->result();
     }
 

application/views/bootstrap/header.php

@@ -80,6 +80,7 @@
                                 <li><a href="<?php echo site_url('thirdparty/advertise') ?>">广告管理</a></li>
                                 <li><a href="<?php echo site_url('apps/tripadvisor_spider') ?>">TA评论采集</a></li>
                                 <li><a href="<?php echo site_url('tools/old') ?>">老旧信息查询</a></li>
+                                <li><a href="<?php echo site_url('tools/amp_check') ?>">AMP转化检查</a></li>
                                 <li><a target="_blank" href="http://www.arachina.com/html-tag-quick-query.htm">Html基础知识</a></li>
                                 <li><a target="_blank" href="https://docs.google.com/presentation/d/1YN9P8j837SCHenpK_UApHU04K6evV1-GLULhsdmdtWM/edit?usp=sharing">AMP知识及构建SOP</a></li>
                                 <li><a href="<?php echo site_url('setting') ?>">系统设置</a></li>

application/views/bootstrap3/header.php

@@ -87,6 +87,7 @@
                                 <li><a href="<?php echo site_url('thirdparty/advertise') ?>">广告管理</a></li>
                                 <li><a href="<?php echo site_url('apps/tripadvisor_spider') ?>">TA评论采集</a></li>
                                 <li><a href="<?php echo site_url('tools/old') ?>">老旧信息查询</a></li>
+                                <li><a href="<?php echo site_url('tools/amp_check') ?>">AMP转化检查</a></li>
                                 <li><a target="_blank" href="http://www.arachina.com/html-tag-quick-query.htm">Html基础知识</a></li>
                                 <li><a target="_blank" href="https://docs.google.com/presentation/d/1YN9P8j837SCHenpK_UApHU04K6evV1-GLULhsdmdtWM/edit?usp=sharing">AMP知识及构建SOP</a></li>
                                 <li><a href="<?php echo site_url('setting') ?>">系统设置</a></li>

application/views/tools/amp_check.php

@@ -95,7 +95,7 @@ $(function() {
                     <tr>
                       <th>#</th>
                       <th>文件名</th>
-                      <th width="6%">发布</th>
+                      <th width="6%">AMP转化</th>
                       <th width="6%"></th>
                     </tr>
                 </thead>