Merge test

 <?php
 <?php
 
 
 namespace Plugin\DataProcess;
 namespace Plugin\DataProcess;
-
 use Plugin\Helpers;
 use Plugin\Helpers;
 
 
 /**
 /**
@@ -18,16 +17,19 @@ class ListProcess
      */
      */
     public static function getListData($data)
     public static function getListData($data)
     {
     {
-        $result = array('new' => array(), 'filter' => array());
+        $result = array('new'=>array(), 'filter'=>array());
 
 
-        if (isset($data['product_list'])) {
+        if(isset($data['product_list']))
+        {
             $result['new'] = self::getProductData($data['product_list']);
             $result['new'] = self::getProductData($data['product_list']);
         }
         }
-        if (isset($data['filter'])) {
+        if(isset($data['filter']))
+        {
             $result['filter'] = self::getFilterData($data['filter']);
             $result['filter'] = self::getFilterData($data['filter']);
         }
         }
 
 
         return $result;
         return $result;
+        
     }
     }
 
 
     /**
     /**
@@ -46,6 +48,7 @@ class ListProcess
         }
         }
 
 
         return $products;
         return $products;
+        
     }
     }
 
 
     /**
     /**
@@ -58,12 +61,12 @@ class ListProcess
     public static function getFilterData($data, $gender = 0)
     public static function getFilterData($data, $gender = 0)
     {
     {
         // 过滤条件数据
         // 过滤条件数据
-        $filters = array('classify' => array());
+        $filters = array('classify'=>array());
 
 
         $num = 1;
         $num = 1;
-        $build = array();
         foreach ($data as $key => $val) {
         foreach ($data as $key => $val) {
-            if (empty($val)) {
+            if(empty($val))
+            {
                 continue;
                 continue;
             }
             }
             if (!is_callable("self::$key")) {
             if (!is_callable("self::$key")) {
@@ -75,7 +78,7 @@ class ListProcess
                 $build['active'] = true;
                 $build['active'] = true;
             }
             }
 
 
-            $num ++;
+            $num++;
             $filters['classify'][] = $build;
             $filters['classify'][] = $build;
         }
         }
 
 
@@ -83,6 +86,7 @@ class ListProcess
         self::sortArrByField($filters['classify'], 'sort_col');
         self::sortArrByField($filters['classify'], 'sort_col');
 
 
         return $filters;
         return $filters;
+        
     }
     }
 
 
     private static function brand($data)
     private static function brand($data)
@@ -161,7 +165,7 @@ class ListProcess
         foreach ($data as $key => $one) {
         foreach ($data as $key => $one) {
             $discount = array();
             $discount = array();
             $discount['dataId'] = $key;
             $discount['dataId'] = $key;
-            $discount['name'] = $one['name'] . '折商品';
+            $discount['name'] = $one['name'] .'折商品';
 
 
             $result['subs'][] = $discount;
             $result['subs'][] = $discount;
         }
         }
@@ -221,18 +225,18 @@ class ListProcess
             $category['dataId'] = isset($one['relation_parameter']) ? $one['relation_parameter']['sort'] : 0;
             $category['dataId'] = isset($one['relation_parameter']) ? $one['relation_parameter']['sort'] : 0;
             $category['name'] = $one['category_name'];
             $category['name'] = $one['category_name'];
 
 
-            /* // 子品类（目前h5不支持二级）
-              if(isset($one['sub']))
-              {
-              $category['subs'] = array();
-              foreach ($one['sub'] as $single) {
-              $subitem = array();
-              $subitem['dataId'] = $single['category_id'];
-              $subitem['name'] = $single['category_name'];
+            /*// 子品类（目前h5不支持二级）
+            if(isset($one['sub']))
+            {
+                $category['subs'] = array();
+                foreach ($one['sub'] as $single) {
+                    $subitem = array();
+                    $subitem['dataId'] = $single['category_id'];
+                    $subitem['name'] = $single['category_name'];
 
 
-              $category['subs'][] = $subitem;
-              }
-              } */
+                    $category['subs'][] = $subitem;
+                }
+            }*/
 
 
             $result['subs'][] = $category;
             $result['subs'][] = $category;
         }
         }
@@ -285,7 +289,7 @@ class ListProcess
 
 
         foreach ($data as $one) {
         foreach ($data as $one) {
             $size = array();
             $size = array();
-            $size['dataId'] = $one['size_id'];
+            $size['dataId'] = $one['size_id']; 
             $size['name'] = $one['size_name'];
             $size['name'] = $one['size_name'];
 
 
             $result['subs'][] = $size;
             $result['subs'][] = $size;
@@ -301,8 +305,7 @@ class ListProcess
      * @param  string  $field  字段名称
      * @param  string  $field  字段名称
      * @param  boolean $desc   时候降序排列，默认为false
      * @param  boolean $desc   时候降序排列，默认为false
      */
      */
-    private static function sortArrByField(&$array, $field, $desc = false)
-    {
+    private static function sortArrByField(&$array, $field, $desc = false){
         $fieldArr = array();
         $fieldArr = array();
         foreach ($array as $k => $v) {
         foreach ($array as $k => $v) {
             $fieldArr[$k] = $v[$field];
             $fieldArr[$k] = $v[$field];
@@ -310,5 +313,4 @@ class ListProcess
         $sort = $desc == false ? SORT_ASC : SORT_DESC;
         $sort = $desc == false ? SORT_ASC : SORT_DESC;
         array_multisort($fieldArr, $sort, $array);
         array_multisort($fieldArr, $sort, $array);
     }
     }
-
 }
 }