加数据效验

app/Http/Controllers/Admin/OrderController.php

@@ -148,6 +148,7 @@ class OrderController extends Controller
             'receiverMobile'       =>$receiverMobile,
             'status'            =>$status,
             'id'            =>$id,
+            'last_url'      => 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
             ]);
     }
 
@@ -361,6 +362,7 @@ class OrderController extends Controller
             'receiverMobile'       =>$receiverMobile,
             'status'            =>$status,
             'if_all'            =>$if_all,
+            'last_url'      => 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
             ]);
     }
 
@@ -388,29 +390,35 @@ class OrderController extends Controller
     public function orderstore(Request $request)
     {       
         $this->validate($request, [
-            'customerName'           => 'required', 
-            'receiverName'           => 'required', 
-            'receiverMobile'           => 'required',  
-            'fanTime'           => 'required', 
-            'receiverState'           => 'required', 
-            'receiverCity'           => 'required', 
+            'customerName'           => 'required|between:1,6', 
+            'receiverName'           => 'required|between:1,6', 
+            'receiverMobile'           => 'required|regex:/^1[3456789]\d{9}$/',  
+            'fanTime'           => 'required|date', 
+            'receiverState'           => 'required|between:1,5', 
+            'receiverCity'           => 'required|between:1,10', 
             'receiverAddress'           => 'required', 
-            'delivery_date'           => 'required', 
-            'createTime'           => 'required', 
-            'receivedAmount'           => 'required', 
-            'goods_note'           => 'required',  
+            'delivery_date'           => 'required|date', 
+            'createTime'           => 'required|date', 
+            'receivedAmount'           => 'required|numeric|min:1', 
+            'goods_note'           => 'required|min:1',  
             'warehouse'           => 'required|integer|min:1',  
         ], [                  
             'customerName.required'           => '买家姓名不能为空',                   
-            'receiverName.required'           => '收货人不能为空',                   
+            'customerName.between'           => '买家姓名不能超过6个字符',                   
+            'receiverName.required'           => '收货人不能为空', 
+            'receiverName.between'           => '收货人不能超过6个字符',                  
             'receiverMobile.required'           => '收货人手机号不能为空',                   
+            'receiverMobile.regex'           => '收货人手机号格式有误',                   
             'fanTime.required'           => '加粉时间不能为空',              
             'receiverState.required'           => '省不能为空',   
+            'receiverState.between'           => '省填写有误',   
             'receiverCity.required'           => '市不能为空',   
+            'receiverCity.between'           => '市填写有误',   
             'receiverAddress.required'           => '详细地址不能为空',             
             'delivery_date.required'           => '预发货时间不能为空',   
             'createTime.required'           => '下单时间不能为空',   
             'receivedAmount.required'           => '付款金额不能为空',                   
+            'receivedAmount.numeric'           => '付款金额必须为数字',                   
             'goods_note.required'           => '商品信息不能为空',                   
             'warehouse.required'           => '仓库必须选择',                   
             'warehouse.min'           => '仓库必须选择',                   
@@ -570,6 +578,7 @@ class OrderController extends Controller
         $receiverMobile = $request->input('receiverMobile');
         $admin_id = (int)$request->input('admin_id');
         $page = (int)$request->input('page');
+        $last_url = $request->input('last_url');
 
         $self_role = session('role_name');
         //$catelist =  DB::table('goods_category')->select(DB::raw('distinct goods_category_name'))->lists('goods_category_name');
@@ -587,7 +596,7 @@ class OrderController extends Controller
             'teamlist'=>$teamList,
             'self_role'=>$self_role,
             'str_query'=> 'page='.$page.'&admin_id='.$admin_id.'&stime='.$stime.'&etime='.$etime.'&receiverName='.$receiverName.'&receiverMobile='.$receiverMobile,
-            'last_url' => $_SERVER['HTTP_REFERER'],
+            'last_url' => $last_url,
         ]);
 
     }
