diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index 2df09d6..6e16ef0 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -51,6 +51,7 @@ select combo_id as c_id,count(*) as count from orders where status in(2,4) group foreach ($combos as $key=>$combo){ $tags=json_decode($combo->tags,true); + $combo->tags2=json_decode($combo->tags2,true); foreach ($tags as$k=> $tag){ $tags[$k]=['text'=>$tag, 'text_color' => '#47ABD8', diff --git a/h5/pages/main/combo/combo.vue b/h5/pages/main/combo/combo.vue index 69ed6e4..3334947 100644 --- a/h5/pages/main/combo/combo.vue +++ b/h5/pages/main/combo/combo.vue @@ -247,7 +247,7 @@ - {{ i.desc.join(" | ") }} + {{ i.tags2.join(" | ") }}