|
@@ -41,8 +41,8 @@ class OrderController extends Controller
|
41
|
41
|
|
42
|
42
|
$stime = $request->input('stime');
|
43
|
43
|
$etime = $request->input('etime');
|
44
|
|
- $receiverName = $request->input('receiverName');
|
45
|
|
- $receiverMobile = $request->input('receiverMobile');
|
|
44
|
+ $receiverName = trim($request->input('receiverName'));
|
|
45
|
+ $receiverMobile = trim($request->input('receiverMobile'));
|
46
|
46
|
|
47
|
47
|
$count = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile){
|
48
|
48
|
if($admin_id) $query->where('admin_id', $admin_id);
|
|
@@ -126,8 +126,8 @@ class OrderController extends Controller
|
126
|
126
|
$stime = $request->input('stime');
|
127
|
127
|
$etime = $request->input('etime');
|
128
|
128
|
$delivery_type = (int)$request->input('delivery_type'); //发货状态 0到发货时间(未填物流信息) 2全部
|
129
|
|
- $receiverName = $request->input('receiverName');
|
130
|
|
- $receiverMobile = $request->input('receiverMobile');
|
|
129
|
+ $receiverName = trim($request->input('receiverName'));
|
|
130
|
+ $receiverMobile = trim($request->input('receiverMobile'));
|
131
|
131
|
|
132
|
132
|
//仓库管理员只能看到发货之前的订单
|
133
|
133
|
$today_date = date('Y-m-d');
|