diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php index 9c37ba2..fd5fb74 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php @@ -147,7 +147,7 @@ class PlanController extends Controller foreach ($list as $k => $v) { $list[$k]->plan_type_name = ''; foreach ($plan_model as $k1 => $v1) { - if ($v1->model_id == $v->model_id) { + if ($v1->model_id == $v->model_id and $v1->time == $v->time) { $list[$k]->plan_type_name = $v1->plan_type_name; break; } diff --git a/h5/pages/main/combo/combo.vue b/h5/pages/main/combo/combo.vue index 78f2da2..e32a0b5 100644 --- a/h5/pages/main/combo/combo.vue +++ b/h5/pages/main/combo/combo.vue @@ -498,6 +498,7 @@ } getComboList(); } +