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

src/constants/api.js

 export const API_BIND_CUSTOMER = resolvePath('judgeBindCustomer')
 // 消息模板
 export const API_TEMPLATE_TYPE = resolvePath('template/of/')
+
+// 品牌商
+export const API_BRAND_LIST = resolvePath('brand')
+export const API_BRAND_INFO = resolvePath('brand')

src/pages/index/activityList/index.jsx

 import { useState, useEffect } from 'react'
 import { useSelector } from 'react-redux'
-import { useDidShow,useRouter } from '@tarojs/taro'
+import { useRouter } from '@tarojs/taro'
 import { ScrollView } from '@tarojs/components'
-import { queryActivityList, getActNewList } from '@/services/activity'
 import Disclaimer from '@/components/Disclaimer'
+import { fetch } from '@/utils/request'
+import { API_ACTIVITY_LIST } from '@/constants/api'
 
 import ActivityListItem from '../components/ActivityListItem/index'
 
 import './index.scss'
 
-export default function MyCollectForActivity (props) {
+export default function MyCollectForActivity () {
 
  const router=useRouter()
    const { type,buildingId } = router.params;
   const city = useSelector(state => state.city)
- 
+  
+  const user = useSelector(state => state.user)
   const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
+  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_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 || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+    })
+  }
+
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+      if(pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
     }
   }, [IsPull])
 
-  
-
- const getList = (params) => {
-  params.cityId = city.curCity.id;
-  if(buildingId){
-    params.buildingId = buildingId;
-  }else{
-    params.cityId = city?.curCity?.id;
-  }
-  queryActivityList({...params,type}).then((res)=>{
-    setPageList(res.list)
-  })
-  }
-  useEffect(()=>{
- 
-      getList({page :0, pageSize : 10})
-
-   
-  },[])
-  // useDidShow(() => {
-  //   getList({page :0, pageSize : 10})
-  // })
-
- 
-
   return (
     <view className='components activityList'>
-      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#f8f8f8'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#f8f8f8'>
         <view className='PageContent'>
           <view className='List'>
             {

src/pages/index/addedValueService/formData.js

+const questions = [
+  {
+    question: '你的装修预算是多少？',
+    key: 'budget',
+    type: 'range',
+    result: '',
+    resultId: null,
+    options: [100, 500]
+  },
+  {
+    question: '房屋现状？',
+    key: 'status',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    options: [
+      { name: '毛坯', id: 1 },
+      { name: '旧房装修5年以内', id: 2 },
+      { name: '旧房装修5-10年', id: 3 },
+      { name: '旧房装修10年以上', id: 4 }
+    ]
+  },
+  {
+    question: '你想买多大面积？',
+    key: 'area',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    options: [
+      { name: '50㎡以下', id: 1 },
+      { name: '50-70㎡', id: 2 },
+      { name: '70-90㎡', id: 3 },
+      { name: '90-110㎡', id: 4 },
+      { name: '110-130㎡', id: 5 },
+      { name: '130-150㎡', id: 6 },
+      { name: '150-200㎡', id: 7 },
+      { name: '200㎡以上', id: 8 }
+    ]
+  },
+  {
+    question: '你喜欢哪种家装模式？',
+    key: 'type',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    options: [
+      { name: '只做设计', id: 1 },
+      { name: '材料全包', id: 2 },
+      { name: '包施工 不包材料', id: 3 },
+      { name: '施工包辅材 不包主材', id: 4 },
+      { name: '全包（设计/施工/主材..）', id: 5 }
+    ]
+  },
+  {
+    question: '你较为看重家装的哪些方面？',
+    key: 'important',
+    type: 'checkbox',
+    result: '',
+    resultId: null,
+    options: [
+      { name: '家装价格', id: 1 },
+      { name: '施工品质', id: 2 },
+      { name: '设计感', id: 3 },
+      { name: '环保', id: 4 },
+      { name: '舒适度', id: 5 },
+      { name: '实用度', id: 5 }
+    ]
+  },
+  {
+    question: '你理想的家装风格是哪些？',
+    key: 'style',
+    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 },
+      { name: '美式风格', id: 9 },
+      { name: '日式风格', id: 10 },
+      { name: '混搭风格', id: 11 }
+    ]
+  },
+  {
+    question: '你最关键的家装诉求是什么？',
+    key: 'mostImportant',
+    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 }
+    ]
+  },
+  {
+    question: '你理想中的家应该包含哪些特殊功能区域？',
+    key: 'special',
+    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 },
+      { name: '婴儿房', id: 9 },
+      { name: '其他', id: 10 }
+    ]
+  },
+  {
+    question: '你的家装是否会选择智能家居？',
+    key: 'samrt',
+    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 }
+    ]
+  }
+]
+
+export default questions

