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

application/config/config.php

@@ -383,7 +383,7 @@ $config['site'] = array(
     'diy' => array('site_code' => 'diy', 'site_id' => 99, 'site_lgc' => '1', 'sitemap_name' => 'E:/Dropbox/wwwroot/diychinatours.com/information.sitemap.xml', 'site_image_url' => '//images.diychinatours.com', 'site_url' => 'http://www.diychinatours.com', 'site_sitemap' => 'E:/Dropbox/wwwroot/diychinatours.com/information.sitemap.xml', 'site_authors' => array('ycc,lyy')),
     'ah' => array('site_code' => 'ah', 'site_id' => 141, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '//images.asiahighlights.com', 'site_url' => 'https://www.asiahighlights.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')),
     'pgr' => array('site_code' => 'pgr', 'site_id' => 148, 'site_lgc' => '2', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'http://www.peregrine.cn', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')),
-    'ts' => array('site_code' => 'ts', 'site_id' => 0, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'http://www.trainspread.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')),
+    'ts' => array('site_code' => 'ts', 'site_id' => 149, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'http://www.trainspread.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')),
     'bht' => array('site_code' => 'bht', 'site_id' => 6565, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'http://www.beijinghighlights.com', 'site_authors' => array('cj'))
 );
 

application/controllers/keyworlds.php

@@ -382,7 +382,7 @@ class Keyworlds extends CI_Controller {
             $source_flag = 'source_m';
         }
 
-        $today_0         = strtotime(date('Ymd000000'));
+        $today_0         = mktime(0,0,0,date("m"),(date("d")-$this->Keywords_model->catch_day), date("Y"));
         $today_24        = strtotime(date('Ymd235959'));
         $last_rank_today = $this->Keywordsrank_model->get_rank_list($worldsList[0]->kw_id,1,$today_0,$today_24);
         // $last_rank_today = $last_rank_pc;

application/models/infokeywords_model.php

@@ -2,6 +2,7 @@
 
 class infoKeywords_model extends CI_Model
 {
+    public $catch_day = 2;
     function __construct()
     {
         parent::__construct();
@@ -66,7 +67,7 @@ class infoKeywords_model extends CI_Model
     //获取关键词列表用于抓取排名
     public function get_keyworld_list_old($top = 1, $engines='',$site_code=false)
     {
-        $today = strtotime(date('Y-m-d'));
+        $today = mktime(0,0,0,date("m"),(date("d")-$this->catch_day), date("Y"));
         //只查某个站点，原因是个事业部服务器分开，只需要查询本事业部站点即可
         $map   = " ";
         if(!empty($site_code)){
@@ -80,7 +81,7 @@ class infoKeywords_model extends CI_Model
         }elseif ($engines=='eu') {
             $map.=" AND kw_sitecode in ('gm','vc','vac','ru','it','jp') ";
         }
-        $today0 = strtotime(date('Ymd000000'));
+        $today0 = mktime(0,0,0,date("m"),(date("d")-2), date("Y"));
         $sql = "SELECT TOP 1 kw_id,
                              kw_keyworlds,
                              kw_is_id,
@@ -97,7 +98,7 @@ class infoKeywords_model extends CI_Model
     }
     public function get_keyworld_list($top=1,$engines='',$site_code=false)
     {
-        $today0 = strtotime(date('Ymd000000'));
+        $today0 = mktime(0,0,0,date("m"),(date("d")-$this->catch_day), date("Y"));
         $map   = " ";
         //只查某个站点，原因是个事业部服务器分开，只需要查询本事业部站点即可
         if(!empty($site_code)){

application/views/bootstrap3/information_edit.php

@@ -542,8 +542,14 @@
                                 </label>
                             </div>
                             <div class="col-xs-17 text-right">
-                                <?php $amp_user = $this->session->userdata('session_admin'); ?>
-                                <label title="AMP页面编辑"><a href="http://europe.chtcdn.com/static/?icid=<?php echo($information->ic_id); ?>&usr=<?php echo(urlencode($amp_user['OPI_Name'])); ?>&photo=<?php echo(urlencode($this->config->item('site_image_url').$information->ic_photo)); ?>&url=<?php echo(urlencode($information->ic_url)); ?>" target="_blank">AMP构建工具</a></label> |
+                                <?php 
+                                $amp_user = $this->session->userdata('session_admin'); 
+                                $amp_photo = '';
+                                if ($information->ic_photo) {
+                                    $amp_photo = $this->config->item('site_image_url').$information->ic_photo;
+                                }
+                                ?>
+                                <label title="AMP页面编辑"><a href="/static/?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)); ?>" 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 {?>

application/views/keyworlds/index.php

@@ -43,7 +43,7 @@
         <div id="zhexiantu" class="span12" style="height:<?php if($wordcount==1) {echo '620px';}else{echo '1000px;';} ?>;margin-left:0;padding-right: 15px;"></div>
         <?php } if (!empty($rank_info)) { ?>
         <legend>排名情况</legend>
-        <!-- update time 3 -->
+        <!-- update time 0316 -3day -->
         <table class="table table-striped">
           <thead>
             <tr>