@@ -601,27 +610,33 @@ class OrderController extends Controller
     {    
         $this->validate($request, [
             'id'           => 'required',
-            'customerName'           => 'required', 
-            'receiverName'           => 'required', 
-            'receiverMobile'           => 'required',  
-            'receiverState'           => 'required', 
-            'receiverCity'           => 'required', 
+            'customerName'           => 'required|between:1,6', 
+            'receiverName'           => 'required|between:1,6', 
+            'receiverMobile'           => 'required|regex:/^1[3456789][\d\*]{9}$/',   
+            'receiverState'           => 'required|between:1,5', 
+            'receiverCity'           => 'required|between:1,10', 
             'receiverAddress'           => 'required', 
-            'delivery_date'           => 'required', 
-            'createTime'           => 'required', 
-            'receivedAmount'           => 'required', 
-            'goods_note'           => 'required',  
-            'warehouse'           => 'required|integer|min:1',  
+            'delivery_date'           => 'required|date', 
+            'createTime'           => 'required|date', 
+            'receivedAmount'           => 'required|numeric|min:1', 
+            'goods_note'           => 'required|min:1',  
+            'warehouse'           => 'required|integer|min:1',    
         ], [                  
             'customerName.required'           => '买家姓名不能为空',                   
-            'receiverName.required'           => '收货人不能为空',                   
-            'receiverMobile.required'           => '收货人手机号不能为空',                                 
+            'customerName.between'           => '买家姓名不能超过6个字符',                   
+            'receiverName.required'           => '收货人不能为空', 
+            'receiverName.between'           => '收货人不能超过6个字符',                  
+            'receiverMobile.required'           => '收货人手机号不能为空',                   
+            'receiverMobile.regex'           => '收货人手机号格式有误',                                 
             'receiverState.required'           => '省不能为空',   
+            'receiverState.between'           => '省填写有误',   
             'receiverCity.required'           => '市不能为空',   
+            'receiverCity.between'           => '市填写有误',   
             'receiverAddress.required'           => '详细地址不能为空',             
             'delivery_date.required'           => '预发货时间不能为空',   
             'createTime.required'           => '下单时间不能为空',   
             'receivedAmount.required'           => '付款金额不能为空',                   
+            'receivedAmount.numeric'           => '付款金额必须为数字',                   
             'goods_note.required'           => '商品信息不能为空',                   
             'warehouse.required'           => '仓库必须选择',                   
             'warehouse.min'           => '仓库必须选择',                   

resources/views/order/orderlist.blade.php

@@ -194,8 +194,9 @@
             var etime = $('#etime').val();
             var receiverName = $('#receiverName').val();
             var receiverMobile = $('#receiverMobile').val();
+            var last_url = '{{$last_url}}';
 
-            location.href="/admin/order/edit/"+id+'?page='+page+'&admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
+            location.href="/admin/order/edit/"+id+'?page='+page+'&admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile+'&last_url='+last_url;
         }
         /*广告-设为首页显示*/
         function up(obj,id){

resources/views/order/predictorderlist.blade.php

@@ -198,8 +198,9 @@
             var etime = $('#etime').val();
             var receiverName = $('#receiverName').val();
             var receiverMobile = $('#receiverMobile').val();
+            var last_url = '{{$last_url}}';
 
-            location.href="/admin/order/edit/"+id+'?page='+page+'&admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
+            location.href="/admin/order/edit/"+id+'?page='+page+'&admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile+'&last_url='+last_url;
         }
         /*广告-设为首页显示*/
         function up(obj,id){

resources/views/order/warehouselist.blade.php

@@ -144,7 +144,13 @@
         }
         /*广告-编辑*/
         function order_edit(title,id){
-            location.href="/admin/order/edit/"+id;
+            var page = {{$page}};
+            var stime = $('#stime').val();
+            var etime = $('#etime').val();
+            var receiverName = $('#receiverName').val();
+            var receiverMobile = $('#receiverMobile').val();
+
+            location.href="/admin/order/edit/"+id+'?page='+page+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
         }
         /*广告-设为首页显示*/
         function up(obj,id){