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