Merge branch 'master' into dev
commit
48ff51cc3d
|
|
@ -60,7 +60,7 @@ class Order extends Common
|
|||
'total' => $total,
|
||||
'where' => $this->data_request,
|
||||
'page' => $this->page,
|
||||
'url' => MyUrl('admin/order/index'),
|
||||
'url' => MyUrl('index/order/index'),
|
||||
];
|
||||
$page = new \base\Page($page_params);
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ class UserIntegral extends Common
|
|||
'total' => $total,
|
||||
'where' => $this->data_request,
|
||||
'page' => $this->page,
|
||||
'url' => MyUrl('admin/userintegral/index'),
|
||||
'url' => MyUrl('index/userintegral/index'),
|
||||
];
|
||||
$page = new \base\Page($page_params);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue