Merge branch 'feature/hotfix' into 'gray'

fixed:筛选性别转换



See merge request !96

@@ -347,7 +347,7 @@ export default {
         _.each(this.filter.group_sort, item => {
         _.each(this.filter.group_sort, item => {
             temp = temp.concat(item.sub);
             temp = temp.concat(item.sub);
         });
         });
-        this.filterItems[0].choices = [{id: 1, name: '男'}, {id: 2, name: '女'}];
+        this.filterItems[0].choices = [{id: '1,3', name: '男'}, {id: '2,3', name: '女'}];
         this.filterItems[1].choices = this.filter.brand || [];
         this.filterItems[1].choices = this.filter.brand || [];
         this.filterItems[2].choices = temp;
         this.filterItems[2].choices = temp;
         this.filterItems[3].choices = this.filter.color || [];
         this.filterItems[3].choices = this.filter.color || [];