src/pages/index/addedValueService/index.jsx

-import React, { useState, useEffect } from 'react'
-import withLayout from '@/layout'
-import './index.scss'
-import { ScrollView } from '@tarojs/components'
+import { useState, useEffect } from 'react'
 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 './index.scss'
+import questions from './formData'
+import SubmitBuyHouseResult from '../helpToFindHouse/components/SubmitBuyHouseResult/index'
+
+export default function AddedValueService () {
 
-export default withLayout((props) => {
+  const [FormData, setFormData] = useState(questions)
 
-  // const [PageProps] = useState(props)
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
-  const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
+  const [StepId, setStepId] = useState(1)
+  const [StepRange, setStepRange] = useState([0, 3])
+  const [ResultList, setResultList] = useState([])
+  const [ShowPopup, setShowPopup] = useState(false)
 
-  const PageRefresh = () => { // 页面下拉刷新回调
-    setPull(true)
+  useEffect(() => {
+    if (StepId === 1) {
+      setStepRange([0, 3])
+    } else if (StepId === 2) {
+      setStepRange([3, 6])
+    } else if (StepId === 3) {
+      setStepRange([6, 8])
+    } else if (StepId === 4) {
+      setStepRange([8, 9])
+    }
+  }, [StepId])
+
+  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, type: 4 } }).then((res) => {
+      setResultList(res.taBuildingList || [])
+      setShowPopup(true)
+    })
   }
 
-  useEffect(() => { // 下拉刷新触发
-    if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+  const CutCheckbox = (item, index) => {
+    return () => {
+      let newFormData = [...FormData]
+      newFormData[index].resultId = item.id
+      newFormData[index].result = item.name
+      setFormData([...newFormData])
     }
-  }, [IsPull])
+  }
 
-  return (
-    <view className='Page addedValueService'>
+  const Rangehange = (e, index) => {
+    let newFormData = [...FormData]
+    newFormData[index].result = e.detail.value
+    setFormData([...newFormData])
+  }
 
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
-        <view className='PageContent'>
+  const remarkInput = (e, index) => {
+    let newFormData = [...FormData]
+    newFormData[index].remark = e.detail.value
+    setFormData([...newFormData])
+  }
+
+  const textareaInput = (e, index) => {
+    let newFormData = [...FormData]
+    newFormData[index].result = e.detail.value
+    setFormData([...newFormData])
+  }
 
-          增值服务
+  const NextStep = () => {
+    if (StepId < 4) {
+      setStepId(StepId + 1)
+    } else {
+      SubmitForm(FormData)
+    }
+  }
 
-          {/* bottom */}
-          <view className='PageBottom'>
-            <text>已经到底了~</text>
-          </view>
+  const PrevStep = () => {
+    if (StepId > 1) {
+      setStepId(StepId - 1)
+    }
+  }
 
+  return (
+    <view className='components AddedValueService'>
+      {
+        ShowPopup &&
+        <SubmitBuyHouseResult List={ResultList.slice(0, 1)}></SubmitBuyHouseResult>
+      }
+      <ScrollView scroll-y>
+        <view className='PageContent'>
+          {
+            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 flex-h'>
+                        <view className='flex-item'>
+                          <Slider activeColor='#193C83' block-color='#fff' onChange={(e) => { Rangehange(e, index) }} min={item.options[0]} max={item.options[1]} show-value />
+                        </view>
+                        <text>万</text>
+                      </view>
+                    }
+                    {
+                      item.type === 'textarea' &&
+                      <view className='Textarea'>
+                        <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { textareaInput(e, index) }} />
+                      </view>
+                    }
+                  </view>
+                }
+              </view>
+            ))
+          }
+
+          <view className='Btn'>
+            <text className='active' onClick={NextStep}>下一步</text>
+            <text onClick={PrevStep}>返回</text>
+          </view>
         </view>
       </ScrollView>
