|
|
|
@ -183,7 +183,7 @@ class ComboController extends Controller
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$combos = DB::select("select * from combos as a LEFT JOIN (
|
|
|
|
$combos = DB::select("select * from combos as a LEFT JOIN (
|
|
|
|
select combo_id as c_id,count(*) as count from combo_items where status in(1) group by combo_id
|
|
|
|
select combo_id as c_id,count(*) as count from combo_items where status in(1) and keshi_name<>'材料费' group by combo_id
|
|
|
|
) as b on a.combo_id=b.c_id where a.status=1 " . $sql ." ", $canshu);
|
|
|
|
) as b on a.combo_id=b.c_id where a.status=1 " . $sql ." ", $canshu);
|
|
|
|
|
|
|
|
|
|
|
|
foreach ($combos as $key => $combo) {
|
|
|
|
foreach ($combos as $key => $combo) {
|
|
|
|
@ -198,7 +198,7 @@ select combo_id as c_id,count(*) as count from combo_items where status in(1) gr
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$combo->tag = $tags;
|
|
|
|
$combo->tag = $tags;
|
|
|
|
$combo->tag[] = [
|
|
|
|
$combo->tag[] = [
|
|
|
|
'text' => $combo->item_count . '个项目',
|
|
|
|
'text' => $combo->count . '个项目',
|
|
|
|
'text_color' => '#34C292',
|
|
|
|
'text_color' => '#34C292',
|
|
|
|
'color' => '#E9F8F3',
|
|
|
|
'color' => '#E9F8F3',
|
|
|
|
];
|
|
|
|
];
|
|
|
|
|