diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index 33d25eb..46b0272 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -183,7 +183,7 @@ class ComboController extends Controller $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); 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[] = [ - 'text' => $combo->item_count . '个项目', + 'text' => $combo->count . '个项目', 'text_color' => '#34C292', 'color' => '#E9F8F3', ];