From 1bbb725d9510740b47fea094342fcb62db000d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Mon, 19 Jun 2017 15:56:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpagespeed=E4=B8=8D=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E7=AB=99=E7=82=B9=E5=92=8C=E8=AE=BE=E5=A4=87=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/pagespeed/controllers/index.php     | 2 +-
 .../third_party/pagespeed/models/PageSpeedData_model.php    | 4 ++--
 application/third_party/pagespeed/views/welcome.php         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/third_party/pagespeed/controllers/index.php b/application/third_party/pagespeed/controllers/index.php
index 84e81a3f..88210ae1 100644
--- a/application/third_party/pagespeed/controllers/index.php
+++ b/application/third_party/pagespeed/controllers/index.php
@@ -26,7 +26,7 @@ class Index extends CI_Controller {
         $device = $this->input->post('device');
         $start_score = $this->input->post('start_score');
         $end_score = $this->input->post('end_score');
-        $data['score_data_list'] = $this->PageSpeedData_model->search_score_list($start_score, $end_score, $device, $this->config->item('site_code'));
+        $data['score_data_list'] = $this->PageSpeedData_model->search_score_list($start_score, $end_score, $this->config->item('site_code'), $device);
         if (empty($data['score_data_list'])) {
             echo json_encode('没有找到数据');
         } else {
diff --git a/application/third_party/pagespeed/models/PageSpeedData_model.php b/application/third_party/pagespeed/models/PageSpeedData_model.php
index e8008b85..75f83518 100644
--- a/application/third_party/pagespeed/models/PageSpeedData_model.php
+++ b/application/third_party/pagespeed/models/PageSpeedData_model.php
@@ -129,10 +129,10 @@ class PageSpeedData_model extends CI_Model {
         $this->topnum = 50;
         $this->where = ' AND  psd.psd_SiteCode=' . $this->INFO->escape($psd_SiteCode);
         if ($device == 'moblie') {
-            $this->where = " AND  psd.psd_MobileScore BETWEEN $start_score AND $end_score ";
+            $this->where .= " AND  psd.psd_MobileScore BETWEEN $start_score AND $end_score ";
             $this->orderby = ' ORDER BY psd_MobileScore ASC ';
         } else {
-            $this->where = " AND  psd.psd_DesktopScore BETWEEN $start_score AND $end_score ";
+            $this->where .= " AND  psd.psd_DesktopScore BETWEEN $start_score AND $end_score ";
             $this->orderby = ' ORDER BY psd_DesktopScore ASC ';
         }
         return $this->get_list();
diff --git a/application/third_party/pagespeed/views/welcome.php b/application/third_party/pagespeed/views/welcome.php
index b709651e..34265f84 100644
--- a/application/third_party/pagespeed/views/welcome.php
+++ b/application/third_party/pagespeed/views/welcome.php
@@ -49,10 +49,10 @@
 <form class="form-inline" method="post" name="form_score_search" id="form_score_search" action="<?php echo site_url('apps/pagespeed/index/search_score'); ?>">
     <div class="form-group">
         <label for="exampleInputEmail1"></label>
-        <input type="number" class="form-control" id="exampleInputEmail1" name="start_score" placeholder="开始分数">
-        <input type="number" class="form-control" id="exampleInputPassword1" name="end_score" placeholder="结束分数">
+        <input type="number" class="form-control" id="start_score" name="start_score" placeholder="开始分数">
+        <input type="number" class="form-control" id="end_score" name="end_score" placeholder="结束分数">
         <select class="form-control" name="device">
-            <option value="mobile">Mobile</option>
+            <option value="moblie">Mobile</option>
             <option value="desktop">Desktop</option>
         </select>
     </div>