分销商订单列表筛选仓库条件修改

app/Http/Controllers/Admin/OrderController.php

@@ -95,7 +95,7 @@ class OrderController extends Controller
             if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
             if(($status>=0)) $query->where('status', $status);
             if(($id>0)) $query->where('id', $id);
-            if(($warehouse>0)) $query->where('warehouse', $warehouse);
+            if($warehouse>0) $query->where('warehouse', $warehouse);
         })->where('is_del',0)->count();
         if ($count > 1) {
             // 总页数
@@ -115,7 +115,7 @@ class OrderController extends Controller
             if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
             if(($status>=0)) $query->where('status', $status);
             if(($id>0)) $query->where('id', $id);
-            if(($warehouse>0)) $query->where('warehouse', $warehouse);
+            if($warehouse>0) $query->where('warehouse', $warehouse);
         })->where('is_del',0)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
         $result = json_decode(json_encode($result),true);
         

resources/views/order/orderlist.blade.php

@@ -44,7 +44,7 @@
                 <select style="width:6%;text-align:center" id='warehouse' name="warehouse">
                     <option value="0" @if($warehouse=='0') selected @endif>-- 请选择--</option>
                     @foreach($warehouseArr as $warehouseVal=>$warehouseName)
-                        <option value="$warehouseVal" @if($warehouse==$warehouseVal) selected @endif>{{$warehouseName}}</option>
+                        <option value="{{$warehouseVal}}" @if($warehouse==$warehouseVal) selected @endif>{{$warehouseName}}</option>
                     @endforeach
                 </select> 
                 <div style="float:right">