Merge branch 'feature/filter-age' into release/4.8

@@ -85,12 +85,39 @@ class ListProcess
         return $filters;
         return $filters;
     }
     }
 
 
+    private static function ageLevel($data)
+    {
+        $result = array(
+            'title' => '年龄',
+            'name' => '所有年龄',
+            'sort_col' => 1,
+            'dataType' => 'ageLevel',
+            'subs' => array(
+                array(
+                    'chosed' => true,
+                    'dataId' => 0,
+                    'name' => '所有年龄'
+                )
+            )
+        );
+
+        foreach ($data as $key => $one) {
+            $discount = array();
+            $discount['dataId'] = $key;
+            $discount['name'] = $one['name'];
+
+            $result['subs'][] = $discount;
+        }
+
+        return $result;
+    }
+
     private static function brand($data)
     private static function brand($data)
     {
     {
         $result = array(
         $result = array(
             'title' => '品牌',
             'title' => '品牌',
             'name' => '所有品牌',
             'name' => '所有品牌',
-            'sort_col' => 1,
+            'sort_col' => 2,
             'dataType' => 'brand',
             'dataType' => 'brand',
             'subs' => array(
             'subs' => array(
                 array(
                 array(
@@ -120,7 +147,7 @@ class ListProcess
         $result = array(
         $result = array(
             'title' => '颜色',
             'title' => '颜色',
             'name' => '所有颜色',
             'name' => '所有颜色',
-            'sort_col' => 3,
+            'sort_col' => 4,
             'dataType' => 'color',
             'dataType' => 'color',
             'subs' => array(
             'subs' => array(
                 array(
                 array(
@@ -147,7 +174,7 @@ class ListProcess
         $result = array(
         $result = array(
             'title' => '折扣',
             'title' => '折扣',
             'name' => '所有商品',
             'name' => '所有商品',
-            'sort_col' => 6,
+            'sort_col' => 7,
             'dataType' => 'discount',
             'dataType' => 'discount',
             'subs' => array(
             'subs' => array(
                 array(
                 array(
@@ -209,7 +236,7 @@ class ListProcess
         $result = array(
         $result = array(
             'title' => '品类',
             'title' => '品类',
             'name' => '所有品类',
             'name' => '所有品类',
-            'sort_col' => 2,
+            'sort_col' => 3,
             'dataType' => 'sort',
             'dataType' => 'sort',
             'subs' => array(
             'subs' => array(
                 array(
                 array(
@@ -253,7 +280,7 @@ class ListProcess
         $result = array(
         $result = array(
             'title' => '价格',
             'title' => '价格',
             'name' => '所有价格',
             'name' => '所有价格',
-            'sort_col' => 5,
+            'sort_col' => 6,
             'dataType' => 'price',
             'dataType' => 'price',
             'subs' => array(
             'subs' => array(
                 array(
                 array(
@@ -281,7 +308,7 @@ class ListProcess
         $result = array(
         $result = array(
             'title' => '尺码',
             'title' => '尺码',
             'name' => '所有尺码',
             'name' => '所有尺码',
-            'sort_col' => 4,
+            'sort_col' => 5,
             'dataType' => 'size',
             'dataType' => 'size',
             'subs' => array(
             'subs' => array(
                 array(
                 array(

@@ -15,7 +15,7 @@
     color: #000;
     color: #000;
     cursor: pointer;
     cursor: pointer;
     font-size: 14PX;
     font-size: 14PX;
-    height: 440PX;
+    height: 500PX;
 
 
     .classify {
     .classify {
         width: 50%;
         width: 50%;