Commit a1517476 authored by agping's avatar agping

判断修改

parent e43c6dde
...@@ -24,9 +24,7 @@ class Collection extends Basic ...@@ -24,9 +24,7 @@ class Collection extends Basic
*/ */
public function getCollection() { public function getCollection() {
if ($this->request->isGet()) { if ($this->request->isAjax()) {
return view('getCollection');
} elseif ($this->request->isAjax()) {
$order = new OPayLogModel(); $order = new OPayLogModel();
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo']; $pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize']; $pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
...@@ -81,6 +79,8 @@ class Collection extends Basic ...@@ -81,6 +79,8 @@ class Collection extends Basic
$data['data']['total'] = $order->getAddPayLogOrderListLmitTotal($where); $data['data']['total'] = $order->getAddPayLogOrderListLmitTotal($where);
$data['data']['money_total'] = $order->getMoneyTotal(); //总额 $data['data']['money_total'] = $order->getMoneyTotal(); //总额
return $this->response(200, "", $data['data']); return $this->response(200, "", $data['data']);
} elseif ($this->request->isGet()) {
return view('getCollection');
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment