wesmiler 报恩寺项目提交

app/Services/GoodsService.php

@@ -116,11 +116,6 @@ class GoodsService extends BaseService
             ->leftJoin('goods_cates as c', 'g.cate_id', '=', 'c.id')
             ->where(function ($query) use ($params) {
                 $query->where(['g.mark'=>1,'g.status'=> 1]);
-                $keyword = isset($params['keyword']) ? trim($params['keyword']) : '';
-                if (!empty($keyword)) {
-                    $query->where('g.title', 'like', "%{$keyword}%");
-                }
-
                 $cateId = isset($params['cate_id']) ? intval($params['cate_id']) : 0;
                 if ($cateId > 0) {
                     $query->where('g.cate_id', $cateId);
@@ -129,6 +124,12 @@ class GoodsService extends BaseService
                 }
 
             })
+            ->where(function($query) use($params){
+                $keyword = isset($params['keyword']) ? trim($params['keyword']) : '';
+                if (!empty($keyword)) {
+                    $query->where('g.title', 'like', "%{$keyword}%")->orWhere('c.name','like',"%{$keyword}%");
+                }
+            })
             ->select(['g.id', 'g.cate_id', 'c.name as cate_name', 'g.title', 'g.stock','g.score', 'g.price', 'g.specs', 'g.thumb', 'g.status', 'g.create_time', 'g.description', 'g.view_num','g.is_recommand'])
             ->orderBy('g.create_time', 'desc')
             ->paginate($pageSize);