diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index 021a23e..016e034 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php
@@ -97,6 +97,19 @@ class ComboController extends Controller
}
}
+ if(isset($combo_item)){
+ $combo_ids=DB::table('combo_items')->whereIn('item_id',$combo_item)->where(['status'=>1])
+ ->groupBy('combo_id')
+ ->havingRaw('COUNT(DISTINCT item_id) = '.count($combo_item))
+ ->pluck('combo_id')->toArray();
+ $count = count($combo_ids);
+ $placeholders = implode(', ', array_fill(0, $count, '?'));
+
+ $sql = $sql . " and a.combo_id in ($placeholders) ";
+
+ $canshu =array_merge($canshu, $combo_ids);
+
+ }
diff --git a/h5/pages/main/index/index.vue b/h5/pages/main/index/index.vue
index f23e395..09dab1f 100644
--- a/h5/pages/main/index/index.vue
+++ b/h5/pages/main/index/index.vue
@@ -261,7 +261,7 @@
- 10112145
+ 10131106