|
@@ -34,9 +34,11 @@ class GoodsController extends Controller
|
34
|
34
|
$stime = $request->input('stime');
|
35
|
35
|
$etime = $request->input('etime');
|
36
|
36
|
$name = $request->input('name');
|
|
37
|
+ $cate_name = trim($request->input('cate_name'));
|
37
|
38
|
|
38
|
|
- $count = Goods::where(function($query) use($name, $stime, $etime){
|
|
39
|
+ $count = Goods::where(function($query) use($name, $stime, $etime, $cate_name){
|
39
|
40
|
if($name) $query->where('name', 'like', $name.'%');
|
|
41
|
+ if($cate_name) $query->where('goodsCategoryName', '=', $cate_name);
|
40
|
42
|
if($stime) $query->where('createTime', '>=', $stime);
|
41
|
43
|
if($etime) $query->where('createTime', '<=', $etime);
|
42
|
44
|
})->where('is_del',0)->count();
|
|
@@ -48,8 +50,9 @@ class GoodsController extends Controller
|
48
|
50
|
$pages = 1;
|
49
|
51
|
}
|
50
|
52
|
|
51
|
|
- $result = Goods::where(function($query) use($name, $stime, $etime){
|
|
53
|
+ $result = Goods::where(function($query) use($name, $stime, $etime, $cate_name){
|
52
|
54
|
if($name) $query->where('name', 'like', $name.'%');
|
|
55
|
+ if($cate_name) $query->where('goodsCategoryName', '=', $cate_name);
|
53
|
56
|
if($stime) $query->where('createTime', '>=', $stime);
|
54
|
57
|
if($etime) $query->where('createTime', '<=', $etime);
|
55
|
58
|
})->where('is_del',0)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
|
|
@@ -61,13 +64,17 @@ class GoodsController extends Controller
|
61
|
64
|
$v['sku_list'] = $skuList;
|
62
|
65
|
}
|
63
|
66
|
|
|
67
|
+ //获取分类
|
|
68
|
+ $cates = DB::table('categorys')->lists('name', 'id');
|
64
|
69
|
return view('goods/index', ['result' =>$result,
|
65
|
70
|
'page' =>$page,
|
66
|
71
|
'count' =>$count,
|
67
|
72
|
'pages' =>$pages,
|
68
|
73
|
'stime' =>$stime,
|
69
|
74
|
'etime' =>$etime,
|
70
|
|
- 'name' =>$name,
|
|
75
|
+ 'name' =>$name,
|
|
76
|
+ 'cate_name' =>$cate_name,
|
|
77
|
+ 'cates' =>$cates,
|
71
|
78
|
]);
|
72
|
79
|
}
|
73
|
80
|
|