filter

src/pages/project/list/filter/index.js

@@ -15,17 +15,29 @@ export default class Index extends Component {
     visible: false,
     tabIndex: null,
     priceTypeIndex: 0,
-    selectedIndex: new Array(3).fill([0]),
+    selectedIndex: new Array(4).fill([0]),
     tabs: [
-      // {
-      //   name: '户型',
-      //   id: 'huxing',
-      //   list: ['不限', '一室', '两室', '三室', '四室', '五室以上']
-      // },
+      {
+        name: '户型',
+        id: 'huxing',
+        list: ['不限', '一室', '两室', '三室', '四室', '五室以上']
+      },
       {
         name: '价格',
         id: 'price',
         list: ['不限', '10000元/㎡以下', '10000-20000元/㎡', '20000-30000元/㎡', '30000-50000元/㎡', '50000-70000元/㎡', '70000-100000元/㎡', '100000元/㎡以上']
+        // list: [
+        //   {
+        //     name: '总价',
+        //     id: 'totalPrice',
+        //     list: ['不限', '100万以下', '100-150万', '150-200万', '200-500万', '500-1000万', '1000万以上']
+        //   },
+        //   {
+        //     name: '单价',
+        //     id: 'unitPrice ',
+        //     list: ['不限', '10000/㎡以下', '10000-20000元/㎡', '20000-30000元/㎡', '30000-50000元/㎡', '50000-70000元/㎡', '70000-100000元/㎡', '100000元/㎡以上']
+        //   }
+        // ]
       },
       {
         name: '面积',
@@ -47,7 +59,7 @@ export default class Index extends Component {
     queryItemTypeList().then(res => {
       let houseTypeList = res.records
       houseTypeList.unshift('不限')
-      tabs[2].list = houseTypeList
+      tabs[3].list = houseTypeList
       this.setState({ tabs })
     })
   }
@@ -107,6 +119,7 @@ export default class Index extends Component {
 
   handleFilter() {
 
+    console.log("111")
     const { tabs, keywords, selectedIndex } = this.state
     console.log(this.state)
     let values = selectedIndex.map((selectedList, tabIndex) => {
@@ -118,13 +131,13 @@ export default class Index extends Component {
       }
 
       // 类型
-      // if (tabIndex === 0) {
-      //   let val = selectedList.map(index => curTabList[index])
-      //   return val.join(',')
-      // }
+      if (tabIndex === 0) {
+        let val = selectedList.map(index => curTabList[index])
+        return val.join(',')
+      }
 
       // 价格 面积
-      if (tabIndex === 0 || tabIndex === 1) {
+      if (tabIndex === 1 || tabIndex === 2) {
         let val = selectedList.map(index => {
           let value = curTabList[index]
           let regVal = value.match(/\d*([-\d]*)?/)
@@ -147,7 +160,7 @@ export default class Index extends Component {
       }
 
       // 类型
-      if (tabIndex === 2) {
+      if (tabIndex === 3) {
         let val = selectedList.map(index => curTabList[index].buildingTypeId)
         return val.join(',')
       }
@@ -155,10 +168,10 @@ export default class Index extends Component {
     console.log(values)
     let params = {
       name: keywords,
-      // houseType: values[0],
-      price: values[0],
-      area: values[1],
-      buildingType: values[2],
+      houseType: values[0],
+      price: values[1],
+      area: values[2],
+      buildingType: values[3],
     }
     console.log(params)
     this.props.onFilter(params, () => {
@@ -205,7 +218,7 @@ export default class Index extends Component {
         {
           tabs[tabIndex].list.map((item, index) => (
             <View
-              key={index+'tab'}
+              key={index + 'tab'}
               className={`row ${selectedIndex[tabIndex].includes(index) ? 'active' : ''}`}
               onClick={this.handleFilterItemClick.bind(this, index)}>
               {item.name || item.buildingTypeName || item}
@@ -223,7 +236,7 @@ export default class Index extends Component {
 
   renderPrice() {
     const { priceTypeIndex, tabs, tabIndex, selectedIndex } = this.state
-    const priceArr = tabs[0].list
+    const priceArr = tabs[1].list
     const list = priceArr[priceTypeIndex].list
     return (
       <View className="price">
@@ -242,7 +255,7 @@ export default class Index extends Component {
           {
             list.map((text, index) => (
               <View
-                key={index+'list'}
+                key={index + 'list'}
                 className={`price-item ${selectedIndex[tabIndex].includes(index) ? 'selected' : ''}`}
                 onClick={this.handleFilterItemClick.bind(this, index)}>
                 {text}
@@ -285,7 +298,7 @@ export default class Index extends Component {
         <View className="search-box">
           <View className="search">
             <Text className="search-icon icon-sousuo iconfont"></Text>
-            <Input className="search-input" type="text" confirm-type="搜索" onConfirm={this.handleFilter} value={keywords} onInput={this.onInputText.bind(this)} placeholder="请输入你想查询的楼盘"></Input>
+            <Input className="search-input" type="text" focus confirm-type="搜索" onConfirm={this.handleFilter} value={keywords} onInput={this.onInputText.bind(this)} placeholder="请输入你想查询的楼盘"></Input>
           </View>
           <View className="location" onClick={this.handleLocationClick}>
             <Text className="location-icon iconfont icon-daohangdizhi"></Text>

src/pages/project/list/filter/index.scss

@@ -80,8 +80,8 @@
     background: #F9F9F9;
 
     &-item {
-      width: 33.33%;
-      // width: 25%;
+      // width: 33.33%;
+      width: 25%;
       height: 100px;
       display: flex;
       justify-content: center;