-
     </view>
   )
-})
+}

src/pages/index/addedValueService/index.scss

-.Page.addedValueService {
-  background: #fff;
+.components.AddedValueService {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
   > scroll-view {
     width: 100%;
     height: 100%;
+    position: relative;
     .PageContent {
       position: relative;
       overflow: hidden;
-      min-height: 100vh;
+      padding: 0 30px;
+      > .Step {
+        position: relative;
+        overflow: hidden;
+        > view {
+          position: relative;
+          overflow: hidden;
+          margin-top: 30px;
+          > text {
+            display: block;
+            font-size: 34px;
+            font-weight: bold;
+            color: #333;
+            line-height: 40px;
+            letter-spacing: 4px;
+          }
+          > view {
+            position: relative;
+            overflow: hidden;
+            margin-top: 20px;
+          }
+          > .Area {
+            > view {
+              align-items: center;
+              background: #f8f8f8;
+              border-radius: 12px;
+              padding: 24px 20px;
+              > text {
+                font-size: 26px;
+                color: #333;
+                line-height: 40px;
+                margin-left: 20px;
+                &:first-child {
+                  margin-left: 0;
+                  color: #193c83;
+                }
+              }
+            }
+          }
+          > .Purpose {
+            > view {
+              align-items: center;
+              background: #f8f8f8;
+              border-radius: 12px;
+              padding: 24px 20px;
+              > input {
+                font-size: 26px;
+                color: #333;
+                line-height: 40px;
+                display: block;
+                width: 100%;
+                background: none;
+              }
+            }
+          }
+          > .CheckList {
+            font-size: 0;
+            margin-top: 0;
+            > view {
+              display: inline-block;
+              vertical-align: middle;
+              font-size: 30px;
+              font-weight: 600;
+              color: #333;
+              line-height: 40px;
+              padding: 20px 0;
+              min-width: 194px;
+              box-sizing: border-box;
+              white-space: nowrap;
+              text-align: center;
+              border: 2px solid #193c83;
+              border-radius: 4px;
+              margin-right: 54px;
+              position: relative;
+              overflow: hidden;
+              margin-top: 20px;
+              // &:nth-child(3n + 3) {
+              //   margin-right: 0;
+              // }
+              &.active {
+                > image {
+                  display: block;
+                }
+              }
+              > image {
+                display: none;
+                width: 36px;
+                height: 36px;
+                position: absolute;
+                right: -2px;
+                bottom: -2px;
+              }
+            }
+          }
+          > .RangeList {
+            align-items: center;
+            > text {
+              color: #999;
+              font-size: 28px;
+              transform: translateX(-30px);
+            }
+          }
+          > .PriceRange {
+            > view {
+              align-items: center;
+              background: #f8f8f8;
+              border-radius: 12px;
+              padding: 24px 0;
+              > view {
+                > input {
+                  font-size: 26px;
+                  color: #333;
+                  line-height: 40px;
+                  display: block;
+                  width: 100%;
+                  background: none;
+                  text-align: center;
+                }
+              }
+            }
+          }
+          > .Textarea {
+            background: #f8f8f8;
+            border-radius: 12px;
+            padding: 20px;
+            > textarea {
+              font-size: 26px;
+              color: #333;
+              line-height: 40px;
+              display: block;
+              width: 100%;
+              background: none;
+            }
+          }
+        }
+      }
+      > .Btn {
+        padding: 0 30px;
+        margin: 150px auto 60px;
+        > text {
+          display: block;
+          text-align: center;
+          font-size: 32px;
+          line-height: 92px;
+          box-sizing: border-box;
+          border: 2px solid #193c83;
+          color: #193c83;
+          border-radius: 92px;
+          margin-top: 20px;
+          text-indent: 0;
+          font-weight: normal;
+          &.active {
+            background: #193c83;
+            color: #fff;
+          }
+        }
+      }
     }
   }
 }

src/pages/index/brandDetail/index.jsx

-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import withLayout from '@/layout'
 import Taro from '@tarojs/taro'
 import { ScrollView, Image } from '@tarojs/components'
 import ProjectListItem from '@/components/ProjectListItem/index'
+import { queryBrandInfo } from '@/services/common';
+import { getItemList } from '@/services/item';
+import { getImgURL } from '@/utils/image'
 import '@/assets/css/iconfont.css'
-import './index.scss'
 import ColumnTitle from '../components/ColumnTitle/index'
+import './index.scss'
+
+export default withLayout((props) => {
+  const { router } = props
+  const { id } = router.params
 
-export default withLayout(() => {
   const [ProjectList, setProjectList] = useState([{}, {}])
+  const [brandInfo, setBrandInfo] = useState({})
+
+  const getList = (params) => {
+    Taro.showLoading()
+    getItemList({
+      brandId: id,
+      ...(params || {}),
+    }).then((res) => {
+      const { records } = res
+      setProjectList(records || {})
+      Taro.hideLoading()
+    }).catch((err) => {
+      console.error(err)
+      Taro.hideLoading()
+    })
+  }
+
+  useEffect(() => {
+    if (id) {
+      queryBrandInfo(id).then((res) => {
+        setBrandInfo(res || {})
+      }).catch((err) => {
+        console.error(err)
+      })
+
+      getList({ pageNumber: 1 })
+    }
+  }, [id])
+
   return (
     <view className='brandDetail'>
       <ScrollView scroll-y>
 
           {/* 主图 */}
           <view className='Top'>
-            <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
+            <Image mode='scaleToFill' src={getImgURL(brandInfo.brandImg)} className='centerLabel'></Image>
           </view>
 
           {/* 简介 */}
           <view className='Desc'>
             <view>
-              <Image mode='heightFix' src={null} className='Logo'></Image>
+              <Image mode='heightFix' src={getImgURL(brandInfo.brandLogo)} className='Logo'></Image>
               <view>
-                <text>“东原”</text>
-                <text>是一家以地产开发、商业运营、物业服务为核心的大型综合企业。始终坚持稳健创进的发展战略，深耕精选,布局全国一线及强二线城市,位列2020中国房地产开发企业TOP44。</text>
+                <text>{brandInfo.brandRemark}</text>
               </view>
             </view>
           </view>

src/pages/index/brandDetail/index.scss

             >text {
               font-size: 22px;
               line-height: 48px;
-              &:first-child {
-                font-size: 48px;
-                font-weight: bold;
-                line-height: 1;
-              }
+              // &:first-child {
+              //   font-size: 48px;
+              //   font-weight: bold;
+              //   line-height: 1;
+              // }
             }
           }
         }

src/pages/index/brandList/index.jsx

 import Taro from '@tarojs/taro';
 import withLayout from '@/layout';
 import { ScrollView, View, Block, Image } from '@tarojs/components';
+import { queryBrandList } from '@/services/common';
+import { getImgURL } from '@/utils/image';
 import '@/assets/css/iconfont.css';
-import { queryCityList } from '@/services/common';
-import { dispatchCitySelected } from '@/actions/city';
-import { useDispatch } from 'react-redux';
 import './index.scss';
 
 export default withLayout(() => {
-  const dispatch = useDispatch();
   const [list, setList] = useState({});
 
   useEffect(() => {
   }, [])
 
   function initData () {
-    queryCityList().then((cityList) => {
-      console.log(`ttt`, cityList)
-      const t = cityList.reduce((prev, cur) => {
-        if (prev[cur.initial]) {
-          prev[cur.initial].push(cur)
+    queryBrandList({ pageSize: 500 }).then((res) => {
+      const { records } = res
+      const lst = (records || []).reduce((prev, cur) => {
+        if (prev[cur.indexLetter]) {
+          prev[cur.indexLetter].push(cur)
         } else {
-          prev[cur.initial] = [cur]
+          prev[cur.indexLetter] = [cur]
         }
         return prev
       }, {})
 
-      setList(t)
+      setList(lst)
     })
   }
 
   function handleSelected (item) {
-    dispatchCitySelected(item)(dispatch).then(() => {
-      Taro.navigateBack({
-        delta: 1,
-      })
+    Taro.navigateTo({
+      url: `/pages/index/brandDetail/index?id=${item.brandId}`,
     })
   }
 
               <Block key={key}>
                 <View className='city-initial'>{key}</View>
                 {list[key].map((item) => (
-                  <View key={item.id} className='city-item' onClick={() => handleSelected(item)}>
-                    <Image mode='heightFix' src={null}></Image>
-                    <text>{item.shortname}</text>
+                  <View key={item.brandId} className='city-item' onClick={() => handleSelected(item)}>
+                    <Image mode='heightFix' src={getImgURL(item.brandLogo)}></Image>
+                    <text>{item.brandName}</text>
                   </View>
                 ))}
               </Block>

src/pages/index/brandList/index.scss

   .city-item {
     padding: 30px 50px;
     background: white;
+
     >image {
       width: auto;
       height: 44px;
       margin-right: 10px;
+      vertical-align: middle;
     }
     >text {
       font-size: 34px;
       font-weight: bold;
+      vertical-align: middle;
     }
   }
 }

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

 import Taro from '@tarojs/taro'
 import { useSelector } from 'react-redux'
 import { Image } from '@tarojs/components'
-import AuthRole from '@/components/auth/AuthRole'
+import AuthRole from '@/components/Auth/AuthRole'
 // import Poster from '@/components/Poster'
 import { queryActivityList } from '@/services/activity'
 import { ROLE_CODE } from '@/constants/user'
               <Image mode='heightFix' src={require('@/assets/buildingDetail-icon2.png')}></Image>
               <text>一键推荐</text>
             </view>
-            <view className='Item'>
-              <Image mode='heightFix' src={require('@/assets/buildingDetail-icon1.png')}></Image>
-              <text>一键带看</text>
-            </view>
           </AuthRole>
         </view>
         <view className='Btn'>

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

 
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react'
+import Taro from '@tarojs/taro'
 import { Map, CoverView } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
   const CutTab = () => {
     return () => {
-      
+      Taro.navigateTo({url: `/pages/index/buildingAround/index?id=${Info.buildingId}`})
     }
   }
 

src/pages/index/buildingDetail/index.jsx

 
   }, [id, router.path])
 
+  // 户型图
+  const houseTypeImages = (DetailInfo?.buildingApartment || []).filter(x => x.apartmentType === 'apart')
+
   return (
     <view className='Page buildingDetail flex-v'>
       <view className='flex-item'>
 
                 {/* 户型介绍 */}
                 <view className='HouseTypeIntro' style={{minHeight: 0}}>
-                  <HouseTypeIntro Info={DetailInfo?.buildingApartment}></HouseTypeIntro>
+                  <HouseTypeIntro Info={houseTypeImages}></HouseTypeIntro>
                 </view>
 
                 {/* 营销活动 */}

src/pages/index/buildingDynamic/index.jsx

-
+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'
 import { ScrollView } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default withLayout((props) => {
-  const { List = [{}, {}, {}, {}, {}, {}] } = props
+  const { router } = props
+  const { id } = router.params
+  const [PageList, setPageList] = useState([])
+  
+  useEffect(() => {
+    // 获取楼盘信息
+    fetch({ url: `${API_ITEMS_DETAIL}/${id}`, spin: true }).then((res) => {
+      setPageList(res?.trendList || [])
+    })
+  }, [id, router.path])
 
   return (
     <view className='Page buildingDynamic'>
           <view className='Top'>
             <text className='iconfont icon-shengming'></text>
             <text>楼盘资讯</text>
-            <text className='active'>免责声明》</text>
+            <text className='active' onClick={() => {Taro.navigateTo({url: '/pages/index/disclaimer/index'})}}>免责声明》</text>
           </view>
 
           <view className='List'>
             {
-              List.map((item, index) => (
+              PageList.map((item, index) => (
                 <view key={`ListItem-${index}`}>
-                  <text className='Time'>2019年7月12日</text>
+                  <text className='Time'>{item.trendTime}</text>
                   <view className='ItemContent'>
-                    <text className='Title'>山和九著府预计5月加推5号楼</text>
-                    <text className='desc'>山和九著府预计5月加推5号楼，目前在售房源位于89号楼，均价26400元/㎡，户型建筑面积82、89、112㎡，预计2023年6月交付。</text>
+                    <text className='Title'>{item.trendTitle}</text>
+                    <text className='desc'>{item.trendContent}</text>
                     <view className='Line'></view>
                   </view>
                 </view>

src/pages/index/buildingInfo/index.jsx

       { name: '均价', value: Info.price || '待定', key: '' },
       { name: '销售状态', value: Info.marketStatus || '待定', key: '' },
       { name: '开盘日期', value: formateDate(Info.openingDate) || '待定', key: '' },
+      { name: '交房时间', value: formateDate(Info.receivedDate) || '待定', key: '' },
       { name: '楼盘地址', value: Info.address || '暂无', key: '' },
     ],
     [

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

 import { useState, useEffect } from 'react'
 import { useSelector } from 'react-redux'
 import Taro from '@tarojs/taro'
-import { fetch } from '@/utils/request'
-import { API_ACTIVITY_LIST } from '@/constants/api'
-import { queryActivityList, getActNewList } from '@/services/activity'
-import './index.scss'
+import { queryActivityList } from '@/services/activity'
 import '@/assets/css/iconfont.css'
+import './index.scss'
 
-export default function HotRecommend () {
+export default function HotRecommend (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 GetRecommendActivity = () => {
     
       queryActivityList({home:1,cityId: city.curCity.id}).then((res)=>{
-        console.log(res,'-----------------')
-        setList(res.list)
+        const resArr = res.list || []
+        setList(resArr)
+        change(!!resArr.length)
       })
   }
 

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

 import { fetch } from '@/utils/request'
 import { getImgURL } from '@/utils/image'
 import { API_LIVE_LIST } from '@/constants/api'
-import './index.scss'
 import '@/assets/css/iconfont.css'
+import './index.scss'
 
-export default function LiveSale () {
+export default function LiveSale (props) {
 
+  const { change = () => {} } = 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 GetLiveList = () => {
     fetch({url: API_LIVE_LIST, method: 'get', payload: {cityId: city.curCity.id, pageNum: 1, pageSize: 20}}).then((res) => {
       setPageList(res.records || [])
+      change(!!(res.records || []).length)
     })
   }
 

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

   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?type=2` },
+    { 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' },

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

 
 import '@/assets/css/iconfont.css'
 import { Image, Block } from '@tarojs/components'
+import Taro from '@tarojs/taro'
 import './index.scss'
 
 export default function SubmitBuyHouseResult (props) {
                 {
                   List.map((item, index) => (
                     <Block key={`ListItem-${index}`}>
-                      <view className='PlanTitle'>“方案一：综合匹配度<text>99%</text>”</view>
-                      <view className='RecommendBuildingItem'>
+                      <view className='PlanTitle'>“方案一”</view>
+                      <view className='RecommendBuildingItem' onClick={() => {Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${item.buildingId}` })}}>
                         <view>
                           <view className='Img'>
-                            <Image mode='aspectFill' src={null} className='centerLabel'></Image>
+                            <Image mode='aspectFill' src={item.poster} className='centerLabel'></Image>
                           </view>
                           <view className='Title flex-h'>
                             <view className='flex-item'>
-                              <text>奥园金基天著尚居</text>
+                              <text>{item.name}</text>
                             </view>
-                            <view className='Price'>约<text>20000/㎡</text></view>
+                            <view className='Price'><text>{item.price}</text></view>
                           </view>
-                          <text className='Address'>江宁禄口云熙99路号（诚信大道）</text>
+                          <text className='Address'>{item.address}</text>
                         </view>
                       </view>
                     </Block>

src/pages/index/index.jsx

   const [ProjectList, setProjectList] = useState([])
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
+  const [ShowHotRecommend, setShowHotRecommend] = useState(false)
+  const [ShowLive, setShowLive] = useState(false)
 
   useEffect(() => {
     if (city.curCity.name) {
     setPull(true)
   }
 
+  const HotRecommendChange = (e) => {
+    setShowHotRecommend(e)
+  }
+
+  const LiveChange = (e) => {
+    setShowLive(e)
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
       clearTimeout(PullTimer)
           </view>
 
           {/* 热门推荐 */}
-          <view className='HotRecommend'>
+          <view className='HotRecommend' style={{display: ShowHotRecommend ? 'block' : 'none'}}>
             <ColumnTitle Name='热门推荐' Icon='icon-shoucang'></ColumnTitle>
-            <HotRecommend></HotRecommend>
+            <HotRecommend change={HotRecommendChange}></HotRecommend>
           </view>
 
           {/* 直播购房 */}
-          <view className='LiveSale'>
+          <view className='LiveSale' style={{display: ShowLive ? 'block' : 'none'}}>
             <ColumnTitle Name='直播购房' Icon='icon-yinpin' ShowMore ToMore={() => { Taro.switchTab({ url: `/pages/video/index` }) }}></ColumnTitle>
-            <LiveSale></LiveSale>
+            <LiveSale change={LiveChange}></LiveSale>
           </view>
 
           {/* 全部项目 */}

src/pages/index/newsList/index.jsx

-import React, { useState, useEffect } from "react";
-import { useRouter } from "@tarojs/taro";
-import { useSelector } from "react-redux";
-import withLayout from "@/layout";
-import "./index.scss";
-import { ScrollView } from "@tarojs/components";
-import "@/assets/css/iconfont.css";
-import NewsListItem from "../components/NewsListItem/index";
-import { useDidShow } from "@tarojs/taro";
-import { queryNewsList } from "@/services/news";
+import { useState, useEffect } from 'react'
+import { useSelector } from 'react-redux'
+import withLayout from '@/layout'
+import { ScrollView } from '@tarojs/components'
+import '@/assets/css/iconfont.css'
+import { fetch } from '@/utils/request'
+import { API_NEWS_LIST } from '@/constants/api'
+import './index.scss'
+import NewsListItem from '../components/NewsListItem/index'
 
-export default withLayout((props) => {
-  const router = useRouter();
-  const { buildingId, from } = router.params;
-  const city = useSelector((state) => state.city);
-  // const [PageProps] = useState(props)
-  const [PageList, setPageList] = useState([]);
-  const [IsPull, setPull] = useState(false);
-  const [PullTimer, setPullTimer] = useState(null);
-
-  const PageRefresh = () => {
-    // 页面下拉刷新回调
-    setPull(true);
-  };
+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 (IsPull) {
-      clearTimeout(PullTimer);
-      setPullTimer(
-        setTimeout(() => {
-          setPull(false);
-        }, 2000)
-      );
+    if(user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
     }
-  }, [IsPull]);
-
-  // componentDidShow() {
-  //   // // this.onPullDownRefresh()
-  //   // console.log('----', this)
-  //   const pageSize = (Taro.getStorageSync('newsPageIndex') || 1) * 10
-  //   loadData(1, pageSize)
-  // }
+  }, [user])
 
-  // loadList(pageNumber, pageSize = 10) {
-  //   const { curCity: { id: cityId } } = this.props
-  //   const payload = { pageSize, pageNumber }
+  useEffect(() => {
+    if(PersonId) {
+      GetPageList()
+    }
+  }, [pageNumber, PersonId])
 
-  //   const { params: { buildingId, from } } = this.$router
-  //   if (cityId) {
-  //     payload.cityId = cityId
-  //   }
-  //   // 从个人中心过来
-  //   console.log(this.router, "from")
-  //   if (from === 'mine') {
-  //     payload.mine = true
-  //   }
-  //   // // 从项目详情过来
-  //   if (buildingId) {
-  //     payload.buildingId = buildingId
-  //   }
-  //   // return queryActivityList(payload)
-  //   return queryNewsList(payload)
-  // }
+  const PageRefresh = () => { // 页面下拉刷新回调
+    setPull(true)
+  }
 
-  const loadData = (params) => {
-    // const currentPage = page || this.state.pageIndex
-    // const { curCity: { id: cityId } } = this.props
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_NEWS_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)
+    })
+  }
 
- 
-    // if (from === "mine") {
-    //   params.mine = true;
-    // }
-    // // 从项目详情过来
-    if (buildingId) {
-      params.buildingId = buildingId;
-    }else if(city?.curCity?.id){
-      params.cityId = city.curCity.id;
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
     }
+  }
 
-    queryNewsList(params).then((res) => {
-      const { records, list, total, current, pages, size } = res || {};
-      setPageList([...PageList, ...records]);
-    });
-
-    // this.loadList(currentPage, pageSize).then(res => {
-    //   const { records, list, total, current, pages, size } = res || {}
-    //   const _list = records || list || []
-    //   const newList = current <= 1 ? _list : this.state.list.concat(_list)
-    //   console.log(res, '---res-------')
-    //   const pageNum = Math.max(Taro.getStorageSync('newsPageIndex'), current)
-    //   setPageList
-    //   this.setState({
-    //     list: newList,
-    //     isEmpty: total == 0,
-    //     hasMore: current * size < total,
-    //     pageIndex: pageNum,
-    //     // pageIndex: current >= pages ? pages : current,
-    //   })
-    // })
-  };
-  useEffect(() => {
-    loadData({ page: 0, pageSize: 10 });
-  }, []);
+  useEffect(() => { // 下拉刷新触发
+    if (IsPull) {
+      if(pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
+    }
+  }, [IsPull])
 
   return (
-    <view className="Page newsList">
+    <view className='Page newsList'>
       <ScrollView
-        scroll-y={true}
-        refresher-enabled={true}
+        scroll-y
+        refresher-enabled
         refresher-triggered={IsPull}
         onrefresherrefresh={PageRefresh}
-        refresher-background="#fff"
+        refresher-background='#fff'
+        onscrolltolower={PageLoadMore}
       >
-        <view className="PageContent">
+        <view className='PageContent'>
           {PageList.map((item, index) => (
-            <NewsListItem data={item}></NewsListItem>
+            <NewsListItem data={item} key={`ListItem-${index}`}></NewsListItem>
           ))}
 
           {/* bottom */}
-          <view className="PageBottom">
+          <view className='PageBottom'>
             <text>已经到底了~</text>
           </view>
         </view>

src/services/common.js

   API_BURIED_POINT,
   API_CITY_LIST,
   API_TEMPLATE_TYPE,
+  API_BRAND_LIST,
+  API_BRAND_INFO,
   API_INDEX_ICONS
 } from "@/constants/api";
 
  */
 export const queryMessageTPL = type =>
   fetch({ url: `${API_TEMPLATE_TYPE}/${type}` });
+
+
+/**
+ * 获取品牌房企列表
+ * @param {*}
+ */
+export const queryBrandList = (params) => fetch({ url: API_BRAND_LIST, params });
+
+/**
+ * 获取品牌房企列表
+ * @param {*}
+ */
+ export const queryBrandInfo = (id) => fetch({ url: `${API_BRAND_INFO}/${id}`});