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

app/Http/Controllers/Web/OrderController.php

@@ -180,6 +180,7 @@ class OrderController extends Controller
                 ];
             }
             $data_single[]=(object)[
+                'id'=>$val['id'],
                 'name'=>$val['name'],
                 'data'=>$project
             ];
@@ -210,6 +211,7 @@ class OrderController extends Controller
                 foreach ($single as $k_s=>$v_s){
                     $singles[]=(object)[
                         'id'=>$v_s['id'],
+                        'cate_id'=> $v_s['cate_id'],
                         'name'=>$v_s['name'],
                         'price'=>$v_s['oldPrice'],
                         'youhui'=>$v_s['realPrice']