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

application/controllers/information.php

@@ -844,6 +844,12 @@ class Information extends CI_Controller
         // },$ic_content);
 
         //$ic_content = '<div class="container-details details-content">'.$ic_content.'</div>'; //兼容拷贝过来的内容样式
+
+        //图片加延迟
+        $ic_content=$this->html_optimize_lib->set_lazy_loader($ic_content,'https://data.chinatravel.com/images/mobile-first/grey.gif');
+
+        $ic_content = $this->html_optimize_lib->set_image_size($ic_content);
+
         $data["CUSTOMCONENT"] = $ic_content;
 
 
@@ -1071,20 +1077,6 @@ class Information extends CI_Controller
         file_put_contents($html_path, $template, LOCK_EX);
 
 
-        // //Google广告代码
-        // if (!empty(get_meta($information->ic_id, 'meta_google_ad_content'))) {
-        //     $template = str_replace('<!--@Match-Content-GOOGLE@-->', '<script  async  src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:block" data-ad-format="autorelaxed" data-ad-client="ca-pub-4231674166786366" data-ad-slot="1447610161"></ins><script>(adsbygoogle =  window.adsbygoogle || []).push({});</script>', $template);
-        // }
-        // if (!empty(get_meta($information->ic_id, 'meta_google_ad_article'))) {
-        //     $in_article_google=$this->load->view($template_path.'-google-ad', false,true);
-        //     $template = str_replace('<!--@IN-ARTICLE-GOOGLE@-->', $in_article_google, $template);
-        // }
-
-        // //设置图片尺寸
-        // //$template=$this->html_optimize_lib->set_image_size($template);
-        // // /travelguide/chinese-zodiac/monthly-fortune-for-dog.htm
-
-
     }
 
     //通过内容找到第一张图片

application/views/bootstrap3/header.php

@@ -142,7 +142,7 @@
                                 <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知识</a></li>
-								<li><a href="<?php echo site_url('city/addnode/-99') ?>">添加信息分组</a></li>
+								<!--<li><a href="<?php echo site_url('city/addnode/-99') ?>">添加信息分组</a></li>-->
                                 <li><a target="_blank" href="https://docs.google.com/presentation/d/1E9dbrANxtvgsOTkJWWab-UNaBgRJyQwNYu9Tw5k5jUI/edit?usp=sharing">AMP操作SOP</a></li>
                                 <li><a target="_blank" href="https://docs.google.com/presentation/d/1_SN8Eo3EFmigfyYrtX7WTkiGKqgvc0EBBS3YoXeZSBc/edit#slide=id.g45b539c835_4_61">HTML构建工具V3</a></li>
                                 <li><a target="_blank" href="https://docs.google.com/presentation/d/1zPc7832vManRsCgkgO5XoMVKe6deIHC9zsmLPWihxrA/edit?usp=sharing">PS基础课件</a></li>