静态页面

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"http://127.0.0.1:8081"',
+    HOST: '"https://xlk.njyz.tech"',
+    // HOST: '"http://127.0.0.1:8081"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

src/pages/index/addedValueService/index.jsx

@@ -3,12 +3,14 @@ import '@/assets/css/iconfont.css'
 import { Image, Slider, Textarea, ScrollView } from '@tarojs/components'
 import { fetch } from '@/utils/request'
 import { API_HELP_FIND_HOUSE_SUBMIT } from '@/constants/api'
+import { useSelector } from 'react-redux'
 import './index.scss'
 import questions from './formData'
 import SubmitBuyHouseResult from '../helpToFindHouse/components/SubmitBuyHouseResult/index'
 
 export default function AddedValueService () {
 
+  const user = useSelector(state => state.user)
   const [FormData, setFormData] = useState(questions)
 
   const [StepId, setStepId] = useState(1)
@@ -30,11 +32,19 @@ export default function AddedValueService () {
 
   const SubmitForm = (data) => {
     data = data || []
-    let params = {}
+    let params = []
     data.map((item) => {
-      params[item.key] = item.result
+      if(item.key === 'budget') {
+        params.push({...item, key: 'minPrice', result: item.options[0] * 10000})
+        params.push({...item, key: 'maxPrice', result: item.result * 10000})
+      } else {
+        if(item.result !== '' || item.resultId !== null) {
+          params.push(item)
+        }
+      }
     })
-    fetch({ url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: { ...params, type: 4 } }).then((res) => {
+    params.push({question: '创建人小程序人员', result: user?.userInfo?.person?.personId, key: 'personId' })
+    fetch({ url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: params }).then((res) => {
       setResultList(res.taBuildingList || [])
       setShowPopup(true)
     })

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

@@ -7,48 +7,48 @@ import './index.scss'
 
 export default function HotRecommend (props) {
 
-  const { change = () => {} } = props
+  const { change = () => { } } = props
   const city = useSelector(state => state.city)
   const [MenuList] = useState([{ name: '热门活动', id: 'dymic' }, { name: '热门团房', id: 'house' }])
   const [CurrentId, setCurrentId] = useState('dymic')
-  const [list,setList]=useState([])
-  const [CurrentContentInfo, setCurrentContentInfo] = useState({ })
+  const [list, setList] = useState([])
+  const [CurrentContentInfo, setCurrentContentInfo] = useState({})
 
   useEffect(() => {
-    if(city.curCity.name) {
+    if (city.curCity.name) {
       GetRecommendActivity()
     }
   }, [city])
 
   const GetRecommendActivity = () => {
-    
-      queryActivityList({home:1,cityId: city.curCity.id}).then((res)=>{
-        const resArr = res.list || []
-        setList(resArr)
-        change(!!resArr.length)
-      })
+
+    queryActivityList({ home: 1, cityId: city.curCity.id }).then((res) => {
+      const resArr = res.records || []
+      setList(resArr)
+      change(!!resArr.length)
+    })
   }
 
   useEffect(() => {
-    if(list.length>0) {
-      setCurrentContentInfo(list.filter(x=>x.type==CurrentId)[0]||{})
+    if (list.length > 0) {
+      setCurrentContentInfo(CurrentId === 'dymic' ? list[0] : list[1])
     }
-  }, [CurrentId,list])
+  }, [CurrentId, list])
 
   const CutMenu = (id) => {
     return () => {
       setCurrentId(id)
     }
   }
-// x?type=dymic' },
-//     { name: '团房信息', id: 8, icon: require('../../../../assets/index-icon12.png'), router: '/pages/index/activityList/index?type=house'
+  // x?type=dymic' },
+  //     { name: '团房信息', id: 8, icon: require('../../../../assets/index-icon12.png'), router: '/pages/index/activityList/index?type=house'
   const ToMore = () => {
-    Taro.navigateTo({url: `/pages/index/activityList/index?type=${CurrentId}`})
+    Taro.navigateTo({ url: `/pages/index/activityList/index?type=${CurrentId}` })
   }
 
   const toDetail = () => {
-    if(CurrentContentInfo.dynamicId){
-      Taro.navigateTo({url: `/pages/index/activityDetail/index?id=${CurrentContentInfo.dynamicId}`})
+    if (CurrentContentInfo.dynamicId) {
+      Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${CurrentContentInfo.dynamicId}` })
     }
   }
   // url: `/pages/index/activityDetail/index?id=${data.dynamicId}`
@@ -62,9 +62,9 @@ export default function HotRecommend (props) {
             ))
           }
         </view>
-      <view className='Content' onClick={toDetail}>
+        <view className='Content' onClick={toDetail}>
           <view className='flex-h'>
-            <text className='flex-item'>{CurrentContentInfo.title||'暂无活动'}</text>
+            <text className='flex-item'>{CurrentContentInfo.title || '暂无活动'}</text>
             <text onClick={ToMore}>{CurrentId === 'dymic' ? '更多活动' : '更多团房'}</text>
           </view>
           <text>{CurrentContentInfo.halfTitle}</text>

src/pages/index/components/Menu/index.jsx

@@ -1,24 +1,24 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
+import { useState } from 'react'
 import { Swiper, SwiperItem, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
+import './index.scss'
 
-export default function Menu (props) {
+export default function Menu () {
   const List = [
-    { name: '全部楼盘', id: 1, icon: require('../../../../assets/index-icon9.png'), router: '/pages/index/buildingList/index' },
-    { name: '品牌地产', id: 2, icon: require('../../../../assets/index-icon8.png'), router: '/pages/index/brandList/index' },
-    { name: '近期开盘', id: 3, icon: require('../../../../assets/index-icon6.png'), router: `/pages/index/buildingList/index?isRecentOpening=1` },
-    { name: '帮我找房', id: 4, icon: require('../../../../assets/index-icon1.png'), router: '/pages/index/helpToFindHouse/index' },
-    { name: '增值服务', id: 5, icon: require('../../../../assets/index-icon16.png'), router: '/pages/index/addedValueService/index' },
-    { name: '地图找房', id: 6, icon: require('../../../../assets/index-icon2.png'), router: '/pages/index/findHouseFromMap/index' },
-    { name: '活动信息', id: 7, icon: require('../../../../assets/index-icon5.png'), router: '/pages/index/activityList/index?type=dymic' },
-    { name: '团房信息', id: 8, icon: require('../../../../assets/index-icon12.png'), router: '/pages/index/activityList/index?type=house' },
-    { name: '特价房', id: 9, icon: require('../../../../assets/index-icon11.png'), router: '/pages/index/specialPriceHouse/index' },
-    { name: '康养', id: 10, icon: require('../../../../assets/index-icon7.png'), router: '/pages/index/recovered/index' },
-    { name: '文旅商办', id: 11, icon: require('../../../../assets/index-icon13.png'), router: `/pages/index/buildingList/index?isCommerce=1` },
-    { name: '新闻资讯', id: 12, icon: require('../../../../assets/index-icon15.png'), router: '/pages/index/newsList/index' },
-    { name: '购房百科', id: 13, icon: require('../../../../assets/index-icon4.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
-    { name: '房贷计算', id: 14, icon: require('../../../../assets/index-icon3.png'), router: '/pages/index/mortgageCalculation/index' }
+    { name: '全部楼盘', id: 1, icon: require('@/assets/index-icon9.png'), router: '/pages/index/buildingList/index' },
+    { name: '品牌地产', id: 2, icon: require('@/assets/index-icon8.png'), router: '/pages/index/brandList/index' },
+    { name: '近期开盘', id: 3, icon: require('@/assets/index-icon6.png'), router: `/pages/index/buildingList/index?isRecentOpening=1` },
+    { name: '帮我找房', id: 4, icon: require('@/assets/index-icon1.png'), router: '/pages/index/helpToFindHouse/index' },
+    { name: '增值服务', id: 5, icon: require('@/assets/index-icon16.png'), router: '/pages/index/addedValueService/index' },
+    { name: '地图找房', id: 6, icon: require('@/assets/index-icon2.png'), router: '/pages/index/findHouseFromMap/index' },
+    { name: '活动信息', id: 7, icon: require('@/assets/index-icon5.png'), router: '/pages/index/activityList/index?type=dymic' },
+    { name: '团房信息', id: 8, icon: require('@/assets/index-icon12.png'), router: '/pages/index/activityList/index?type=house' },
+    { name: '特价房', id: 9, icon: require('@/assets/index-icon11.png'), router: '/pages/index/specialPriceHouse/index' },
+    { name: '康养', id: 10, icon: require('@/assets/index-icon7.png'), router: '/pages/index/recovered/index' },
+    { name: '文旅商办', id: 11, icon: require('@/assets/index-icon13.png'), router: `/pages/index/buildingList/index?isCommerce=1` },
+    { name: '新闻资讯', id: 12, icon: require('@/assets/index-icon15.png'), router: '/pages/index/newsList/index' },
+    { name: '购房百科', id: 13, icon: require('@/assets/index-icon4.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
+    { name: '房贷计算', id: 14, icon: require('@/assets/index-icon3.png'), router: '/pages/index/mortgageCalculation/index' }
   ]
   let Arr = []
   List.map((item) => {
@@ -32,7 +32,7 @@ export default function Menu (props) {
       Arr.push([{ ...item }])
     }
   })
-  const [MenuList, setMenuList] = useState(Arr)
+  const [MenuList] = useState(Arr)
 
   const MenuClick = (item) => {
     return () => {
@@ -46,11 +46,11 @@ export default function Menu (props) {
     <view className='components Menu'>
       <view>
         <view>
-          <Swiper autoplay={false} indicator-dots={true}>
+          <Swiper autoplay={false} indicator-dots>
             {
               MenuList.map((item, index) => (
                 <SwiperItem key={`Banner-${index}`}>
-                  <view className="swiper-item">
+                  <view className='swiper-item'>
                     {
                       item.map((subItem, subIndex) => (
                         <view key={`BannerItem-${subIndex}`} onClick={MenuClick(subItem)}>

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

@@ -59,7 +59,7 @@ export default function BuyHouse (props) {
     if (StepId < 4) {
       setStepId(StepId + 1)
     } else {
-      toSubmit(FormData.concat([{result: CityId, key: 'intentArea'}]))
+      toSubmit(FormData.concat([{result: CityId, key: 'intentArea', question: '意向区域'}]))
     }
   }
 

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

@@ -1,17 +1,20 @@
 import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
-import { Image, Slider, Textarea } from '@tarojs/components'
+import { Image, Slider, Textarea, Picker } from '@tarojs/components'
 import './index.scss'
 import questions from './formData'
 
 export default function HousePurchasing (props) {
-  const { change = () => { }, toSubmit = () => {} } = props
+  const { change = () => { }, toSubmit = () => {}, CityList = [] } = props
 
   const [FormData, setFormData] = useState(questions)
 
   const [StepId, setStepId] = useState(1)
   const [StepRange, setStepRange] = useState([0, 5])
 
+  const [CityName, setCityName] = useState(null)
+  const [CityId, setCityId] = useState(null)
+
   useEffect(() => {
     if(StepId === 1) {
       setStepRange([0, 5])
@@ -50,7 +53,7 @@ export default function HousePurchasing (props) {
     if (StepId < 1) {
       setStepId(StepId + 1)
     } else {
-      toSubmit(FormData)
+      toSubmit(FormData.concat([{result: CityId, key: 'intentArea', question: '意向区域'}]))
     }
   }
 
@@ -60,6 +63,11 @@ export default function HousePurchasing (props) {
     }
   }
 
+  const PickerChange = (e) => {
+    setCityName(CityList[e.detail.value - 0].name)
+    setCityId(CityList[e.detail.value - 0].id)
+  }
+
   return (
     <view className='components BuyHouse'>
       {
@@ -105,8 +113,12 @@ export default function HousePurchasing (props) {
                         item.key === 'district' &&
                         <text className='iconfont icon-dingwei'></text>
                       }
-                      <text>不限</text>
-                      <view className='flex-item'></view>
+                      {/* <text>不限</text> */}
+                      <view className='flex-item'>
+                        <Picker range-key='name' onChange={PickerChange} value={0} range={CityList}>
+                          <text>{CityName || '请选择'}</text>
+                        </Picker>
+                      </view>
                       <text className='iconfont icon-jiantoudown'></text>
                     </view>
                   </view>

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

@@ -1,17 +1,20 @@
 import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
-import { Image, Slider, Textarea } from '@tarojs/components'
+import { Image, Slider, Textarea, Picker } from '@tarojs/components'
 import './index.scss'
 import questions from './formData'
 
 export default function RentingHouse (props) {
-  const { change = () => { }, toSubmit = () => {} } = props
+  const { change = () => { }, toSubmit = () => {}, CityList = [] } = props
 
   const [FormData, setFormData] = useState(questions)
 
   const [StepId, setStepId] = useState(1)
   const [StepRange, setStepRange] = useState([0, 4])
 
+  const [CityName, setCityName] = useState(null)
+  const [CityId, setCityId] = useState(null)
+
   useEffect(() => {
     if(StepId === 1) {
       setStepRange([0, 4])
@@ -52,7 +55,7 @@ export default function RentingHouse (props) {
     if (StepId < 2) {
       setStepId(StepId + 1)
     } else {
-      toSubmit(FormData)
+      toSubmit(FormData.concat([{result: CityId, key: 'intentArea', question: '意向区域'}]))
     }
   }
 
@@ -62,6 +65,11 @@ export default function RentingHouse (props) {
     }
   }
 
+  const PickerChange = (e) => {
+    setCityName(CityList[e.detail.value - 0].name)
+    setCityId(CityList[e.detail.value - 0].id)
+  }
+
   return (
     <view className='components BuyHouse'>
       {
@@ -107,8 +115,12 @@ export default function RentingHouse (props) {
                         item.key === 'district' &&
                         <text className='iconfont icon-dingwei'></text>
                       }
-                      <text>不限</text>
-                      <view className='flex-item'></view>
+                      {/* <text>不限</text> */}
+                      <view className='flex-item'>
+                        <Picker range-key='name' onChange={PickerChange} value={0} range={CityList}>
+                          <text>{CityName || '请选择'}</text>
+                        </Picker>
+                      </view>
                       <text className='iconfont icon-jiantoudown'></text>
                     </view>
                   </view>

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

@@ -38,7 +38,7 @@ export default function SubmitBuyHouseResult (props) {
                   </view>
                 </view>
                 {
-                  List.map((item, index) => (
+                  List.slice(0, 1).map((item, index) => (
                     <Block key={`ListItem-${index}`}>
                       <view className='PlanTitle'>“方案一”</view>
                       <view className='RecommendBuildingItem' onClick={() => {Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${item.buildingId}` })}}>

src/pages/index/helpToFindHouse/index.jsx

@@ -4,6 +4,7 @@ import { ScrollView, Image } from '@tarojs/components'
 import { fetch } from '@/utils/request'
 import { API_HELP_FIND_HOUSE_SUBMIT, API_CITY_LIST } from '@/constants/api'
 import '@/assets/css/iconfont.css'
+import { useSelector } from 'react-redux'
 import './index.scss'
 import BuyHouse from './components/BuyHouse/index'
 import RentingHouse from './components/RentingHouse/index'
@@ -12,6 +13,7 @@ import SubmitBuyHouseResult from './components/SubmitBuyHouseResult/index'
 
 export default withLayout(() => {
 
+  const user = useSelector(state => state.user)
   const [DemandList] = useState([
     { name: '我要买房', id: 1, icon: '', spell: 'MAI FANG' },
     { name: '我要租房', id: 2, icon: '', spell: 'ZU FANG' },
@@ -41,11 +43,19 @@ export default withLayout(() => {
 
   const submitForm = (data) => {
     data = data || []
-    let params = {}
+    let params = []
     data.map((item) => {
-      params[item.key] = item.result
+      if(item.key === 'budget') {
+        params.push({...item, key: 'minPrice', result: CurrentDemandId === 2 ? item.options[0] : item.options[0] * 10000})
+        params.push({...item, key: 'maxPrice', result: CurrentDemandId === 2 ? item.result : item.result * 10000})
+      } else {
+        if(item.result !== '' || item.resultId !== null) {
+          params.push(item)
+        }
+      }
     })
-    fetch({ url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: { ...params, type: CurrentDemandId } }).then((res) => {
+    params.push({question: '创建人小程序人员', result: user?.userInfo?.person?.personId, key: 'personId' })
+    fetch({ url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: params }).then((res) => {
       setResultList(res.taBuildingList || [])
       setShowPopup(true)
     })

src/pages/index/specialPriceHouse/index.jsx

@@ -3,50 +3,75 @@ import Taro from '@tarojs/taro'
 import withLayout from '@/layout'
 import { ScrollView, Image } from '@tarojs/components'
 import Disclaimer from '@/components/Disclaimer'
-import { getSpecialRoomList } from '@/services/project'
 import { getImgURL } from '@/utils/image'
 import { formateLeftTime } from '@/utils/tools'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_SPECIAL_ROOM_LIST } from '@/constants/api'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
 const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg'
 
-export default withLayout((props) => {
-  const { city } = props
-
-  const [list, setList] = useState([])
-
-  const getRoomList = (params) => {
-    Taro.showLoading()
-    getSpecialRoomList({
-      cityId: city?.id,
-      ...params,
-    }).then((res) => {
-      const { records } = res
-      setList(records || [])
-      Taro.hideLoading()
-    }).catch((err) => {
-      console.error(err)
-      Taro.hideLoading()
+export default withLayout(() => {
+  
+  const user = useSelector(state => state.user)
+  const [PageList, setPageList] = useState([])
+  const [IsPull, setPull] = useState(false)
+  const [PersonId, setPersonId] = useState(null)
+  const [pageNumber, setPageNumber] = useState(1)
+  const [HasNextPage, setHasNextPage] = useState(true)
+
+  useEffect(() => {
+    if(user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    if(PersonId) {
+      GetPageList()
+    }
+  }, [pageNumber, PersonId])
+
+  const PageRefresh = () => { // 页面下拉刷新回调
+    setPull(true)
+  }
+
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_SPECIAL_ROOM_LIST, method: 'get', payload: { pageNumber, pageSize: 10 } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
     })
   }
 
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
+  useEffect(() => { // 下拉刷新触发
+    if (IsPull) {
+      if(pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
+    }
+  }, [IsPull])
+
   const goto = (it) => {
     Taro.navigateTo({
       url: `/pages/index/buildingDetail/index?id=${it.buildingId}`
     })
   }
 
-  useEffect(() => {
-    console.log('------params---->', city, city?.id)
-    if (city?.id) {
-      getRoomList({ pageNum: 1 })
-    }
-  }, [city?.id])
-
   return (
     <view className='Page specialPriceHouse'>
-      <ScrollView scroll-y>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#f8f8f8'>
         <view className='PageContent'>
 
           {/* 主图 */}
@@ -57,7 +82,7 @@ export default withLayout((props) => {
           {/* 列表 */}
           <view className='List'>
             {
-              list.map((item, index) => {
+              PageList.map((item, index) => {
                 const mainImg = getImgURL(item?.buildingListImg?.length ? item.buildingListImg[0].url : null)
                 const price = item.price || '价格待定'
                 const shareNum = item.shareList?.total || 0