Merge branch 'master' into development

app/Http/Controllers/OrderController.php

@@ -663,7 +663,9 @@ Class OrderController extends Controller
 
         // 待审核才可以
         if(!in_array($info['order_info']['status'], [-1, 1, 2])){ 
-            return redirect('/prompt')->with(['message'=>"该订单不符合人工审单条件~【status:{$info['order_info']['status']}】",'url' =>$_SERVER['HTTP_REFERER'], 'jumpTime'=>3,'status'=>false]);       
+            $redirect = $info['order_info']['order_goods_type'] == 1 ? '/list' : '/self_order';
+
+            return redirect('/prompt')->with(['message'=>"该订单不符合人工审单条件~【status:{$info['order_info']['status']}】",'url' =>$redirect, 'jumpTime'=>3,'status'=>false]);       
         }
 
         return view('detail', $info);