Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

src/constants/api.js

@@ -12,6 +12,8 @@ export const pathname = '/api/wx'
 
 export const resolvePath = api => `${host + pathname}/${api}`
 
+export const API_CITY_AREA = resolvePath('tdCityList/tdAreaCity') // 城市下区域查询
+
 // 课程
 export const API_COURSE_LIST = resolvePath('curriculum') // 课程列表
 export const API_MY_COLLECT_COURSE_LIST = resolvePath('curriculum/save') // 我收藏的课程列表
@@ -116,6 +118,9 @@ export const API_RECOMENT_CLIENT = resolvePath('customer/new')
 export const API_CLIENT_PROGRESS = resolvePath('customer')
 export const API_TYPE_DATA = resolvePath('awesome/dict/recommendcustomer')
 
+// channel
+export const API_CHANNEL_REPORT = resolvePath('channel/report')
+
 // report
 export const API_REPORT_LIST = resolvePath('myReport')
 export const API_REPORT_CLIENT = resolvePath('customer/report')

src/pages/index/activityList/index.jsx

@@ -42,7 +42,7 @@ export default function MyCollectForActivity () {
   const GetPageList = () => {
     setHasNextPage(false)
     fetch({ url: API_ACTIVITY_LIST, method: 'get', payload: { city: city?.curCity?.id, buildingId, type, pageNumber, pageSize: 10 } }).then((res) => {
-      setPageList(pageNumber === 1 ? res.list || [] : PageList.concat(res.list || []))
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)
     })

src/pages/index/buildingDetail/components/Periphery/index.jsx

@@ -1,5 +1,5 @@
 
-import { useCallback, useContext, useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import Taro from '@tarojs/taro'
 import { Map, CoverView } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
@@ -101,7 +101,8 @@ export default function Periphery (props) {
           poiTypes.map((item) => (
             <view className='flex-item' key={item.value} onClick={CutTab(item.value)}>
               <text className={item.class}></text>
-              <text>{item.label}({countLen(item.value)})</text>
+              <text>{item.label}</text>
+              <text>({countLen(item.value)})</text>
             </view>
           ))
         }

src/pages/index/buildingDetail/components/Periphery/index.scss

@@ -56,6 +56,10 @@
           margin-top: 0;
           line-height: 1;
         }
+        &:last-child {
+          margin-top: 0;
+          font-size: 28px;
+        }
       }
     }
   }

src/pages/index/buildingDynamic/index.jsx

@@ -1,5 +1,4 @@
 import { useState, useEffect } from 'react'
-import Taro from '@tarojs/taro'
 import withLayout from '@/layout'
 import { fetch } from '@/utils/request'
 import { API_ITEMS_DETAIL } from '@/constants/api'
