静态页面

src/assets/css/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "17169429",
+      "name": "分 享",
+      "font_class": "fenxiang",
+      "unicode": "e60e",
+      "unicode_decimal": 58894
+    },
     {
       "icon_id": "8353259",
       "name": "关  闭",

src/assets/css/iconfont.svg

@@ -20,6 +20,9 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="fenxiang" unicode="&#58894;" d="M857.03473144 234.56598896000003a145.69076425 145.69076425 0 0 1-135.99176748-84.51247763L422.04630781 277.24671973a176.12554658 176.12554658 0 0 1 27.0131212 95.83226191 180.47337276 180.47337276 0 0 1-5.14535625 43.55544112l190.86699198 148.13480829a153.56315918 153.56315918 0 0 1 93.28531026-30.48623613 149.85850253 149.85850253 0 1 1-149.88422901 149.80704873 159.50604551 159.50604551 0 0 1 11.31978341-59.17159775l-176.09982012-135.03987598a191.38152832 191.38152832 0 1 1-157.78235128-297.96758437 203.03576016 203.03576016 0 0 1 108.05248302 29.58579843l343.42680674-146.35966025a150.09004336 150.09004336 0 1 1 149.93568368 159.50604551z"  horiz-adv-x="1075" />
+
+    
     <glyph glyph-name="guanbi" unicode="&#58890;" d="M512-37.875C278.95608521-37.875 90.125 150.95608520999997 90.125 384S278.95608521 805.875 512 805.875s421.875-188.83108521 421.875-421.875-188.83108521-421.875-421.875-421.875z m0 803.56311035C301.73815917 765.68811036 130.31188964 594.2626647899999 130.31188964 384S301.73733521 2.311889640000004 512 2.311889640000004c210.26184083 0 381.68811036 171.42544555 381.68811036 381.68811036S722.26266479 765.68811036 512 765.68811036zM542.80841065 384l163.39910888 163.39828492c8.02716065 8.02798462 8.02716065 21.43157959 0 30.80841063l-1.35049438 1.32659913a21.02124023 21.02124023 0 0 1-29.45874023 0L512 414.80841065 348.60171508 578.20751953a21.02124023 21.02124023 0 0 1-29.45874023 0l-1.35049438-1.35049438c-8.02716065-8.02716065-8.02716065-21.43157959 0-30.80841065L481.19158935 384 317.79248047 220.60171507999996c-8.02716065-8.02798462-8.02716065-21.43157959 0-30.80841063l1.35049438-1.35049439a21.02124023 21.02124023 0 0 1 29.45874023 0L512 353.16687011l163.39828492-163.3982849a21.02124023 21.02124023 0 0 1 29.45874023 0l1.35049438 1.35049438c8.02716065 8.02716065 8.02716065 21.43157959 0 30.80841064L542.80841065 384z"  horiz-adv-x="1024" />
 
     

src/components/ProjectListItem/index.jsx

@@ -1,42 +1,43 @@
 import React, { useState, useEffect } from 'react'
 import './index.scss'
+import '@/assets/css/iconfont.css'
 import Taro from '@tarojs/taro'
+import { Image } from '@tarojs/components'
 
 export default function ProjectListItem (props) {
   const { Data = {} } = props
   return (
-    <view className='components ProjectListItem flex-h' onClick={() => {Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${Data.id}` })}}>
+    <view className='components ProjectListItem flex-h' onClick={() => {Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${Data.buildingId}` })}}>
       <view className='Img'>
         <view>
-          {
-            Data.img &&
-            <Image mode='aspectFill' className='centerLabel' src={Data.img || null} />
-          }
+          <Image mode='aspectFill' className='centerLabel' src={Data.buildingListImg.length ? Data.buildingListImg[0].url : null} />
         </view>
       </view>
       <view className='flex-item'>
         <view className='Name flex-h'>
           <view className='flex-item'>
-            <text>楼盘名称</text>
+            <text>{Data.buildingName}</text>
           </view>
-          <text>约</text>
-          <text>20000m²</text>
+          <text></text>
+          <text>{Data.price}</text>
         </view>
-        <text className='Address'>楼盘地址sdsdsdsdsds</text>
+        <text className='Address'>{Data.address}</text>
         <view className='Tags'>
-          <text>标签1</text>
-          <text>标签2</text>
-          <text>标签3</text>
+          {
+            Data.buildingTag.map((item, index) => (
+              <text key={`Tags-${index}`}>{item.tagName}</text>
+            ))
+          }
         </view>
         <view className='ShareInfo'>
-          {/* <text className='iconfont'></text> */}
-          <text>3次分享</text>
+          <text className='iconfont icon-fenxiang'></text>
+          <text>{Data.shareNum}次分享</text>
           <view className='Users'>
             <view></view>
             <view></view>
             <view></view>
           </view>
-          <text>...9人围观</text>
+          <text>...{Data.pvNum}人围观</text>
         </view>
       </view>
     </view>

src/constants/api.js

@@ -14,6 +14,7 @@ const resolvePath = api => `${host + pathname}/${api}`
 
 // 帮我找房
 export const API_HELP_FIND_HOUSE_QUESTION = resolvePath('houseProperty') // 问卷列表
+export const API_HELP_FIND_HOUSE_SUBMIT = resolvePath('searchHouse') // 问卷提交
 
 // common
 export const API_PRELOAD = resolvePath('preload')

src/pages/index/components/Banner/index.jsx

@@ -11,10 +11,7 @@ export default function Banner (props) {
           List.map((item, index) => (
             <SwiperItem key={`Banner-${index}`}>
               <view className="swiper-item">
-                {
-                  item.img &&
-                  <Image mode='aspectFill' className='centerLabel' src={item.img || null} />
-                }
+                <Image mode='aspectFill' className='centerLabel' src={item.image || null} />
               </view>
             </SwiperItem>
           ))

src/pages/index/components/HotRecommend/index.jsx

@@ -1,18 +1,40 @@
 import React, { useState, useEffect } from 'react'
 import './index.scss'
 import '../../../../assets/css/iconfont.css'
+import { useSelector } from 'react-redux'
+import Taro from '@tarojs/taro'
+import { fetch } from '@/utils/request'
+import { API_ACTIVITY_LIST } from '@/constants/api'
 
 export default function HotRecommend (props) {
+
+  const city = useSelector(state => state.city)
   const [MenuList] = useState([{ name: '热门活动', id: 1 }, { name: '热门团房', id: 2 }])
   const [CurrentId, setCurrentId] = useState(1)
   const [CurrentContentInfo, setCurrentContentInfo] = useState({ name: '#大运河孔雀城时代', desc: '5月30日六一儿童节表演赛案场展开！' })
 
+  useEffect(() => {
+    if(city.curCity.name) {
+      GetRecommendActivity()
+    }
+  }, [city])
+
+  const GetRecommendActivity = () => {
+    fetch({url: API_ACTIVITY_LIST, method: 'get', payload: {pageNum: 1, pageSize: 1, cityId: city.curCity.id}}).then((res) => {
+      
+    })
+  }
+
   const CutMenu = (id) => {
     return () => {
       setCurrentId(id)
     }
   }
 
+  const ToMore = () => {
+    Taro.navigateTo({url: `/pages/index/activityList/index?type=${CurrentId}`})
+  }
+
   return (
     <view className='components HotRecommend'>
       <view>
@@ -26,7 +48,7 @@ export default function HotRecommend (props) {
         <view className='Content'>
           <view className='flex-h'>
             <text className='flex-item'>{CurrentContentInfo.name}</text>
-            <text>{CurrentId === 1 ? '更多活动' : '更多团房'}</text>
+            <text onClick={ToMore}>{CurrentId === 1 ? '更多活动' : '更多团房'}</text>
           </view>
           <text>{CurrentContentInfo.desc}</text>
         </view>

src/pages/index/components/LiveSale/index.jsx

@@ -1,12 +1,31 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, } from 'react'
 import './index.scss'
 import '../../../../assets/css/iconfont.css'
 import { ScrollView, Image } from '@tarojs/components'
+import Taro from '@tarojs/taro'
+import emptyImg from '@/assets/empty.png'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_LIVE_DEATIL } from '@/constants/api'
 
 export default function LiveSale (props) {
+
+  const city = useSelector(state => state.city)
   const [MenuList] = useState([{ name: '全部', id: 1 }, { name: '预告', id: 2 }, { name: '直播中', id: 3 }, { name: '新房推荐', id: 4 }])
   const [CurrentId, setCurrentId] = useState(1)
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', ''])
+  const [PageList, setPageList] = useState([])
+
+  useEffect(() => {
+    if(city.curCity.name) {
+      GetLiveList()
+    }
+  }, [city])
+
+  const GetLiveList = () => {
+    fetch({url: API_LIVE_DEATIL, method: 'get', payload: {cityId: city.curCity.id, pageNum: 1, pageSize: 20}}).then((res) => {
+      setPageList(res.records || [])
+    })
+  }
 
   const CutMenu = (id) => {
     return () => {
@@ -28,8 +47,8 @@ export default function LiveSale (props) {
           <ScrollView scroll-x={true}>
             {
               PageList.map((item, index) => (
-                <view className='ListItem' key={`List-${index}`}>
-                  <Image mode='aspectFill' className='centerLabel' src={null} />
+                <view className='ListItem' key={`List-${index}`} style={{display: CurrentId === 1 || (CurrentId === 2 && item.kind === 'notice') || (CurrentId === 3 && item.kind === 'live')  || (CurrentId === 4 && item.kind !== 'notice') ? 'inline-block' : 'none'}}>
+                  <Image mode='aspectFill' className='centerLabel' src={`http://81.69.196.8:8567${item.images}`} />
                 </view>
               ))
             }

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

@@ -2,9 +2,12 @@ import React, { useState, useEffect } from 'react'
 import './index.scss'
 import '../../../../assets/css/iconfont.css'
 import Taro from '@tarojs/taro'
+import { useSelector } from 'react-redux'
 
 export default function Location (props) {
 
+  const city = useSelector(state => state.city)
+
   const ToLocation = () => {
     Taro.navigateTo({ url: `/pages/index/location/index` })
   }
@@ -16,7 +19,7 @@ export default function Location (props) {
   return (
     <view className='components Location flex-h'>
       <text className='iconfont icon-dingwei' onClick={ToLocation}></text>
-      <text onClick={ToLocation}>南京市</text>
+      <text onClick={ToLocation}>{city.curCity?.name || '正在定位'}</text>
       <text className='iconfont icon-jiantoudown' onClick={ToLocation}></text>
       <view className='flex-item'>
         <text className='iconfont icon-sousuo' onClick={ToSearch}></text>

src/pages/index/helpToFindHouse/components/BuyHouse/formData.js

@@ -0,0 +1,157 @@
+const questions = [
+  {
+    question: '你的购房预算是多少？',
+    key: 'budget',
+    type: 'range',
+    result: '',
+    resultId: null,
+    options: [100, 500]
+  },
+  {
+    question: '你想购买的是新房还是二手房？',
+    key: 'isNew',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    options: [
+      { name: '新房', id: 1 },
+      { name: '二手房', id: 2 },
+      { name: '不限', id: 3 }
+    ]
+  },
+  {
+    question: '你想住几居室的房子？',
+    key: 'layout',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    options: [
+      { name: '一室一厅', id: 1 },
+      { name: '二室一厅', id: 2 },
+      { name: '二室二厅', id: 3 },
+      { name: '三室一厅', id: 4 },
+      { name: '三室二厅', id: 5 },
+      { name: '四室一厅', id: 6 },
+      { name: '四室二厅', id: 7 },
+      { name: '五室及以上', id: 8 }
+    ]
+  },
+  {
+    question: '你想买的区域是？',
+    key: 'district',
+    type: 'select',
+    result: '',
+    resultId: null,
+    options: []
+  },
+  {
+    question: '你的购房目的？',
+    key: 'purpose',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    options: [
+      { name: '刚需', id: 1 },
+      { name: '结婚', id: 2 },
+      { name: '养老', id: 3 },
+      { name: '改善', id: 4 },
+      { name: '教育', id: 5 },
+      { name: '投资', id: 6 }
+    ]
+  },
+  {
+    question: '你更注重项目的哪些优势？',
+    key: 'advantage',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    options: [
+      { name: '发展规划', id: 1 },
+      { name: '学区', id: 2 },
+      { name: '交通', id: 3 },
+      { name: '配套', id: 4 },
+      { name: '环境', id: 5 }
+    ]
+  },
+  {
+    question: '你对小区物业管理和社区设施有什么要求？',
+    key: 'facility',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    remark: '',
+    options: [
+      { name: '楼栋管家', id: 1 },
+      { name: '金钥匙服务', id: 2 },
+      { name: '社区娱乐', id: 3 },
+      { name: '会所功能', id: 4 }
+    ]
+  },
+  {
+    question: '你想买多大面积？',
+    key: 'area',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    options: [
+      { name: '60㎡以下', id: 1 },
+      { name: '60-90㎡', id: 2 },
+      { name: '90-110㎡', id: 3 },
+      { name: '110-130㎡', id: 4 },
+      { name: '130-150㎡', id: 5 },
+      { name: '150-200㎡', id: 6 },
+      { name: '200㎡以上', id: 7 }
+    ]
+  },
+  {
+    question: '你更喜欢的朝向？',
+    key: 'orientation',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    options: [
+      { name: '朝东', id: 1 },
+      { name: '朝南', id: 2 },
+      { name: '朝西', id: 3 },
+      { name: '朝北', id: 4 },
+      { name: '南北通透', id: 5 }
+    ]
+  },
+  {
+    question: '你想住高楼层还是低楼层？',
+    key: 'isHigh',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    options: [
+      { name: '低楼层', id: 1 },
+      { name: '中楼层', id: 2 },
+      { name: '高楼层', id: 3 },
+      { name: '低层', id: 4 },
+      { name: '顶层', id: 5 }
+    ]
+  },
+  {
+    question: '你对楼龄的要求是？',
+    key: 'buildingAge',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    options: [
+      { name: '5年以内', id: 1 },
+      { name: '10年以内', id: 2 },
+      { name: '15年以内', id: 3 },
+      { name: '20年以内', id: 4 },
+      { name: '20年以上', id: 5 }
+    ]
+  },
+  {
+    question: '你还有其他要求吗？',
+    key: 'remark',
+    type: 'textarea',
+    result: '',
+    resultId: null
+  },
+]
+
+export default questions

src/pages/index/helpToFindHouse/components/BuyHouse/index.jsx

@@ -1,137 +1,65 @@
 import React, { useState, useEffect } from 'react'
 import './index.scss'
 import '../../../../../assets/css/iconfont.css'
-import { Image, Input, Slider, Textarea } from '@tarojs/components'
+import { Image, Slider, Textarea } from '@tarojs/components'
 import SubmitBuyHouseResult from '../SubmitBuyHouseResult/index'
+import questions from './formData'
 
 export default function BuyHouse (props) {
-  const { change = () => { } } = props
+  const { change = () => { }, toSubmit = () => {} } = props
 
-  const [SingleList] = useState([
-    { name: '首套', id: 1 },
-    { name: '二套', id: 2 }
-  ])
-  const [CurrnetSingleId, setCurrnetSingleId] = useState(null)
-
-  const [NewOldList] = useState([
-    { name: '新房', id: 1 },
-    { name: '二手房', id: 2 }
-  ])
-  const [CurrnetNewOldId, setCurrnetNewOldId] = useState(null)
-
-  const [HouseTypeList] = useState([
-    { name: '一室一厅', id: 1 },
-    { name: '二室一厅', id: 2 },
-    { name: '二室二厅', id: 3 },
-    { name: '三室一厅', id: 4 },
-    { name: '三室二厅', id: 5 },
-    { name: '四室一厅', id: 6 },
-    { name: '四室二厅', id: 7 },
-    { name: '五室及以上', id: 8 }
-  ])
-  const [CurrnetHouseTypeId, setCurrnetHouseTypeId] = useState(null)
-
-  const [AreaList] = useState([
-    { name: '60㎡以下', id: 1 },
-    { name: '60-90㎡', id: 2 },
-    { name: '90-110㎡', id: 3 },
-    { name: '110-130㎡', id: 4 },
-    { name: '130-150㎡', id: 5 },
-    { name: '150-200㎡', id: 6 },
-    { name: '200㎡以上', id: 7 }
-  ])
-  const [CurrnetAreaId, setCurrnetAreaId] = useState(null)
-
-  const [PreferenceList] = useState([
-    { name: '南北通透', id: 1 },
-    { name: '朝南', id: 2 },
-    { name: '低楼层', id: 3 },
-    { name: '高楼层', id: 4 },
-    { name: '精装修', id: 5 },
-    { name: '电梯房', id: 6 },
-    { name: '近地铁', id: 7 },
-    { name: '满五年', id: 8 },
-    { name: '满两年', id: 9 },
-    { name: '楼龄5年内', id: 10 },
-    { name: '楼龄10年内', id: 11 }
-  ])
-  const [CurrnetPreferenceId, setCurrnetPreferenceId] = useState(null)
-
-  const [GoalList] = useState([
-    { name: '刚需', id: 1 },
-    { name: '结婚', id: 2 },
-    { name: '养老', id: 3 },
-    { name: '改善', id: 4 },
-    { name: '教育', id: 5 },
-    { name: '投资', id: 6 }
-  ])
-  const [CurrnetGoalId, setCurrnetGoalId] = useState(null)
-
-  const [LongTimeList] = useState([
-    { name: '1月内', id: 1 },
-    { name: '6个月', id: 2 },
-    { name: '1年内', id: 3 },
-    { name: '1年后', id: 4 }
-  ])
-  const [CurrnetLongTimeId, setCurrnetLongTimeId] = useState(null)
+  const [FormData, setFormData] = useState(questions)
 
   const [StepId, setStepId] = useState(1)
+  const [StepRange, setStepRange] = useState([0, 4])
 
   const [ShowPopup, setShowPopup] = useState(false)
 
   useEffect(() => {
+    if(StepId === 1) {
+      setStepRange([0, 4])
+    } else if(StepId === 2) {
+      setStepRange([4, 7])
+    } else if(StepId === 3) {
+      setStepRange([7, 10])
+    } else if(StepId === 4) {
+      setStepRange([10, 12])
+    }
     change(StepId)
   }, [StepId])
 
-  const CutSingleId = (id) => {
+  const CutCheckbox = (item, index) => {
     return () => {
-      setCurrnetSingleId(id === CurrnetSingleId ? null : id)
+      let newFormData = [...FormData]
+      newFormData[index].resultId = item.id
+      newFormData[index].result = item.name
+      setFormData([...newFormData])
     }
   }
 
-  const CutNewOldId = (id) => {
-    return () => {
-      setCurrnetNewOldId(id === CurrnetNewOldId ? null : id)
-    }
+  const Rangehange = (e, index) => {
+    let newFormData = [...FormData]
+    newFormData[index].result = e.detail.value
+    setFormData([...newFormData])
   }
 
-  const CutHouseTypeId = (id) => {
-    return () => {
-      setCurrnetHouseTypeId(id === CurrnetHouseTypeId ? null : id)
-    }
+  const remarkInput = (e, index) => {
+    let newFormData = [...FormData]
+    newFormData[index].remark = e.detail.value
+    setFormData([...newFormData])
   }
 
-  const CutAreaId = (id) => {
-    return () => {
-      setCurrnetAreaId(id === CurrnetAreaId ? null : id)
-    }
-  }
-
-  const CutPreferenceId = (id) => {
-    return () => {
-      setCurrnetPreferenceId(id === CurrnetPreferenceId ? null : id)
-    }
-  }
-
-  const CutGoalId = (id) => {
-    return () => {
-      setCurrnetGoalId(id === CurrnetGoalId ? null : id)
-    }
-  }
-
-  const CutLongTimeId = (id) => {
-    return () => {
-      setCurrnetLongTimeId(id === CurrnetLongTimeId ? null : id)
-    }
-  }
-
-  const PriceRangehange = (e) => {
-    console.log(e)
+  const textareaInput = (e, index) => {
+    let newFormData = [...FormData]
+    newFormData[index].result = e.detail.value
+    setFormData([...newFormData])
   }
 
   const NextStep = () => {
     if (StepId < 4) {
       setStepId(StepId + 1)
+    } else {
+      toSubmit(FormData)
     }
   }
 
@@ -144,10 +72,67 @@ export default function BuyHouse (props) {
   return (
     <view className='components BuyHouse'>
       {
-        ShowPopup && 
+        ShowPopup &&
         <SubmitBuyHouseResult></SubmitBuyHouseResult>
       }
       {
+        FormData.map((item, index) => (
+          <view className='Step' key={`Form-${index}`}>
+            {
+              index >= StepRange[0] && index < StepRange[1] &&
+              <view>
+                <text>{item.question}</text>
+                {
+                  item.type === 'checkbox' &&
+                  <view className='CheckList'>
+                    {
+                      item.options.map((subItem, subIndex) => (
+                        <view key={`${item.key}-${subIndex}`} className={item.resultId === subItem.id ? 'active' : ''} onClick={CutCheckbox(subItem, index)}>
+                          {subItem.name}
+                          <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
+                        </view>
+                      ))
+                    }
+                  </view>
+                }
+                {
+                  item.type === 'checkbox' && item.remark !== undefined &&
+                  <view className='Textarea'>
+                    <Textarea placeholder="请说出您的其他需求，让我们更好的为您服务！" onInput={(e) => {remarkInput(e, index)}} />
+                  </view>
+                }
+                {
+                  item.type === 'range' &&
+                  <view className='RangeList'>
+                    <Slider activeColor="#193C83" block-color="#193C83" onChange={(e) => { Rangehange(e, index) }} min={item.options[0]} max={item.options[1]} show-value />
+                  </view>
+                }
+                {
+                  item.type === 'select' &&
+                  <view className='Area'>
+                    <view className='flex-h'>
+                      {
+                        item.key === 'district' &&
+                        <text className='iconfont icon-dingwei'></text>
+                      }
+                      <text>不限</text>
+                      <view className='flex-item'></view>
+                      <text className='iconfont icon-jiantoudown'></text>
+                    </view>
+                  </view>
+                }
+                {
+                  item.type === 'textarea' &&
+                  <view className='Textarea'>
+                    <Textarea placeholder="请说出您的其他需求，让我们更好的为您服务！" onInput={(e) => {textareaInput(e, index)}} />
+                  </view>
+                }
+              </view>
+            }
+          </view>
+        ))
+      }
+      {/* {
         StepId === 1 &&
         <view className='Step'>
           <view>
@@ -308,7 +293,7 @@ export default function BuyHouse (props) {
             </view>
           </view>
         </view>
-      }
+      } */}
 
       <view className='Btn'>
         <text className='active' onClick={NextStep}>下一步</text>

src/pages/index/helpToFindHouse/index.jsx

@@ -7,7 +7,7 @@ import BuyHouse from './components/BuyHouse/index'
 import RentingHouse from './components/RentingHouse/index'
 import HousePurchasing from './components/HousePurchasing/index'
 import { fetch } from '@/utils/request'
-import { API_HELP_FIND_HOUSE_QUESTION } from '@/constants/api'
+import { API_HELP_FIND_HOUSE_SUBMIT } from '@/constants/api'
 
 export default withLayout((props) => {
 
@@ -17,15 +17,9 @@ export default withLayout((props) => {
     { name: '我要租房', id: 2, icon: '', spell: 'ZU FANG' },
     { name: '海外置业', id: 3, icon: '', spell: 'ZHI YE' }
   ])
-  const [CurrentDemandId, setCurrentDemandId] = useState(2)
+  const [CurrentDemandId, setCurrentDemandId] = useState(1)
   const [ShowDemand, setShowDemand] = useState(true)
 
-  useEffect(() => {
-    fetch({url: API_HELP_FIND_HOUSE_QUESTION}).then(() => {
-      
-    })
-  }, [])
-
   const CutDemandId = (id) => {
     return () => {
       setCurrentDemandId(id)
@@ -36,6 +30,17 @@ export default withLayout((props) => {
     setShowDemand(id === 1)
   }
 
+  const submitForm = (data) => {
+    data = data || []
+    let params = {}
+    data.map((item) => {
+      params[item.key] = item.result
+    })
+    fetch({url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: params}).then(() => {
+      
+    })
+  }
+
   return (
     <view className='Page helpToFindHouse'>
 
@@ -46,7 +51,7 @@ export default withLayout((props) => {
             ShowDemand &&
             <view>
               <text>选择您的需求</text>
-              <view className='Demand flex-h'>
+              <view className='Demand flex-h' style='margin-top: 10px;'>
                 {
                   DemandList.map((item, index) => (
                     <view key={`DemandItem-${index}`} className={CurrentDemandId === item.id ? 'flex-item active' : 'flex-item'} onClick={CutDemandId(item.id)}>
@@ -63,7 +68,7 @@ export default withLayout((props) => {
           {/* 买房 */}
           {
             CurrentDemandId === 1 &&
-            <BuyHouse change={StepChange}></BuyHouse>
+            <BuyHouse change={StepChange} toSubmit={submitForm}></BuyHouse>
           }
 
           {/* 租房 */}

src/pages/index/helpToFindHouse/index.scss

@@ -25,7 +25,6 @@
           padding: 0 30px;
           position: relative;
           overflow: hidden;
-          margin-top: 20px;
         }
         > .Demand {
           align-items: center;

src/pages/index/index.jsx

@@ -10,16 +10,38 @@ import ColumnTitle from './components/ColumnTitle/index'
 import ProjectListItem from '../../components/ProjectListItem/index'
 import { ScrollView } from '@tarojs/components'
 import Taro from '@tarojs/taro'
-import { connect } from 'react-redux'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_BANNER_LIST, API_INDEX_PROJECTS } from '@/constants/api'
 
 export default withLayout((props) => {
 
-  // const [PageProps] = useState(props)
-  const [BannerList, setBannerList] = useState(['', '', ''])
-  const [ProjectList, setProjectList] = useState(['', '', ''])
+  const city = useSelector(state => state.city)
+  const [PageProps] = useState(props)
+  const [BannerList, setBannerList] = useState([])
+  const [ProjectList, setProjectList] = useState([])
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
 
+  useEffect(() => {
+    if(city.curCity.name) {
+      GetBanner()
+      GetProjectList()
+    }
+  }, [city])
+
+  const GetBanner = () => { // 获取banner
+    fetch({url: `${API_BANNER_LIST}/banner`, method: 'get', payload: {cityId: city.curCity.id, showPosition: 'index'}}).then((res) => {
+      setBannerList(res || [])
+    })
+  }
+
+  const GetProjectList = () => { // 获取项目列表
+    fetch({url: API_INDEX_PROJECTS, method: 'get', payload: {cityId: city.curCity.id, pageNum: 1, pageSize: 10}}).then((res) => {
+      setProjectList(res.records || [])
+    })
+  }
+
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }