From 64bf8ac3afa9598d79065421d24c732bc5508e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Fri, 14 Jul 2017 09:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ta=E5=8E=9F=E5=A7=8B=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tripadvisor_spider/controllers/index.php     |  8 ++++----
 .../tripadvisor_spider/views/welcome.php         | 14 +++++++++++---
 application/views/bootstrap/header.php           | 16 +++++++++-------
 application/views/bootstrap3/header.php          |  3 +++
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/application/third_party/tripadvisor_spider/controllers/index.php b/application/third_party/tripadvisor_spider/controllers/index.php
index 0597d8a0..a33ec760 100644
--- a/application/third_party/tripadvisor_spider/controllers/index.php
+++ b/application/third_party/tripadvisor_spider/controllers/index.php
@@ -15,9 +15,10 @@ class Index extends CI_Controller {
     }
 
     public function index($city = 'Beijing') {
+        $this->permission->is_admin();
         $data = array();
         $data['city'] = $city;
-        $data['ta_review_list'] = $this->Tripadvisor_Review_model->search(20, $data['city']);
+        $data['ta_review_list'] = $this->Tripadvisor_Review_model->search(30, $data['city']);
         $this->load->view('bootstrap3/header', $data);
         $this->load->view('welcome');
         $this->load->view('bootstrap3/footer');
@@ -26,9 +27,8 @@ class Index extends CI_Controller {
     function auto_update($city = 'Beijing') {
         ini_set('max_execution_time', '100');
         $ta_website = $this->config->item('tripadvisor_website');
-        //分页代码,只查询前三页
-        $page_mark = array('-', '-or10-', '-or20-');
-        $page_mark = array('-');
+        //分页代码,只查询前三页，反过来查询，越早的越在后面
+        $page_mark = array('-or20-', '-or10-', '-');
 
         foreach ($ta_website as $key_city => $item_url) {
             if ($key_city == $city) {
diff --git a/application/third_party/tripadvisor_spider/views/welcome.php b/application/third_party/tripadvisor_spider/views/welcome.php
index c130bcbd..49352c01 100644
--- a/application/third_party/tripadvisor_spider/views/welcome.php
+++ b/application/third_party/tripadvisor_spider/views/welcome.php
@@ -19,14 +19,22 @@
 
         </div>
         <div class="col-md-19">
-            <div class="well well-sm">
+            <div class="well well-sm text-right">
                 <a href="<?php echo site_url('apps/tripadvisor_spider/index/auto_update/' . $city); ?>" target="_blank" class="btn btn-info">抓取新帖</a>
                 <a href="<?php echo site_url('apps/tripadvisor_spider/index/auto_update_content/'); ?>" target="_blank" class="btn btn-info">抓取内容</a> 
             </div>
-            <?php foreach ($ta_review_list as $key => $item) { ?>
+            <?php foreach ($ta_review_list as $key => $item) { 
+                //TA原帖链接
+                $ta_url='';
+                if(!empty($ta_website[$item->tr_city])){
+                    $ta_url=$ta_website[$item->tr_city].'#REVIEWS';
+                    $ta_url=str_ireplace('Attraction_Review','ShowUserReviews',$ta_url);
+                    $ta_url=str_ireplace('Reviews{PAGENUM}','r'.$item->tr_review_id.'-',$ta_url);
+                }
+                ?>
 
                 <div class="panel panel-default">
-                    <div class="panel-heading"><?php echo $item->tr_review_title; ?> <a class="pull-right" onclick="find_group_modal(<?php echo $item->tr_id; ?>);" >分析</a></div>
+                    <div class="panel-heading"><a href="<?php echo $ta_url; ?>" target="_blank" ><?php echo $item->tr_review_title; ?></a> <a class="pull-right" onclick="find_group_modal(<?php echo $item->tr_id; ?>);" >分析</a></div>
                     <div class="panel-body" >
 
                         <p><?php echo $item->tr_member_name; ?>:</p>
diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php
index b72b60a0..578b1108 100644
--- a/application/views/bootstrap/header.php
+++ b/application/views/bootstrap/header.php
@@ -73,13 +73,15 @@
                             更多<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
-                            <li><a target="_blank" href="http://www.arachina.com/html-tag-quick-query.htm">Html基础知识</a></li>
-                            <li><a target="_blank" href="<?php echo site_url('tools/old') ?>">老旧信息查询</a></li>
-                            <li><a target="_blank" href="<?php echo site_url('apps/pagespeed') ?>">页面性能分析</a></li>
-                            <li><a target="_blank" href="<?php echo site_url('seo') ?>">SEO管理</a></li>
-                            <li><a target="_blank" href="<?php echo site_url('thirdparty/public/infopayauthor') ?>">打赏统计</a></li>
-                            <li><a target="_blank" href="<?php echo site_url('thirdparty/form') ?>">表单管理</a></li>
-                            <li><a target="_blank" href="<?php echo site_url('thirdparty/advertise') ?>">广告管理</a></li>
+                                <li><a href="<?php echo site_url('apps/pagespeed') ?>">页面性能分析</a></li>
+                                <li><a href="<?php echo site_url('seo') ?>">SEO管理</a></li>
+                                <li> <a href="<?php echo site_url('thirdparty/public/infopayauthor') ?>">打赏统计</a></li>
+                                <li> <a href="<?php echo site_url('thirdparty/form') ?>">表单管理</a></li>
+                                <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 target="_blank" href="http://www.arachina.com/html-tag-quick-query.htm">Html基础知识</a></li>
+                                <li><a href="<?php echo site_url('setting') ?>">系统设置</a></li>
                         </ul>
                     </li>
 
diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php
index c5ef8df2..1daec3cb 100644
--- a/application/views/bootstrap3/header.php
+++ b/application/views/bootstrap3/header.php
@@ -82,6 +82,9 @@
                                 <li> <a href="<?php echo site_url('thirdparty/public/infopayauthor') ?>">打赏统计</a></li>
                                 <li> <a href="<?php echo site_url('thirdparty/form') ?>">表单管理</a></li>
                                 <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 target="_blank" href="http://www.arachina.com/html-tag-quick-query.htm">Html基础知识</a></li>
                                 <li><a href="<?php echo site_url('setting') ?>">系统设置</a></li>
                             </ul>
                         </li>