Merge branch 'master' of http://git.9026.com/richod/dcj

app/Http/Controllers/Web/OrderController.php

@@ -232,7 +232,7 @@ class OrderController extends Controller
             $data_single_check = json_encode($singles);
             $data_combo_check = json_encode($combos);
         //dd($data_single);
-            return view('web.order.result',compact('data_single_check','data_combo_check','data_single','data_combo'));
+            return view('web.order.result',compact('data_single_check','data_combo_check','data_single','data_combo','id'));
         }elseif(!$checkorder){
             return redirect('web/Index/index');
         }