diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php index af9dd6cee..789a7b00e 100644 --- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php +++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php @@ -34,7 +34,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte { return [ '=' => ['store_id', 'paid', 'status', 'order_type'], - '%like' => ['order_id','order_sn'], + '%like' => ['order_id','order_sn', 'mark'], 'between_time' => 'create_time' ]; } diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php index 3b6290cb6..062022027 100644 --- a/app/admin/lists/store_product/StoreProductLists.php +++ b/app/admin/lists/store_product/StoreProductLists.php @@ -68,8 +68,15 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa if (!empty($this->params['user_id'])) { $userShip = User::where('id', $this->params['user_id'])->value('user_ship'); } - $list = StoreProduct::where($this->searchWhere) - ->limit($this->limitOffset, $this->limitLength) + $query = StoreProduct::where($this->searchWhere); + if (isset($this->params['type_filter'])) { + if ($this->params['type_filter'] == 0) { + $query->where('product_type', 6)->where('is_show', 0); + } else { + $query->where('is_show', 1); + } + } + $list = $query->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) use($is_warehouse, $userShip) { $item['product_id'] = $item['id'];