1

app/admin/model/order/StoreOrder.php

@@ -105,7 +105,6 @@ class StoreOrder extends BaseModel
         if ($storeIds) {
             $systemStore = SystemStore::where('id', 'IN', $storeIds)->column('name', 'id');
         }
-        $is_suit = false;
         foreach ($data as &$item) {
             $_info = StoreOrderCartInfo::where('oid', $item['id'])->field('cart_info')->select();
             $_info = count($_info) ? $_info->toArray() : [];
@@ -113,7 +112,6 @@ class StoreOrder extends BaseModel
                 $cart_info = json_decode($v['cart_info'], true);
                 if (!isset($cart_info['productInfo'])) $cart_info['productInfo'] = [];
                 $_info[$k]['cart_info'] = $cart_info;
-                if (isset($cart_info['is_suit']) && $cart_info['is_suit']) $is_suit = true;
                 unset($cart_info);
             }
             $item['_info'] = $_info;
@@ -149,7 +147,7 @@ class StoreOrder extends BaseModel
             } elseif ($item['is_consumer']) {
                 $item['pink_name'] = '[消费券订单]';
                 $item['color'] = '#12c5e9';
-            } elseif ($is_suit) {
+            } elseif ($item['suit']) {
                 $item['pink_name'] = '[套装订单]';
                 $item['color'] = '#12e9c5';
             } else {