Browse Source

分销商商品列表

shensong 5 years ago
parent
commit
1fe2815d90

+ 11 - 5
app/Http/Controllers/Admin/GoodsController.php

@@ -659,7 +659,11 @@ class GoodsController extends Controller
659 659
         //获取请求参数
660 660
         $name = $request->input('name');
661 661
         $cate_name = trim($request->input('cate_name'));
662
-        $status = $request->input('status',null);
662
+        $status = $request->input('status');
663
+
664
+        if(is_null($status)){
665
+            $status = 0;
666
+        }
663 667
 
664 668
         $page = (int)$request->input('page');
665 669
         $pageSize = 20;
@@ -684,6 +688,7 @@ class GoodsController extends Controller
684 688
                     'name'              =>$name,
685 689
                     'cate_name'         =>$cate_name,
686 690
                     'cates'             =>$cates,
691
+                    'status'            =>$status,
687 692
                 ]);
688 693
             }
689 694
         }
@@ -695,7 +700,7 @@ class GoodsController extends Controller
695 700
             }else if(count($goodsIds) == 1){
696 701
                 $query->where('goodsCode',$goodsIds);
697 702
             }
698
-            if(!is_null($status)) $query->where('is_del',$status);
703
+            if($status != '-1') $query->where('is_del',$status);
699 704
         })->count();
700 705
 
701 706
         //分页数据处理
@@ -715,7 +720,7 @@ class GoodsController extends Controller
715 720
             } else if(count($goodsIds) == 1){
716 721
                 $query->where('goodsCode',$goodsIds);
717 722
             }
718
-            if(!is_null($status)) $query->where('is_del',$status);
723
+            if($status != '-1') $query->where('is_del',$status);
719 724
         })->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
720 725
         $result = json_decode(json_encode($result),true);
721 726
 
@@ -732,7 +737,8 @@ class GoodsController extends Controller
732 737
         }
733 738
 
734 739
         //返回给页面
735
-        return view('goods/indexcopy', ['result' =>$result,
740
+        return view('goods/indexcopy', [
741
+            'result'            =>$result,
736 742
             'page'              =>$page,
737 743
             'count'             =>$count,
738 744
             'pages'             =>$pages,
@@ -774,7 +780,7 @@ class GoodsController extends Controller
774 780
             }else if(count($goodsIds) == 1){
775 781
                 $query->where('goodsCode',$goodsIds);
776 782
             }
777
-            if($status) $query->where('is_del',$status);
783
+            if($status != '-1') $query->where('is_del',$status);
778 784
         })->orderBy('id', 'desc')->get();
779 785
         $result = json_decode(json_encode($result),true);
780 786
 

+ 1 - 1
resources/views/goods/indexcopy.blade.php

@@ -20,7 +20,7 @@
20 20
             </select>
21 21
             <input class="input-text" style="width:5%;text-align:center" type="text" value="商品状态"/>
22 22
             <select class="select-box" style="width:7%;text-align:center" name="status" id='status'>
23
-                <option value="" @if($status=='') selected @endif>选择状态</option>
23
+                <option value="-1" @if($status=='-1') selected @endif>选择状态</option>
24 24
                 <option value="0" @if($status=='0') selected @endif>已上架</option>
25 25
                 <option value="1" @if($status=='1') selected @endif>已下架</option>
26 26
             </select>