Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

biz-ghs/product/classes/ProductClass.php

@@ -140,11 +140,6 @@ class ProductClass extends BaseClass
             //自动调价的价格
             $list[$k]['autoPrice'] = bcadd($v['cost'], $v['addPrice'], 2);
 
-            //前端使用字段
-            $list[$k]['bigCount'] = 0;
-            $list[$k]['smallCount'] = 0;
-            $list[$k]['userPrice'] = 0;
-
         }
         return $list;
     }

biz-ghs/product/services/ProductService.php

@@ -46,6 +46,7 @@ class ProductService extends BaseService
 
         foreach ($classIds as $classVal) {
             $classId = $classVal['id'];
+            $className = $classVal['name'] ?? '';
             if ($classId > 0) {
                 $tmp = [];
                 $tmp['classId'] = $classId;
@@ -55,8 +56,9 @@ class ProductService extends BaseService
                     if ($itemInfoData) {
                         foreach ($itemInfoData as $v) {
                             if (in_array($v['itemId'], $items)) {
-                                //前端要求增加classId 2021.1.31 linqh
+                                //冗余给前端使用 2021.1.31 linqh
                                 $v['classId'] = $classId;
+                                $v['className'] = $className;
                                 $tmp['child'][] = $v;
                             }
                         }