From 14c24eac0e818ec5f9d92fed4ccad8ca4b65e2a1 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 30 Oct 2017 14:23:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/keyworlds.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/application/controllers/keyworlds.php b/application/controllers/keyworlds.php
index 6048ebfd..5b412000 100644
--- a/application/controllers/keyworlds.php
+++ b/application/controllers/keyworlds.php
@@ -280,11 +280,12 @@ class Keyworlds extends CI_Controller {
         $source_flag = 'source';
         $last_rank   = $this->Keywordsrank_model->get_rank_list($kw_id, $top = 1);
         if (isset($last_rank[0]->kwr_datetime) and ( time() - $last_rank[0]->kwr_datetime) < 180) {
-            $data[] = array('name' => 'rank', 'value' => '查询过于频繁,请等待三分钟!');
-            echo json_encode($data);
-            return TRUE;
-        } else if (empty($last_rank[0]->kwr_mobile_rank) &&
-            (intval($last_rank[0]->kwr_datetime) - intval($today)) >= 0 ) {
+            // $data[] = array('name' => 'rank', 'value' => '查询过于频繁,请等待三分钟!');
+            // echo json_encode($data);
+            // return TRUE;
+        }
+        if ((intval($last_rank[0]->kwr_mobile_rank) == 0 || !isset($last_rank[0]->kwr_mobile_rank)) &&
+            (intval($last_rank[0]->kwr_datetime) >= intval($today)) ) {
             $client_flag = 'm';
             $rank_flag   = 'rank_m';
             $source_flag = 'source_m';
@@ -329,7 +330,7 @@ class Keyworlds extends CI_Controller {
             'name'  => 'rank',
             'value' => ($rank['rank'] . " / " . $rank["rank_m"]),
             'real'  => $rank_flag . " : " . $rank[$rank_flag],
-            'tmp' => intval($last_rank[0]->kwr_datetime) . "-" . intval($today)
+            'tmp' => intval($last_rank[0]->kwr_datetime) . "-" . intval($today) . $client_flag
         );
         echo json_encode($data);
         return TRUE;
@@ -352,7 +353,7 @@ class Keyworlds extends CI_Controller {
         $client_flag = "PC";
         $rank_flag   = 'rank';
         $source_flag = 'source';
-        if ((intval($worldsList[0]->kwr_datetime) - intval($today)) >= 0 ) {
+        if ((intval($worldsList[0]->kwr_datetime) >= intval($today)) ) {
             $client_flag = "m";
             $rank_flag   = 'rank_m';
             $source_flag = 'source_m';