From 2842786d59aa0079922ea234ed33d68f2d6b093c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Tue, 20 Jun 2017 10:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=BF=94=E5=9B=9E200?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/pagespeed/controllers/index.php | 4 ++--
 application/third_party/pagespeed/views/search.php      | 5 +++--
 application/views/bootstrap3/information_edit.php       | 3 +++
 js/information-system3.min.js                           | 3 +--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/application/third_party/pagespeed/controllers/index.php b/application/third_party/pagespeed/controllers/index.php
index 88210ae1..87148c2e 100644
--- a/application/third_party/pagespeed/controllers/index.php
+++ b/application/third_party/pagespeed/controllers/index.php
@@ -97,14 +97,14 @@ class Index extends CI_Controller {
         }
         $desktop_object = json_decode($desktop_data);
         $mobile_object = json_decode($mobile_data);
-        if (!empty($desktop_object->error) || !empty($mobile_object->error)) {
+        if (isset($desktop_object->error) || isset($mobile_object->error)) {
             $this->PageSpeedData_model->update_error($pagespeed_data->psd_id);
             echo json_encode(array('result' => 'error', 'data' => 'API返回错误'));
             log_message('error ', 'pagespeed_error:' . json_encode($desktop_object) . ' ' . json_encode($mobile_object));
             return false;
         }
 
-        if (!$desktop_object->responseCode == '200' || !$mobile_object->responseCode == '200') {
+        if ($desktop_object->responseCode !== '200' || $mobile_object->responseCode !== '200') {
             $this->PageSpeedData_model->update_error($pagespeed_data->psd_id);
             echo json_encode(array('result' => 'error', 'data' => 'API返回错误，网页打不开'));
             log_message('error ', 'pagespeed_error:' . json_encode($desktop_object) . ' ' . json_encode($mobile_object));
diff --git a/application/third_party/pagespeed/views/search.php b/application/third_party/pagespeed/views/search.php
index 1d4dac44..d766a811 100644
--- a/application/third_party/pagespeed/views/search.php
+++ b/application/third_party/pagespeed/views/search.php
@@ -10,7 +10,7 @@ foreach ($score_data_list as $key => $item) {
         <thead>
             <tr>
                 <th class="col-sm-1">#</th>
-                <th class="col-sm-3">页面</th>
+                <th class="col-sm-5">页面</th>
                 <th class="col-sm-1">移动端</th>
                 <th class="col-sm-1">桌面端</th>
                 <th class="col-sm-2">更新时间</th>
@@ -30,7 +30,8 @@ foreach ($score_data_list as $key => $item) {
                         <td><?php echo $item->psd_DesktopScore; ?></td>
                         <td><?php echo date('Y-m-d', strtotime($item->psd_Datetime)); ?></td>
                         <td>
-                            <a href="<?php echo $site_url . $item->psd_URL ?>" target="_blank">查看页面</a>  |  <a href="https://developers.google.com/speed/pagespeed/insights/?url=<?php echo urlencode($site_url . $item->psd_URL); ?>" target="_blank">Google insights</a>
+                            <a href="<?php echo $site_url . $item->psd_URL ?>" target="_blank">查看页面</a>  |
+                            <a href="https://developers.google.com/speed/pagespeed/insights/?url=<?php echo urlencode($site_url . $item->psd_URL); ?>" target="_blank">Google insights</a> 
                         </td>
                     </tr>
                     <?php
diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index f1b965a4..29a939de 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -439,6 +439,9 @@
         init_recommend_popover("#meta_recommend_info", ".meta_recommend_info_box");
         init_recommend_popover("#meta_related_info", ".meta_related_info_box");
         init_recommend_popover("#meta_bread_info", ".meta_bread_info_box");
+        
+        //自动读取google网页性能评分
+        setTimeout(function(){mobile_friendly(),1000});
     });
 
     var editor;
diff --git a/js/information-system3.min.js b/js/information-system3.min.js
index 643850e7..1eb41629 100644
--- a/js/information-system3.min.js
+++ b/js/information-system3.min.js
@@ -545,7 +545,6 @@ $(document).ready(function() {
             showButtonPanel: true
      });
      
-     
-     setTimeout(function(){mobile_friendly(),1000});
+    
 	 
 });
\ No newline at end of file