From 5196c636d5f09838984253e5f64cdfb21768bc9f Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Tue, 27 Aug 2024 18:40:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/ComboController.php | 1 +
 h5/pages/main/combo/combo.vue                           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 @@
 							</view>
 						</view>
 						<view class="combo_desc_wrapper">
-							{{ i.desc.join(" | ") }}
+							{{ i.tags2.join(" | ") }}
 						</view>
 						<view class="combo_price_wrapper">
 							<view class="combo_price_box_wrapper">