|
@@ -65,7 +65,7 @@ class Order extends BaseController
|
|
65
|
public function getAllList()
|
65
|
public function getAllList()
|
|
66
|
{
|
66
|
{
|
|
67
|
[$page, $limit] = $this->getPage();
|
67
|
[$page, $limit] = $this->getPage();
|
|
68
|
- $where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','order_ids','paid', 'zero_line_uid']);
|
|
|
|
|
|
68
|
+ $where = $this->request->params(['type', 'date', 'mer_id', 'keywords', 'product_keywords', 'status', 'username', 'order_sn', 'order_ids', 'paid', 'zero_line_uid']);
|
|
69
|
|
69
|
|
|
70
|
$pay_type=$this->request->param('pay_type');
|
70
|
$pay_type=$this->request->param('pay_type');
|
|
71
|
if($pay_type==1 || $pay_type==4){
|
71
|
if($pay_type==1 || $pay_type==4){
|