|
@@ -118,9 +118,9 @@ class UserBillController
|
|
|
list($page, $limit,$data) = UtilService::getMore([
|
|
list($page, $limit,$data) = UtilService::getMore([
|
|
|
['page', 0],
|
|
['page', 0],
|
|
|
['limit', 0],
|
|
['limit', 0],
|
|
|
- ['data','']
|
|
|
|
|
|
|
+ ['date','']
|
|
|
], $request, true);
|
|
], $request, true);
|
|
|
- return app('json')->successful(UserBill::getUserBillList($request->uid(), $page, $limit, $type,['data'=>$data]));
|
|
|
|
|
|
|
+ return app('json')->successful(UserBill::getUserBillList($request->uid(), $page, $limit, $type,['date'=>$data]));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -357,9 +357,9 @@ class UserBillController
|
|
|
public function integral_list(Request $request)
|
|
public function integral_list(Request $request)
|
|
|
{
|
|
{
|
|
|
list($page, $limit, $status,$data) = UtilService::getMore([
|
|
list($page, $limit, $status,$data) = UtilService::getMore([
|
|
|
- ['page', 0], ['limit', 0], ['pm', 0],['data','']
|
|
|
|
|
|
|
+ ['page', 0], ['limit', 0], ['pm', 0],['date','']
|
|
|
], $request, true);
|
|
], $request, true);
|
|
|
- return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'integral', ['pm' => $status,'data'=>$data]));
|
|
|
|
|
|
|
+ return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'integral', ['pm' => $status,'date'=>$data]));
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|