添加商品-增加icon展示类型

app/common/repositories/store/product/ProductRepository.php

@@ -900,6 +900,9 @@ class ProductRepository extends BaseRepository
             $item['sales'] = $item['sales'] + $item['ficti'];
             unset($item['ficti']);
             $item['yanglao'] = $this->yanglaojin($item['product_id']);
+            $item['icon_type_map'] = [
+                1 => 'https://api.hxxfb.com/share/xcx/icon/icon_tjms.png'
+            ];
             return $item;
         });
 
@@ -1621,6 +1624,7 @@ class ProductRepository extends BaseRepository
         if ($data['share_is'] == 1 || $data['pension_is'] == 1) {
 
             $member_settings = merchantConfig($merId, 'member_settings');
+            $member_settings = $member_settings ?: [];
 
             $where['mer_id'] = $merId;
             $where['state'] = 1;