@@ -24,11 +23,11 @@ export default withLayout((props) => {
       <ScrollView scroll-y>
         <view className='Content'>
 
-          <view className='Top'>
+          {/* <view className='Top'>
             <text className='iconfont icon-shengming'></text>
             <text>楼盘资讯</text>
             <text className='active' onClick={() => {Taro.navigateTo({url: '/pages/index/disclaimer/index'})}}>免责声明》</text>
-          </view>
+          </view> */}
 
           <view className='List'>
             {

src/pages/index/buildingList/components/FilterForCityArea/index.jsx

@@ -0,0 +1,47 @@
+import { useState } from 'react'
+import { Image } from '@tarojs/components'
+import './index.scss'
+
+export default function FilterForCityArea (props) {
+
+  const { change = () => { }, Cancel = () => { }, defaultValue = '-', List = [] } = props
+  const [CurrentId, setCurrentId] = useState(defaultValue)
+
+  const CutArea = (id) => {
+    return () => {
+      setCurrentId(id)
+    }
+  }
+
+  const Sure = () => {
+    change({ name: 'buildingArea', value: CurrentId })
+  }
+
+  return (
+    <view className='components FilterForCityArea'>
+      {
+        List.map((item, index) => (
+          <view className='ListItem' key={`ListItem${index}`} onClick={CutArea(item.id)}>
+            <view>
+              <view>
+                <text>{item.name}</text>
+                {
+                  CurrentId === item.id &&
+                  <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
+                }
+              </view>
+            </view>
+          </view>
+        ))
+      }
+      <view className='Btn flex-h'>
+        <view className='flex-item'>
+          <text onClick={Cancel}>取消</text>
+        </view>
+        <view className='flex-item'>
+          <text onClick={Sure}>保存</text>
+        </view>
+      </view>
+    </view>
+  )
+}

src/pages/index/buildingList/components/FilterForCityArea/index.scss

@@ -0,0 +1,65 @@
+.components.FilterForCityArea {
+  padding: 0 6px 30px 40px;
+  background: #fff;
+  position: relative;
+  overflow: hidden;
+  font-size: 0;
+  > .ListItem {
+    display: inline-block;
+    min-width: 33.33%;
+    vertical-align: middle;
+    margin-top: 28px;
+    > view {
+      padding-right: 24px;
+      position: relative;
+      overflow: hidden;
+      > view {
+        border: 2px solid #193c83;
+        border-radius: 4px;
+        box-sizing: border-box;
+        text-align: center;
+        position: relative;
+        overflow: hidden;
+        > text {
+          font-size: 30px;
+          font-weight: bold;
+          line-height: 80px;
+        }
+        > image {
+          display: block;
+          position: absolute;
+          right: -2px;
+          bottom: 0;
+          height: 36px;
+        }
+      }
+    }
+  }
+  > .Btn {
+    margin-top: 40px;
+    align-items: center;
+    padding: 0 94px 0 60px;
+    > view {
+      margin-left: 80px;
+      &:first-child {
+        margin-left: 0;
+        > text {
+          background: #fff;
+          color: #193c83;
+        }
+      }
+      > text {
+        display: block;
+        font-size: 30px;
+        line-height: 80px;
+        box-sizing: border-box;
+        border: 2px solid #193c83;
+        border-radius: 80px;
+        text-align: center;
+        color: #fff;
+        font-weight: bold;
+        background: #193c83;
+      }
+    }
+  }
+}

src/pages/index/buildingList/components/FilterForHouseSort/index.jsx

@@ -0,0 +1,54 @@
+import { useState } from 'react'
+import { Image } from '@tarojs/components'
+import './index.scss'
+
+export default function FilterForHouseSort (props) {
+
+  const { change = () => {}, Cancel = () => { }, defaultValue = '-' } = props
+  const [CityAreaList] = useState([
+    {name: '不限', id: '-'},
+    {name: '价格由低到高', id: 'price-asc'},
+    {name: '价格由高到低', id: 'price-desc'},
+    {name: '开盘由近到远', id: 'openingDate-asc'},
+    {name: '开盘由远到近', id: 'openingDate-desc'},
+  ])
+  const [CurrentId, setCurrentId] = useState(defaultValue)
+
+  const CutArea = (id) => {
+    return () => {
+      setCurrentId(id)
+    }
+  }
+
+  const Sure = () => {
+    change({name: 'orderBy', value: CurrentId})
+  }
+
+  return (
+    <view className='components FilterForHouseSort'>
+      {
+        CityAreaList.map((item, index) => (
+          <view className='ListItem' key={`ListItem${index}`} onClick={CutArea(item.id)}>
+            <view>
+              <view>
+                <text>{item.name}</text>
+                {
+                  CurrentId === item.id &&
+                  <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
+                }
+              </view>
+            </view>
+          </view>
+        ))
+      }
+      <view className='Btn flex-h'>
+        <view className='flex-item'>
+          <text onClick={Cancel}>取消</text>
+        </view>
+        <view className='flex-item'>
+          <text onClick={Sure}>保存</text>
+        </view>
+      </view>
+    </view>
+  )
+}

src/pages/index/buildingList/components/FilterForHouseSort/index.scss

@@ -0,0 +1,65 @@
+.components.FilterForHouseSort {
+  padding: 0 6px 30px 40px;
+  background: #fff;
+  position: relative;
+  overflow: hidden;
+  font-size: 0;
+  > .ListItem {
+    display: inline-block;
+    min-width: 33.33%;
+    vertical-align: middle;
+    margin-top: 28px;
+    > view {
+      padding-right: 24px;
+      position: relative;
+      overflow: hidden;
+      > view {
+        border: 2px solid #193c83;
+        border-radius: 4px;
+        box-sizing: border-box;
+        text-align: center;
+        position: relative;
+        overflow: hidden;
+        > text {
+          font-size: 30px;
+          font-weight: bold;
+          line-height: 80px;
+        }
+        > image {
+          display: block;
+          position: absolute;
+          right: -2px;
+          bottom: 0;
+          height: 36px;
+        }
+      }
+    }
+  }
+  > .Btn {
+    margin-top: 40px;
+    align-items: center;
+    padding: 0 94px 0 60px;
+    > view {
+      margin-left: 80px;
+      &:first-child {
+        margin-left: 0;
+        > text {
+          background: #fff;
+          color: #193c83;
+        }
+      }
+      > text {
+        display: block;
+        font-size: 30px;
+        line-height: 80px;
+        box-sizing: border-box;
+        border: 2px solid #193c83;
+        border-radius: 80px;
+        text-align: center;
+        color: #fff;
+        font-weight: bold;
+        background: #193c83;
+      }
+    }
+  }
+}

src/pages/index/buildingList/components/FilterForHouseType/index.jsx

@@ -1,10 +1,11 @@
 import { useState } from 'react'
+import { Image } from '@tarojs/components'
 import './index.scss'
 
 export default function FilterForHouseType (props) {
 
-  const { change = () => {}, defaultValue = '-' } = props
-  const [HouseTypeList] = useState([
+  const { change = () => {}, Cancel = () => { }, defaultValue = '-' } = props
+  const [CityAreaList] = useState([
     {name: '不限', id: '-'},
     {name: '一室', id: 1},
     {name: '两室', id: 2},
@@ -17,24 +18,38 @@ export default function FilterForHouseType (props) {
   const CutArea = (id) => {
     return () => {
       setCurrentId(id)
-      change({name: 'houseType', value: id})
     }
   }
 
+  const Sure = () => {
+    change({name: 'houseType', value: CurrentId})
+  }
+
   return (
     <view className='components FilterForHouseType'>
       {
-        HouseTypeList.map((item, index) => (
-          <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutArea(item.id)}>
-            <text>{item.name}</text>
-            <view className='flex-item'></view>
-            {
-              CurrentId === item.id &&
-              <text className='iconfont icon-gou1'></text>
-            }
+        CityAreaList.map((item, index) => (
+          <view className='ListItem' key={`ListItem${index}`} onClick={CutArea(item.id)}>
+            <view>
+              <view>
+                <text>{item.name}</text>
+                {
+                  CurrentId === item.id &&
+                  <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
+                }
+              </view>
+            </view>
           </view>
         ))
       }
+      <view className='Btn flex-h'>
+        <view className='flex-item'>
+          <text onClick={Cancel}>取消</text>
+        </view>
+        <view className='flex-item'>
+          <text onClick={Sure}>保存</text>
+        </view>
+      </view>
     </view>
   )
 }

src/pages/index/buildingList/components/FilterForHouseType/index.scss

@@ -1,25 +1,65 @@
 .components.FilterForHouseType {
-  padding: 0 30px;
+  padding: 0 6px 30px 40px;
   background: #fff;
   position: relative;
   overflow: hidden;
-  >view {
-    padding: 0 30px;
-    position: relative;
-    overflow: hidden;
-    border-bottom: 2px solid rgba(0, 0, 0, 0.08);
-    align-items: center;
-    &.active {
-      >text {
-        color: #193C83;
-        &:first-child {
+  font-size: 0;
+  > .ListItem {
+    display: inline-block;
+    min-width: 33.33%;
+    vertical-align: middle;
+    margin-top: 28px;
+    > view {
+      padding-right: 24px;
+      position: relative;
+      overflow: hidden;
+      > view {
+        border: 2px solid #193c83;
+        border-radius: 4px;
+        box-sizing: border-box;
+        text-align: center;
+        position: relative;
+        overflow: hidden;
+        > text {
+          font-size: 30px;
           font-weight: bold;
+          line-height: 80px;
+        }
+        > image {
+          display: block;
+          position: absolute;
+          right: -2px;
+          bottom: 0;
+          height: 36px;
         }
       }
     }
-    >text {
-      font-size: 28px;
-      line-height: 80px;
+  }
+  > .Btn {
+    margin-top: 40px;
+    align-items: center;
+    padding: 0 94px 0 60px;
+    > view {
+      margin-left: 80px;
+      &:first-child {
+        margin-left: 0;
+        > text {
+          background: #fff;
+          color: #193c83;
+        }
+      }
+      > text {
+        display: block;
+        font-size: 30px;
+        line-height: 80px;
+        box-sizing: border-box;
+        border: 2px solid #193c83;
+        border-radius: 80px;
+        text-align: center;
+        color: #fff;
+        font-weight: bold;
+        background: #193c83;
+      }
     }
   }
 }

src/pages/index/buildingList/components/FilterForMore/index.jsx

@@ -1,37 +1,110 @@
 import { useState } from 'react'
+import { ScrollView, Image } from '@tarojs/components'
 import './index.scss'
 
 export default function FilterForMore (props) {
 
-  const { change = () => {}, defaultValue = '-' } = props
-  const [BuildingTypeList] = useState([
-    {name: '不限', id: '-'},
-    {name: '别墅', id: '1'},
-    {name: '高层', id: '2'}
+  const { change = () => { }, defaultValue = ['-', '-', '-'], Cancel = () => { }, BuildingTypeList = [] } = props
+
+  const [AreaList] = useState([
+    { name: '不限', id: '-' },
+    { name: '60㎡以下', id: '0-60' },
+    { name: '60-90㎡', id: '60-90' },
+    { name: '90-110㎡', id: '90-110' },
+    { name: '110-200㎡', id: '110-200' },
+    { name: '200㎡以上', id: '200-' }
+  ])
+  const [CurrentAreaId, setCurrentAreaId] = useState(defaultValue[0])
+
+  const [CurrentBuildingTypeId, setCurrentBuildingTypeId] = useState(defaultValue[1])
+
+  const [StatusList] = useState([
+    { name: '不限', id: '-' },
+    { name: '在售', id: '在售' },
+    { name: '未开盘', id: '未开盘' },
+    { name: '售罄', id: '售罄' }
   ])
-  const [CurrentId, setCurrentId] = useState(defaultValue)
+  const [CurrentStatusId, setCurrentStatusId] = useState(defaultValue[2])
 
   const CutArea = (id) => {
     return () => {
-      setCurrentId(id)
-      change({name: 'buildingType', value: id})
+      setCurrentAreaId(id)
+    }
+  }
+
+  const CutBuildingType = (id) => {
+    return () => {
+      setCurrentBuildingTypeId(id)
     }
   }
 
+  const CutStatus = (id) => {
+    return () => {
+      setCurrentStatusId(id)
+    }
+  }
+
+  const Sure = () => {
+    change([
+      { name: 'buildingType', value: CurrentBuildingTypeId },
+      { name: 'area', value: CurrentAreaId },
+      { name: 'marketStatus', value: CurrentStatusId },
+    ])
+  }
+
   return (
     <view className='components FilterForMore'>
-      {
-        BuildingTypeList.map((item, index) => (
-          <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutArea(item.id)}>
-            <text>{item.name}</text>
-            <view className='flex-item'></view>
-            {
-              CurrentId === item.id &&
-              <text className='iconfont icon-gou1'></text>
-            }
+      <ScrollView scroll-y>
+        <view className='FilterContent'>
+          <text>面积</text>
+          {
+            AreaList.map((item, index) => (
+              <view className='ListItem' key={`AreaListItem${index}`} onClick={CutArea(item.id)}>
+                <view>
+                  <view>
+                    <text>{item.name}</text>
+                    <Image mode='heightFix' className={CurrentAreaId === item.id ? 'active' : ''} src={require('@/assets/findHouse-icon1.png')}></Image>
+                  </view>
+                </view>
+              </view>
+            ))
+          }
+          <text>类型</text>
+          {
+            BuildingTypeList.map((item, index) => (
+              <view className='ListItem' key={`BuildingTypeListItem${index}`} onClick={CutBuildingType(item.id)}>
+                <view>
+                  <view>
+                    <text>{item.name}</text>
+                    <Image mode='heightFix' className={CurrentBuildingTypeId === item.id ? 'active' : ''} src={require('@/assets/findHouse-icon1.png')}></Image>
+                  </view>
+                </view>
+              </view>
+            ))
+          }
+          <text>售卖状态</text>
+          {
+            StatusList.map((item, index) => (
+              <view className='ListItem' key={`StatusListItem${index}`} onClick={CutStatus(item.id)}>
+                <view>
+                  <view>
+                    <text>{item.name}</text>
+                    <Image mode='heightFix' className={CurrentStatusId === item.id ? 'active' : ''} src={require('@/assets/findHouse-icon1.png')}></Image>
+                  </view>
+                </view>
+              </view>
+            ))
+          }
+          <view className='Btn flex-h'>
+            <view className='flex-item'>
+              <text onClick={Cancel}>取消</text>
+            </view>
+            <view className='flex-item'>
+              <text onClick={Sure}>保存</text>
+            </view>
           </view>
-        ))
-      }
+        </view>
+      </ScrollView>
     </view>
   )
 }

src/pages/index/buildingList/components/FilterForMore/index.scss

@@ -1,25 +1,88 @@
 .components.FilterForMore {
-  padding: 0 30px;
+  width: 100%;
+  height: 100%;
   background: #fff;
   position: relative;
   overflow: hidden;
-  >view {
-    padding: 0 30px;
+  > scroll-view {
+    width: 100%;
+    height: 100%;
     position: relative;
-    overflow: hidden;
-    border-bottom: 2px solid rgba(0, 0, 0, 0.08);
-    align-items: center;
-    &.active {
-      >text {
-        color: #193C83;
-        &:first-child {
-          font-weight: bold;
+    .FilterContent {
+      padding: 0 6px 30px 40px;
+      background: #fff;
+      position: relative;
+      overflow: hidden;
+      font-size: 0;
+      > text {
+        font-size: 34px;
+        font-weight: bold;
+        display: block;
+        line-height: 1.1;
+        margin-top: 50px;
+      }
+      > .ListItem {
+        display: inline-block;
+        min-width: 33.33%;
+        vertical-align: middle;
+        margin-top: 28px;
+        > view {
+          padding-right: 24px;
+          position: relative;
+          overflow: hidden;
+          > view {
+            border: 2px solid #193c83;
+            border-radius: 4px;
+            box-sizing: border-box;
+            text-align: center;
+            position: relative;
+            overflow: hidden;
+            > text {
+              font-size: 30px;
+              font-weight: bold;
+              line-height: 80px;
+            }
+            > image {
+              display: block;
+              position: absolute;
+              right: -2px;
+              bottom: 0;
+              height: 36px;
+              opacity: 0;
+              &.active {
+                opacity: 1;
+              }
+            }
+          }
+        }
+      }
+      > .Btn {
+        margin-top: 40px;
+        align-items: center;
+        padding: 0 94px 0 60px;
+        > view {
+          margin-left: 80px;
+          &:first-child {
+            margin-left: 0;
+            > text {
+              background: #fff;
+              color: #193c83;
+            }
+          }
+          > text {
+            display: block;
+            font-size: 30px;
+            line-height: 80px;
+            box-sizing: border-box;
+            border: 2px solid #193c83;
+            border-radius: 80px;
+            text-align: center;
+            color: #fff;
+            font-weight: bold;
+            background: #193c83;
+          }
         }
       }
-    }
-    >text {
-      font-size: 28px;
-      line-height: 80px;
     }
   }
-}
+}

src/pages/index/buildingList/index.jsx

@@ -1,16 +1,17 @@
 import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import { ScrollView } from '@tarojs/components'
+import { ScrollView, Input } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
-import { API_INDEX_PROJECTS } from '@/constants/api'
+import { API_ITEMS_LIST, API_CITY_AREA, API_ITEMS_TYPE } from '@/constants/api'
 import ProjectListItem from '@/components/ProjectListItem/index'
 import './index.scss'
-import FilterForArea from './components/FilterForArea/index'
+import FilterForCityArea from './components/FilterForCityArea/index'
 import FilterForPrice from './components/FilterForPrice/index'
 import FilterForHouseType from './components/FilterForHouseType/index'
 import FilterForMore from './components/FilterForMore/index'
+import FilterForHouseSort from './components/FilterForHouseSort/index'
 
 export default withLayout(() => {
 
@@ -20,42 +21,73 @@ export default withLayout(() => {
   const [pageSize] = useState(10)
   const [IsPull, setPull] = useState(false)
   const [HasNextPage, setHasNextPage] = useState(true)
+  const [CityAreaList, setCityAreaList] = useState([])
+  const [BuildingTypeList, setBuildingTypeList] = useState([])
   const [FilterMenus] = useState([
-    { name: '面积', id: 1 },
+    { name: '区域', id: 1 },
     { name: '价格', id: 2 },
     { name: '户型', id: 3 },
     { name: '更多', id: 4 }
   ])
   const [CurrentFilter, setCurrentFilter] = useState(null)
   const [FilterData, setFilterData] = useState({
+    buildingArea: '-',
     area: '-',
     price: '-',
     priceType: null,
     houseType: '-',
-    buildingType: '-'
+    buildingType: '-',
+    orderBy: '-',
+    marketStatus: '-',
+    name: '-'
   })
 
   useEffect(() => {
     if (city.curCity.name) {
-      GetProjectList()
+      CityArea()
+      GetBuildingTypeList()
     }
   }, [pageNumber, city])
 
   useEffect(() => {
-    if(pageNumber === 1) {
+    if (pageNumber === 1) {
       GetProjectList()
     } else {
       setPageNumber(1)
     }
   }, [FilterData])
 
+  useEffect(() => {
+    if (CityAreaList.length) {
+      GetProjectList()
+    }
+  }, [CityAreaList])
+
+  const CityArea = () => {
+    fetch({ url: API_CITY_AREA, method: 'get', payload: { cityId: city.curCity.id, leveltype: 3 } }).then((res) => {
+      setCityAreaList([{ id: '-', name: '不限' }].concat(res || []))
+    })
+  }
+
+  const GetBuildingTypeList = () => {
+    fetch({ url: API_ITEMS_TYPE, method: 'get' }).then((res) => {
+      const ResData = res.records || []
+      let Arr = ResData.map((item) => {
+        return { name: item.buildingTypeName, id: item.buildingTypeId }
+      })
+      setBuildingTypeList([{ id: '-', name: '不限' }].concat(Arr))
+    })
+  }
+
   const GetProjectList = () => { // 获取项目列表
     setHasNextPage(false)
-    let Data = {...FilterData}
-    for(let key in Data) {
-      Data[key] = Data[key] === '-' ? null : Data[key]
+    let Data = {}
+    for (let key in FilterData) {
+      if (FilterData[key] !== '-' && FilterData[key] !== null) {
+        Data[key] = FilterData[key]
+      }
     }
-    fetch({ url: API_INDEX_PROJECTS, method: 'get', payload: { cityId: city.curCity.id, pageNumber, pageSize, ...Data } }).then((res) => {
+    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { cityId: city.curCity.id, pageNumber, pageSize, ...Data } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)
@@ -86,6 +118,14 @@ export default withLayout(() => {
     setFilterData(Data)
   }
 
+  const FiltersChange = (e) => {
+    let Data = { ...FilterData }
+    e.map((item) => {
+      Data[item.name] = item.value
+    })
+    setFilterData(Data)
+  }
+
   const PriceChange = (e) => {
     let Data = { ...FilterData }
     for (let key in e) {
@@ -94,6 +134,10 @@ export default withLayout(() => {
     setFilterData(Data)
   }
 
+  const SearchConfirm = (e) => {
+    setFilterData({ ...FilterData, name: e.detail.value })
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
       if (pageNumber === 1) {
@@ -110,7 +154,7 @@ export default withLayout(() => {
       <view className='Search'>
         <view>
           <text className='iconfont icon-sousuo'></text>
-          <text>输入项目名称或直播标题</text>
+          <Input confirm-type='search' placeholder='输入项目名称' onConfirm={SearchConfirm}></Input>
         </view>
       </view>
 
@@ -124,17 +168,17 @@ export default withLayout(() => {
               </view>
             ))
           }
-          <text className='iconfont icon-paixu Sort'></text>
+          <text className='iconfont icon-paixu Sort' onClick={() => { setCurrentFilter(CurrentFilter === 5 ? null : 5) }}></text>
         </view>
       </view>
 
       <view className='flex-item'>
         <view className='FilterContainer' style={{ display: !!CurrentFilter ? 'block' : 'none' }}>
 
-          {/* 面积 */}
+          {/* 区域 */}
           {
             CurrentFilter === 1 &&
-            <FilterForArea change={FilterChange} defaultValue={FilterData.area}></FilterForArea>
+            <FilterForCityArea change={FilterChange} defaultValue={FilterData.buildingArea} List={CityAreaList} Cancel={() => { setCurrentFilter(null) }}></FilterForCityArea>
           }
 
           {/* 价格 */}
@@ -152,7 +196,13 @@ export default withLayout(() => {
           {/* 更多 */}
           {
             CurrentFilter === 4 &&
-            <FilterForMore change={FilterChange} defaultValue={FilterData.buildingType}></FilterForMore>
+            <FilterForMore change={FiltersChange} defaultValue={[FilterData.area, FilterData.buildingType, FilterData.marketStatus]} BuildingTypeList={BuildingTypeList}></FilterForMore>
+          }
+
+          {/* 排序 */}
+          {
+            CurrentFilter === 5 &&
+            <FilterForHouseSort change={FilterChange} defaultValue={FilterData.orderBy}></FilterForHouseSort>
           }
 
         </view>

src/pages/index/buildingList/index.scss

@@ -13,17 +13,18 @@
       >text {
         display: inline-block;
         vertical-align: middle;
+        font-size: 24px;
+        color: #666;
+        line-height: 78px;
+      }
+      >input {
+        display: inline-block;
+        vertical-align: middle;
+        width: 150px;
         font-size: 20px;
-        color: #999;
         margin-left: 10px;
-        line-height: 78px;
-        &:first-child {
-          margin-left: 0;
-        }
-        &.iconfont {
-          font-size: 24px;
-          color: #666;
-        }
+        height: 78px;
+        text-align: left;
       }
     }
   }

src/pages/index/components/Location/index.jsx

@@ -1,10 +1,10 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
+
 import '@/assets/css/iconfont.css'
 import Taro from '@tarojs/taro'
 import { useSelector } from 'react-redux'
+import './index.scss'
 
-export default function Location (props) {
+export default function Location () {
 
   const city = useSelector(state => state.city)
 

src/pages/index/index.jsx

@@ -21,8 +21,6 @@ export default withLayout(() => {
   const city = useSelector(state => state.city)
   const [BannerList, setBannerList] = useState([])
   const [ProjectList, setProjectList] = useState([])
-  const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
   const [ShowHotRecommend, setShowHotRecommend] = useState(false)
   const [ShowLive, setShowLive] = useState(false)
 
@@ -45,10 +43,6 @@ export default withLayout(() => {
     })
   }
 
-  const PageRefresh = () => { // 页面下拉刷新回调
-    setPull(true)
-  }
-
   const HotRecommendChange = (e) => {
     setShowHotRecommend(e)
   }
@@ -57,19 +51,10 @@ export default withLayout(() => {
     setShowLive(e)
   }
 
-  useEffect(() => { // 下拉刷新触发
-    if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
-    }
-  }, [IsPull])
-
   return (
     <view className='Page Index'>
 
-      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y>
         <view className='PageContent'>
 
           {/* 定位 */}

src/pages/mine/addCustomer/index.jsx

@@ -4,14 +4,15 @@ import { ScrollView, Input, Image, Picker } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
-import { API_ITEMS_LIST, API_CARDS_LIST, API_RECOMENT_CLIENT } from '@/constants/api'
+import { API_ITEMS_LIST, API_CARDS_LIST, API_REPORT_CLIENT, API_RECOMENT_CLIENT, API_CHANNEL_REPORT } from '@/constants/api'
 import Taro from '@tarojs/taro'
 import './index.scss'
 
 const defaultSpecialImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg'
 
-export default withLayout(() => {
+export default withLayout((props) => {
 
+  const { type } = props
   const user = useSelector(state => state.user)
   const [PersonId, setPersonId] = useState(null)
   const [BuildingName, setBuildingName] = useState(null)
@@ -35,20 +36,28 @@ export default withLayout(() => {
     realtyConsultant: '', // 置业顾问
     describe: '', // 描述
   })
-  
+
 
   useEffect(() => {
     if (PersonId !== user.userInfo.person.personId) {
       setPersonId(user.userInfo.person.personId)
     }
   }, [user])
-  
+
   useEffect(() => {
     if (CanSubmit) {
-      const params = {...FormData, sex: SexId, intention: BuildingId, realtyConsultant: CardId}
-      fetch({ url: API_RECOMENT_CLIENT, method: 'post', payload: params }).then(() => {
-        Taro.showToast({title: '添加成功', icon: 'none'})
-        Taro.navigateBack({delta: 1})
+      let url = null
+      if(type === 'consultant') { // 置业顾问
+        url = API_REPORT_CLIENT
+      } else if(type === 'customer') { // 普通客户
+        url = API_RECOMENT_CLIENT
+      } else { // 经纪人
+        url = API_CHANNEL_REPORT
+      }
+      const params = { ...FormData, sex: SexId, intention: BuildingId, realtyConsultant: CardId }
+      fetch({ url, method: 'post', payload: params }).then(() => {
+        Taro.showToast({ title: '添加成功', icon: 'none' })
+        Taro.navigateBack({ delta: 1 })
         setCanSubmit(false)
       }).catch(() => {
         setCanSubmit(false)
@@ -98,33 +107,33 @@ export default withLayout(() => {
   }
 
   const FormInput = (e) => {
-    let Data = {...FormData}
+    let Data = { ...FormData }
     Data[e.currentTarget.dataset.type] = e.detail.value
     setFormData(Data)
   }
 
   const ToSubmit = () => {
-    if(FormData.name === '') {
-      Taro.showToast({title: '请填写客户姓名', icon: 'none'})
+    if (FormData.name === '') {
+      Taro.showToast({ title: '请填写客户姓名', icon: 'none' })
       return false
     }
-    if(SexId === null) {
-      Taro.showToast({title: '请选择客户性别', icon: 'none'})
+    if (SexId === null) {
+      Taro.showToast({ title: '请选择客户性别', icon: 'none' })
       return false
     }
-    if(FormData.phone === '') {
-      Taro.showToast({title: '请填写客户电话', icon: 'none'})
+    if (FormData.phone === '') {
+      Taro.showToast({ title: '请填写客户电话', icon: 'none' })
       return false
     }
-    if(!(/^1[3|4|5|6|7|8|9][0-9]\d{4,8}$/.test(FormData.phone)) || FormData.phone.length != 11) {
-      Taro.showToast({title: '请填写正确的客户电话', icon: 'none'})
+    if (!(/^1[3|4|5|6|7|8|9][0-9]\d{4,8}$/.test(FormData.phone)) || FormData.phone.length != 11) {
+      Taro.showToast({ title: '请填写正确的客户电话', icon: 'none' })
       return false
     }
-    if(BuildingId === null) {
-      Taro.showToast({title: '请选择客户的意向楼盘', icon: 'none'})
+    if (BuildingId === null) {
+      Taro.showToast({ title: '请选择客户的意向楼盘', icon: 'none' })
       return false
     }
-    if(!CanSubmit) {
+    if (!CanSubmit) {
       setCanSubmit(true)
     }
   }

src/pages/mine/tabData.js

@@ -1,7 +1,7 @@
 const MineMenuList = {
   User: [ // 普通用户
     [
-      { name: '推荐客户', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/recommendUser/index' }
+      { name: '推荐客户', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/addCustomer/index?type=customer' }
     ],
     [
       { name: '我的分享', icon: require('../../assets/mine-icon9.png'), router: '/pages/mine/myShare/index' },
@@ -38,7 +38,7 @@ const MineMenuList = {
   ],
   Adviser: [ // 置业顾问
     [
-      { name: '添加客户', icon: require('../../assets/mine-icon7.png'), router: '/pages/mine/addCustomer/index' },
+      { name: '添加客户', icon: require('../../assets/mine-icon7.png'), router: '/pages/mine/addCustomer/index?type=consultant' },
       { name: '我的主页', icon: require('../../assets/mine-icon15.png'), router: '/pages/mine/myHomepage/index' },
       { name: '我的推广码', icon: require('../../assets/mine-icon14.png'), router: '' },
       { name: '客户分析', icon: require('../../assets/mine-icon5.png'), router: '/pages/mine/customerAnalyse/index' },
@@ -58,11 +58,11 @@ const MineMenuList = {
   ],
   Resident: [ // 驻场管理
     [
-      { name: '推荐客户', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/recommendUser/index' },
+      // { name: '推荐客户', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/addCustomer/index?type=manager' },
       { name: '驻场管理', icon: require('../../assets/mine-icon17.png'), router: '/pages/mine/residentManager/index' }
     ],
     [
-      { name: '我的客户', icon: require('../../assets/mine-icon11.png'), router: '/pages/mine/myCustomer/index' },
+      // { name: '我的客户', icon: require('../../assets/mine-icon11.png'), router: '/pages/mine/myCustomer/index' },
       { name: '我的分享', icon: require('../../assets/mine-icon9.png'), router: '/pages/mine/myShare/index' },
       { name: '我的活动', icon: require('../../assets/mine-icon10.png'), router: '/pages/mine/myActivity/index' },
       { name: '我的收藏', icon: require('../../assets/mine-icon13.png'), router: '/pages/mine/myCollect/index' }