diff --git a/control/index.php b/control/index.php index 154a5c8..9ec39e1 100644 --- a/control/index.php +++ b/control/index.php @@ -146,10 +146,16 @@ class index extends publicBase { if (!$data) $this->ajax_json(false, $m_user_case->getError()); $total = $m_user_case->getUserCaseListCount($uid); - $return = array('total' => $total, 'current_page' => $page_num, 'total_page' => ceil($total / $page_size)); - $return = array_merge($return, $data); + $rdata = array( + 'total'=>$total, + 'per_page' => $page_size, + 'last_page' => ceil($total / $page_size), + 'current_page' => $page_num, + 'data' => $data['list'], + 'case_data' => $data['case_data'] + ); - $this->ajax_json(true, '获取成功', $return); + $this->ajax_json(true, '获取成功', $rdata); } public function ajax_user_case_detail() { @@ -232,7 +238,15 @@ class index extends publicBase { $robj->setex($data_key, 60, json_encode($data)); $pdf_url = $m_user_case->createPdf($uid, $data_key); - $this->ajax_json(true, '获取成功', array('total' => $total, 'current_page' => $page_num, 'total_page' => ceil($total / $page_size), 'pdf_url' => $pdf_url)); + $rdata = array( + 'total'=>$total, + 'per_page' => $page_size, + 'last_page' => ceil($total / $page_size), + 'current_page' => $page_num, + 'data' => $pdf_url, + ); + + $this->ajax_json(true, '获取成功', $rdata); } public function export_user_case() {