分类弃用 flower 做区分

app-hd/controllers/GoodsController.php

@@ -117,7 +117,7 @@ class GoodsController extends BaseController
         $cId = isset($get['cId']) ? intval($get['cId']) : 0;
         $name = isset($get['name']) && !empty($get['name']) ? $get['name'] : '';
         $flowerNum = isset($get['flowerNum']) && $get['flowerNum'] > 0 ? $get['flowerNum'] : 0;
-        $flower = isset($get['flower']) ? $get['flower'] : '';
+        //$flower = isset($get['flower']) ? $get['flower'] : '';
         $hasStock = isset($get['hasStock']) ? $get['hasStock'] : 0;
 
         $where = [];
@@ -135,9 +135,10 @@ class GoodsController extends BaseController
         if ($flowerNum > 0) {
             $where['flowerNum'] = $flowerNum;
         }
-        if (is_numeric($flower)) {
-            $where['flower'] = $flower;
-        }
+        // 需求变动：不再用 flower 做区分
+        //if (is_numeric($flower)) {
+            //$where['flower'] = $flower;
+        //}
         if ($hasStock == 1) {
             $where['stock>'] = 0;
         }