1

app/Service/ProductActivityService.php

@@ -171,7 +171,9 @@ class ProductActivityService extends Service
             ->select('id','title','crt_id','mark','start_time','end_time','crt_time','type')
             ->orderby('id', 'desc');
 
+        if(! empty($data['type'])) $model->where('type', $data['type']);
         if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
+        if(! empty($data['mark'])) $model->where('mark', 'LIKE', '%'.$data['mark'].'%');
         if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
             $return = $this->changeDateToTimeStampAboutRange($data['crt_time']);
             $model->where('crt_time','>=',$return[0]);