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

@@ -201,6 +201,11 @@ function search(opt) {
                         p_d: opt[i].id
                         p_d: opt[i].id
                     };
                     };
                     break;
                     break;
+                case 'ageLevel':
+                    ext = {
+                        age_level: opt[i].id
+                    };
+                    break;
                 case 'breakSort':
                 case 'breakSort':
                     ext = {
                     ext = {
                         breakSort: opt[i].id
                         breakSort: opt[i].id

@@ -162,6 +162,11 @@ function search(opt, params, isScroll) {
                     gender: opt.id
                     gender: opt.id
                 };
                 };
                 break;
                 break;
+            case 'ageLevel':
+                ext = {
+                    age_level: opt.id
+                };
+                break;
             case 'brand':
             case 'brand':
                 ext = {
                 ext = {
                     brand: opt.id
                     brand: opt.id
@@ -235,10 +240,8 @@ function search(opt, params, isScroll) {
         });
         });
     }
     }
 
 
-
     searching = true;
     searching = true;
     loading.showLoadingMask();
     loading.showLoadingMask();
-
     $.ajax({
     $.ajax({
         type: 'GET',
         type: 'GET',
         url: '/product/sale/search',
         url: '/product/sale/search',

@@ -12,7 +12,7 @@
 }
 }
 
 
 .filter-body {
 .filter-body {
-    height: 880px;
+    height: 1000px;
     background: #fff;
     background: #fff;
     color: #000;
     color: #000;
     font-size: 28px;
     font-size: 28px;

@@ -132,7 +132,7 @@ exports.processFilter = (list, options) => {
             subsName: 'brandName',
             subsName: 'brandName',
             firstSub: 0,
             firstSub: 0,
             dataType: 'brand',
             dataType: 'brand',
-            sortNum: '1'
+            sortNum: '2'
         },
         },
         color: {
         color: {
             name: '所有颜色',
             name: '所有颜色',
@@ -141,7 +141,7 @@ exports.processFilter = (list, options) => {
             subsName: 'colorName',
             subsName: 'colorName',
             firstSub: 0,
             firstSub: 0,
             dataType: 'color',
             dataType: 'color',
-            sortNum: '3'
+            sortNum: '4'
         },
         },
         discount: {
         discount: {
             name: '所有商品',
             name: '所有商品',
@@ -150,7 +150,7 @@ exports.processFilter = (list, options) => {
             subsName: 'name',
             subsName: 'name',
             firstSub: '0.1,0.9',
             firstSub: '0.1,0.9',
             dataType: 'p_d',
             dataType: 'p_d',
-            sortNum: '6'
+            sortNum: '7'
         },
         },
         gender: {
         gender: {
             name: '所有性别',
             name: '所有性别',
@@ -168,7 +168,7 @@ exports.processFilter = (list, options) => {
             subsName: 'categoryName',
             subsName: 'categoryName',
             firstSub: 0,
             firstSub: 0,
             dataType: 'sort',
             dataType: 'sort',
-            sortNum: '2'
+            sortNum: '3'
         },
         },
         priceRange: {
         priceRange: {
             name: '所有价格',
             name: '所有价格',
@@ -177,7 +177,7 @@ exports.processFilter = (list, options) => {
             subsName: 'flag',
             subsName: 'flag',
             firstSub: 0,
             firstSub: 0,
             dataType: 'price',
             dataType: 'price',
-            sortNum: '5'
+            sortNum: '6'
         },
         },
         size: {
         size: {
             name: '所有尺码',
             name: '所有尺码',
@@ -186,7 +186,16 @@ exports.processFilter = (list, options) => {
             subsName: 'sizeName',
             subsName: 'sizeName',
             firstSub: 0,
             firstSub: 0,
             dataType: 'size',
             dataType: 'size',
-            sortNum: '4'
+            sortNum: '5'
+        },
+        ageLevel: {
+            name: '所有年龄',
+            title: '年龄',
+            dataId: 'id',
+            subsName: 'name',
+            firstSub: 0,
+            dataType: 'ageLevel',
+            sortNum: '1'
         }
         }
     };
     };