Merge branch 'test01' of http://101.200.220.49:8001/sunhao/seafood into test01

app/Http/Controllers/Api/GoodsController.php

@@ -28,6 +28,11 @@ class GoodsController extends Controller {
                 unset($v['quantity']);
                 $sku[] = $v;
             }
+            $value['sku_num'] = count($sku);
+            if(1 == $value['sku_num']){
+                $value['stock'] = $sku[0]['stock'];
+                $value['is_weigh'] = $sku[0]['is_weigh'];
+            }
             $value['sku_list'] = $sku;
 
             if('0' == $value['goodsCategoryName']) {
@@ -61,6 +66,11 @@ class GoodsController extends Controller {
                 unset($v['quantity']);
                 $sku[] = $v;
             }
+            $value['sku_num'] = count($sku);
+            if(1 == $value['sku_num']){
+                $value['stock'] = $sku[0]['stock'];
+                $value['is_weigh'] = $sku[0]['is_weigh'];
+            }
             $value['sku_list'] = $sku;
 
             $data[] = $value;