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 @@