|
@@ -95,6 +95,9 @@ class OrderController extends Controller {
|
95
|
95
|
|
96
|
96
|
}
|
97
|
97
|
}
|
|
98
|
+ $goods = json_decode(json_encode($goods), true);
|
|
99
|
+ $v['sku_count'] = count($goods);
|
|
100
|
+ $goods = array_slice($goods, 0, 2);
|
98
|
101
|
$v['skus'] = $goods;
|
99
|
102
|
|
100
|
103
|
#加粉时间
|
|
@@ -941,6 +944,6 @@ class OrderController extends Controller {
|
941
|
944
|
$order->coupon_id = DB::table('customer_coupons')->where('order_id', $id)->where('is_use', 1)->pluck('id');
|
942
|
945
|
}
|
943
|
946
|
|
944
|
|
- return self::returnValue(['data'=>$result]);
|
|
947
|
+ return self::returnValue(['data'=>$order]);
|
945
|
948
|
}
|
946
|
949
|
}
|