静态页面

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

@@ -1,17 +1,17 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
-import '../../../../../assets/css/iconfont.css'
+
+import '@/assets/css/iconfont.css'
 import { ScrollView, Image } from '@tarojs/components'
+import './index.scss'
 
 export default function BasicInfo (props) {
-  const { Data = {} } = props
+  const { Info = {} } = props
   return (
     <view className='components BasicInfo'>
 
       {/* 标题名称 */}
       <view className='Title flex-h'>
         <view className='flex-item'>
-          <text>葛洲坝·南京中国府高档小区</text>
+          <text>{Info.buildingName}</text>
         </view>
         <view className='Collect'>
           <text className='iconfont icon-shoucang'></text>
@@ -22,8 +22,8 @@ export default function BasicInfo (props) {
       {/* 标签 */}
       <view className='Tags'>
         {
-          ['全朝南', '品牌开发商', '轨交房'].map((item, index) => (
-            <text key={`TagItem-${index}`}>{item}</text>
+          (Info.buildingTag || []).map((item, index) => (
+            <text key={`TagItem-${index}`}>{item.tagName}</text>
           ))
         }
       </view>
@@ -32,25 +32,32 @@ export default function BasicInfo (props) {
       <view className='ProjectList'>
         <ScrollView scroll-x>
           {
-            ['', '', ''].map((item, index) => (
+            (Info.buildingProjectType || []).map((item, index) => (
               <view className='ListItem' key={`List-${index}`}>
-                <Image mode='heightFix' src={require('../../../../../assets/buildingDetail-icon4.jpg')} />
+                <Image mode='heightFix' src={require('@/assets/buildingDetail-icon4.jpg')} />
                 <view>
                   <view>
                     <text>项目类型：</text>
-                    <text className='active black'>公寓</text>
+                    <text className='active black'>{item.buildingTypeName}</text>
                   </view>
                   <view>
                     <text>房屋产权：</text>
-                    <text className='active'>40年</text>
+                    <text className='active'>{item.rightsYear}年</text>
                     <text>装修标准：</text>
-                    <text className='active'>毛坯</text>
+                    <text className='active'>{item.decoration || '暂无'}</text>
                   </view>
                   <view>
                     <text>项目参考价格：</text>
-                    <text className='active'>45-75万/套</text>
+                    {
+                      (item.startPrice || item.endPrice) &&
+                      <text className='active'>约{item.startPrice}-{item.endPrice}万/套</text>
+                    }
+                    {
+                      !(item.startPrice || item.endPrice) &&
+                      <text className='active'>暂无数据</text>
+                    }
                   </view>
-                  <text className='SaleStatus active'>在售</text>
+                  <text className='SaleStatus active'>{item.marketStatus}</text>
                 </view>
               </view>
             ))
@@ -68,7 +75,7 @@ export default function BasicInfo (props) {
             <text>楼盘地址：</text>
           </view>
           <view className='flex-item3'>
-            <text className='active'>南京市建邺区友谊街与建邺路交汇处235号</text>
+            <text className='active'>{Info.address}</text>
           </view>
         </view>
         <view className='flex-h'>
@@ -76,7 +83,7 @@ export default function BasicInfo (props) {
             <text>开盘时间：</text>
           </view>
           <view className='flex-item3'>
-            <text className='active'>2019年8月5日</text>
+            <text className='active'>{Info.openingDate || '待定'}</text>
           </view>
         </view>
         <view className='flex-h'>
@@ -84,13 +91,13 @@ export default function BasicInfo (props) {
             <text>容积率：</text>
           </view>
           <view className='flex-item'>
-            <text className='active'>1.5</text>
+            <text className='active'>{Info.volumeRate || '暂无'}</text>
           </view>
           <view className='flex-item'>
             <text>车位比率：</text>
           </view>
           <view className='flex-item'>
-            <text className='active'>1 : 200</text>
+            <text className='active'>{Info.parkingRate || '暂无'}</text>
           </view>
         </view>
         <view className='flex-h'>
@@ -98,13 +105,13 @@ export default function BasicInfo (props) {
             <text>绿化率：</text>
           </view>
           <view className='flex-item'>
-            <text className='active'>40%</text>
+            <text className='active'>{Info.greeningRate || '暂无'}</text>
           </view>
           <view className='flex-item'>
             <text>物业费：</text>
           </view>
           <view className='flex-item'>
-            <text className='active'>1.9元/㎡/月</text>
+            <text className='active'>{Info.serviceFee || '暂无'}</text>
           </view>
         </view>
         <view className='flex-h'>
@@ -112,29 +119,32 @@ export default function BasicInfo (props) {
             <text>规划户数：</text>
           </view>
           <view className='flex-item'>
-            <text className='active'>2000</text>
+            <text className='active'>{Info.familyNum || '暂无'}</text>
           </view>
           <view className='flex-item'>
             <text>物业：</text>
           </view>
           <view className='flex-item'>
-            <text className='active'>万科物业</text>
+            <text className='active'>{Info.serviceCompany || '暂无'}</text>
           </view>
         </view>
       </view>
 
       {/* 围观 */}
       <view className='Views flex-h'>
-          <text>28人围观</text>
+          <text>{Info.pvNum || 0}人围观</text>
           <view className='flex-item'>
             {
-              ['', '', '', '', '', ''].map((item, index) => (
+              (Info?.uvList?.records || []).slice(0, 8).map((item, index) => (
                 <view key={`ViewsItem-${index}`}>
-                  <Image mode='aspectFill' className='centerLabel' src={null} />
+                  <Image mode='aspectFill' className='centerLabel' src={item.photoOravatar} />
                 </view>
               ))
             }
-            <text>...</text>
+            {
+              (Info?.uvList?.records || []).length > 8 &&
+              <text>...</text>
+            }
           </view>
       </view>
 

src/pages/index/buildingDetail/index.jsx

@@ -1,8 +1,11 @@
 import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
 import { ScrollView } from '@tarojs/components'
+import '@/assets/css/iconfont.css'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_ITEMS_DETAIL } from '@/constants/api'
 import './index.scss'
-import '../../../assets/css/iconfont.css'
 import DetailBottom from './components/DetailBottom/index'
 import BasicInfo from './components/BasicInfo/index'
 import SpecialPriceHouse from './components/SpecialPriceHouse/index'
@@ -15,11 +18,32 @@ import LivingActivity from './components/LivingActivity/index'
 import News from './components/News/index'
 import Pictures from './components/Pictures/index'
 
-export default withLayout(() => {
-
+export default withLayout((props) => {
+  
+  const user = useSelector(state => state.user)
+  const [PersonId, setPersonId] = useState(null)
+  const [DetailInfo, setDetailInfo] = useState({})
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
 
+  useEffect(() => {
+    if(user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    if(PersonId) {
+      GetBuildingDetail()
+    }
+  }, [PersonId])
+
+  const GetBuildingDetail = () => { // 获取楼盘信息
+    fetch({ url: `${API_ITEMS_DETAIL}/${props.router.params.id}`, method: 'get'}).then((res) => {
+      setDetailInfo(res || {})
+    })
+  }
+
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
@@ -55,7 +79,7 @@ export default withLayout(() => {
 
                 {/* 基本信息 */}
                 <view className='BasicInfo'>
-                  <BasicInfo></BasicInfo>
+                  <BasicInfo Info={DetailInfo}></BasicInfo>
                 </view>
 
                 {/* 特价房源 */}

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

@@ -38,7 +38,7 @@ const questions = [
   },
   {
     question: '你想买的区域是？',
-    key: 'district',
+    key: 'intentArea',
     type: 'select',
     result: '',
     resultId: null,

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

@@ -1,12 +1,12 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+import '@/assets/css/iconfont.css'
+import { Image, Slider, Textarea, Picker } from '@tarojs/components'
 import './index.scss'
-import '../../../../../assets/css/iconfont.css'
-import { Image, Slider, Textarea } from '@tarojs/components'
 import SubmitBuyHouseResult from '../SubmitBuyHouseResult/index'
 import questions from './formData'
 
 export default function BuyHouse (props) {
-  const { change = () => { }, toSubmit = () => {} } = props
+  const { change = () => { }, toSubmit = () => { }, CityList = [] } = props
 
   const [FormData, setFormData] = useState(questions)
 
@@ -15,14 +15,17 @@ export default function BuyHouse (props) {
 
   const [ShowPopup, setShowPopup] = useState(false)
 
+  const [CityName, setCityName] = useState(null)
+  const [CityId, setCityId] = useState(null)
+
   useEffect(() => {
-    if(StepId === 1) {
+    if (StepId === 1) {
       setStepRange([0, 4])
-    } else if(StepId === 2) {
+    } else if (StepId === 2) {
       setStepRange([4, 7])
-    } else if(StepId === 3) {
+    } else if (StepId === 3) {
       setStepRange([7, 10])
-    } else if(StepId === 4) {
+    } else if (StepId === 4) {
       setStepRange([10, 12])
     }
     change(StepId)
@@ -59,7 +62,7 @@ export default function BuyHouse (props) {
     if (StepId < 4) {
       setStepId(StepId + 1)
     } else {
-      toSubmit(FormData)
+      toSubmit(FormData.concat([{result: CityId, key: 'intentArea'}]))
     }
   }
 
@@ -69,6 +72,11 @@ export default function BuyHouse (props) {
     }
   }
 
+  const PickerChange = (e) => {
+    setCityName(CityList[e.detail.value - 0].name)
+    setCityId(CityList[e.detail.value - 0].id)
+  }
+
   return (
     <view className='components BuyHouse'>
       {
@@ -89,7 +97,7 @@ export default function BuyHouse (props) {
                       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>
+                          <Image mode='heightFix' src={require('@/assets/findHouse-icon1.png')}></Image>
                         </view>
                       ))
                     }
@@ -98,14 +106,14 @@ export default function BuyHouse (props) {
                 {
                   item.type === 'checkbox' && item.remark !== undefined &&
                   <view className='Textarea'>
-                    <Textarea placeholder="请说出您的其他需求，让我们更好的为您服务！" onInput={(e) => {remarkInput(e, index)}} />
+                    <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 />
+                      <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>
@@ -115,11 +123,15 @@ export default function BuyHouse (props) {
                   <view className='Area'>
                     <view className='flex-h'>
                       {
-                        item.key === 'district' &&
+                        item.key === 'intentArea' &&
                         <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>
@@ -127,7 +139,7 @@ export default function BuyHouse (props) {
                 {
                   item.type === 'textarea' &&
                   <view className='Textarea'>
-                    <Textarea placeholder="请说出您的其他需求，让我们更好的为您服务！" onInput={(e) => {textareaInput(e, index)}} />
+                    <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => { textareaInput(e, index) }} />
                   </view>
                 }
               </view>

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

@@ -0,0 +1,52 @@
+const questions = [
+  {
+    question: '你想买的国家和地区是？',
+    key: 'intentArea',
+    type: 'textarea',
+    result: '',
+    resultId: null
+  },
+  {
+    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 }
+    ]
+  },
+  {
+    question: '您还有哪些需要备注的信息？',
+    key: 'remark',
+    type: 'textarea',
+    result: '',
+    resultId: null
+  },
+]
+
+export default questions

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

@@ -1,137 +1,59 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+import '@/assets/css/iconfont.css'
+import { Image, Slider, Textarea } from '@tarojs/components'
 import './index.scss'
-import '../../../../../assets/css/iconfont.css'
-import { Image, Input, Slider, Textarea } from '@tarojs/components'
 import SubmitBuyHouseResult from '../SubmitBuyHouseResult/index'
+import questions from './formData'
 
 export default function HousePurchasing (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, 5])
 
   const [ShowPopup, setShowPopup] = useState(false)
 
   useEffect(() => {
+    if(StepId === 1) {
+      setStepRange([0, 5])
+    }
     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) {
+    if (StepId < 1) {
       setStepId(StepId + 1)
+    } else {
+      toSubmit(FormData)
     }
   }
 
@@ -142,175 +64,70 @@ export default function HousePurchasing (props) {
   }
 
   return (
-    <view className='components HousePurchasing'>
+    <view className='components BuyHouse'>
       {
         ShowPopup &&
         <SubmitBuyHouseResult></SubmitBuyHouseResult>
       }
       {
-        StepId === 1 &&
-        <view className='Step'>
-          <view>
-            <text>意向区域</text>
-            <view className='Area'>
-              <view className='flex-h'>
-                <text className='iconfont icon-dingwei'></text>
-                <text>不限</text>
-                <view className='flex-item'></view>
-                <text className='iconfont icon-jiantoudown'></text>
-              </view>
-            </view>
-          </view>
-
-          <view>
-            <text>意向楼盘</text>
-            <view className='Purpose'>
+        FormData.map((item, index) => (
+          <view className='Step' key={`Form-${index}`}>
+            {
+              index >= StepRange[0] && index < StepRange[1] &&
               <view>
-                <Input placeholder="请输入意向楼盘" />
-              </view>
-            </view>
-          </view>
-
-          <view>
-            <text>您想购买的是首套房还是二套房？</text>
-            <view className='CheckList'>
-              {
-                SingleList.map((item, index) => (
-                  <view key={`SingleItem-${index}`} className={CurrnetSingleId === item.id ? 'active' : ''} onClick={CutSingleId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
-                  </view>
-                ))
-              }
-            </view>
-          </view>
-
-          <view>
-            <text>总价预算范围</text>
-            <view className='PriceRange'>
-              <view className='flex-h'>
-                <view className='flex-item'>
-                  <Input placeholder="最小面积㎡" />
-                </view>
-                <text>-</text>
-                <view className='flex-item'>
-                  <Input placeholder="最大面积㎡" />
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-      }
-
-      {
-        StepId === 2 &&
-        <view className='Step'>
-          <view>
-            <text>您想购买的是二手房还是新房？</text>
-            <view className='CheckList'>
-              {
-                NewOldList.map((item, index) => (
-                  <view key={`NewOldItem-${index}`} className={CurrnetNewOldId === item.id ? 'active' : ''} onClick={CutNewOldId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
-                  </view>
-                ))
-              }
-            </view>
-          </view>
-          <view>
-            <text>居室要求</text>
-            <view className='CheckList'>
-              {
-                HouseTypeList.map((item, index) => (
-                  <view key={`HouseTypeItem-${index}`} className={CurrnetHouseTypeId === item.id ? 'active' : ''} onClick={CutHouseTypeId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
+                <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>
-                ))
-              }
-            </view>
-          </view>
-          <view>
-            <text>面积要求</text>
-            <view className='CheckList'>
-              {
-                AreaList.map((item, index) => (
-                  <view key={`AreaItem-${index}`} className={CurrnetAreaId === item.id ? 'active' : ''} onClick={CutAreaId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
+                }
+                {
+                  item.type === 'checkbox' && item.remark !== undefined &&
+                  <view className='Textarea'>
+                    <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => {remarkInput(e, index)}} />
                   </view>
-                ))
-              }
-            </view>
-          </view>
-        </view>
-      }
-
-      {
-        StepId === 3 &&
-        <view className='Step'>
-          <view>
-            <text>价格要求</text>
-            <view className='RangeList flex-h'>
-              <view className='flex-item'>
-                <Slider activeColor="#193C83" block-color="#fff" change={PriceRangehange} min="50" max="200" show-value />
-              </view>
-              <text>万</text>
-            </view>
-          </view>
-          <view>
-            <text>偏好设置</text>
-            <view className='CheckList'>
-              {
-                PreferenceList.map((item, index) => (
-                  <view key={`PreferenceItem-${index}`} className={CurrnetPreferenceId === item.id ? 'active' : ''} onClick={CutPreferenceId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
+                }
+                {
+                  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>
-                ))
-              }
-            </view>
-          </view>
-          <view>
-            <text>购房目的</text>
-            <view className='CheckList'>
-              {
-                GoalList.map((item, index) => (
-                  <view key={`GoalItem-${index}`} className={CurrnetGoalId === item.id ? 'active' : ''} onClick={CutGoalId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
+                }
+                {
+                  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>
-                ))
-              }
-            </view>
-          </view>
-        </view>
-      }
-
-      {
-        StepId === 4 &&
-        <view className='Step'>
-          <view>
-            <text>计划在多久购房？</text>
-            <view className='CheckList'>
-              {
-                LongTimeList.map((item, index) => (
-                  <view key={`LongTimeItem-${index}`} className={CurrnetLongTimeId === item.id ? 'active' : ''} onClick={CutLongTimeId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
+                }
+                {
+                  item.type === 'textarea' &&
+                  <view className='Textarea'>
+                    <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => {textareaInput(e, index)}} />
                   </view>
-                ))
-              }
-            </view>
-          </view>
-          <view>
-            <text>您还有哪些需要备注的信息？</text>
-            <view className='Textarea'>
-              <Textarea placeholder="请说出您的其他需求，让我们更好的为您服务！" />
-            </view>
+                }
+              </view>
+            }
           </view>
-        </view>
+        ))
       }
 
       <view className='Btn'>

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

@@ -0,0 +1,72 @@
+const questions = [
+  {
+    question: '你的租房预算是多少/月？',
+    key: 'budget',
+    type: 'range',
+    result: '',
+    resultId: null,
+    options: [500, 4500]
+  },
+  {
+    question: '你的租房偏好？',
+    key: 'preference',
+    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 }
+    ]
+  },
+  {
+    question: '你想在哪租房？',
+    key: 'intentArea',
+    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 },
+      { name: '押一付一', id: 7 },
+      { name: '双卫', id: 8 },
+      { name: '新上', id: 9 },
+      { name: '认证公寓', id: 10 }
+    ]
+  },
+  {
+    question: '您还有哪些特殊要求？',
+    key: 'remark',
+    type: 'textarea',
+    result: '',
+    resultId: null
+  },
+]
+
+export default questions

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

@@ -1,137 +1,61 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+import '@/assets/css/iconfont.css'
+import { Image, Slider, Textarea } from '@tarojs/components'
 import './index.scss'
-import '../../../../../assets/css/iconfont.css'
-import { Image, Input, Slider, Textarea } from '@tarojs/components'
 import SubmitBuyHouseResult from '../SubmitBuyHouseResult/index'
+import questions from './formData'
 
 export default function RentingHouse (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, 6])
+    }
     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) {
+    if (StepId < 2) {
       setStepId(StepId + 1)
+    } else {
+      toSubmit(FormData)
     }
   }
 
@@ -142,175 +66,70 @@ export default function RentingHouse (props) {
   }
 
   return (
-    <view className='components RentingHouse'>
+    <view className='components BuyHouse'>
       {
         ShowPopup &&
         <SubmitBuyHouseResult></SubmitBuyHouseResult>
       }
       {
-        StepId === 1 &&
-        <view className='Step'>
-          <view>
-            <text>意向区域</text>
-            <view className='Area'>
-              <view className='flex-h'>
-                <text className='iconfont icon-dingwei'></text>
-                <text>不限</text>
-                <view className='flex-item'></view>
-                <text className='iconfont icon-jiantoudown'></text>
-              </view>
-            </view>
-          </view>
-
-          <view>
-            <text>意向楼盘</text>
-            <view className='Purpose'>
+        FormData.map((item, index) => (
+          <view className='Step' key={`Form-${index}`}>
+            {
+              index >= StepRange[0] && index < StepRange[1] &&
               <view>
-                <Input placeholder="请输入意向楼盘" />
-              </view>
-            </view>
-          </view>
-
-          <view>
-            <text>您想购买的是首套房还是二套房？</text>
-            <view className='CheckList'>
-              {
-                SingleList.map((item, index) => (
-                  <view key={`SingleItem-${index}`} className={CurrnetSingleId === item.id ? 'active' : ''} onClick={CutSingleId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
-                  </view>
-                ))
-              }
-            </view>
-          </view>
-
-          <view>
-            <text>总价预算范围</text>
-            <view className='PriceRange'>
-              <view className='flex-h'>
-                <view className='flex-item'>
-                  <Input placeholder="最小面积㎡" />
-                </view>
-                <text>-</text>
-                <view className='flex-item'>
-                  <Input placeholder="最大面积㎡" />
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-      }
-
-      {
-        StepId === 2 &&
-        <view className='Step'>
-          <view>
-            <text>您想购买的是二手房还是新房？</text>
-            <view className='CheckList'>
-              {
-                NewOldList.map((item, index) => (
-                  <view key={`NewOldItem-${index}`} className={CurrnetNewOldId === item.id ? 'active' : ''} onClick={CutNewOldId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
-                  </view>
-                ))
-              }
-            </view>
-          </view>
-          <view>
-            <text>居室要求</text>
-            <view className='CheckList'>
-              {
-                HouseTypeList.map((item, index) => (
-                  <view key={`HouseTypeItem-${index}`} className={CurrnetHouseTypeId === item.id ? 'active' : ''} onClick={CutHouseTypeId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
+                <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>
-                ))
-              }
-            </view>
-          </view>
-          <view>
-            <text>面积要求</text>
-            <view className='CheckList'>
-              {
-                AreaList.map((item, index) => (
-                  <view key={`AreaItem-${index}`} className={CurrnetAreaId === item.id ? 'active' : ''} onClick={CutAreaId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
+                }
+                {
+                  item.type === 'checkbox' && item.remark !== undefined &&
+                  <view className='Textarea'>
+                    <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => {remarkInput(e, index)}} />
                   </view>
-                ))
-              }
-            </view>
-          </view>
-        </view>
-      }
-
-      {
-        StepId === 3 &&
-        <view className='Step'>
-          <view>
-            <text>价格要求</text>
-            <view className='RangeList'>
-              <view className='flex-item'>
-                <Slider activeColor="#193C83" block-color="#fff" change={PriceRangehange} min="50" max="200" show-value />
-              </view>
-              <text>万</text>
-            </view>
-          </view>
-          <view>
-            <text>偏好设置</text>
-            <view className='CheckList'>
-              {
-                PreferenceList.map((item, index) => (
-                  <view key={`PreferenceItem-${index}`} className={CurrnetPreferenceId === item.id ? 'active' : ''} onClick={CutPreferenceId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
+                }
+                {
+                  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>
-                ))
-              }
-            </view>
-          </view>
-          <view>
-            <text>购房目的</text>
-            <view className='CheckList'>
-              {
-                GoalList.map((item, index) => (
-                  <view key={`GoalItem-${index}`} className={CurrnetGoalId === item.id ? 'active' : ''} onClick={CutGoalId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
+                }
+                {
+                  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>
-                ))
-              }
-            </view>
-          </view>
-        </view>
-      }
-
-      {
-        StepId === 4 &&
-        <view className='Step'>
-          <view>
-            <text>计划在多久购房？</text>
-            <view className='CheckList'>
-              {
-                LongTimeList.map((item, index) => (
-                  <view key={`LongTimeItem-${index}`} className={CurrnetLongTimeId === item.id ? 'active' : ''} onClick={CutLongTimeId(item.id)}>
-                    {item.name}
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
+                }
+                {
+                  item.type === 'textarea' &&
+                  <view className='Textarea'>
+                    <Textarea placeholder='请说出您的其他需求，让我们更好的为您服务！' onInput={(e) => {textareaInput(e, index)}} />
                   </view>
-                ))
-              }
-            </view>
-          </view>
-          <view>
-            <text>您还有哪些需要备注的信息？</text>
-            <view className='Textarea'>
-              <Textarea placeholder="请说出您的其他需求，让我们更好的为您服务！" />
-            </view>
+                }
+              </view>
+            }
           </view>
-        </view>
+        ))
       }
 
       <view className='Btn'>

src/pages/index/helpToFindHouse/index.jsx

@@ -1,17 +1,16 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
+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 './index.scss'
-import { ScrollView, Image, Input } from '@tarojs/components'
-import '../../../assets/css/iconfont.css'
 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_SUBMIT } from '@/constants/api'
-
-export default withLayout((props) => {
 
-  const [PageProps] = useState(props)
+export default withLayout(() => {
+  
   const [DemandList] = useState([
     { name: '我要买房', id: 1, icon: '', spell: 'MAI FANG' },
     { name: '我要租房', id: 2, icon: '', spell: 'ZU FANG' },
@@ -19,6 +18,13 @@ export default withLayout((props) => {
   ])
   const [CurrentDemandId, setCurrentDemandId] = useState(1)
   const [ShowDemand, setShowDemand] = useState(true)
+  const [CityList, setCityList] = useState([])
+
+  useEffect(() => {
+    fetch({url: API_CITY_LIST, method: 'get'}).then((res) => {
+      setCityList(res || [])
+    })
+  }, [])
 
   const CutDemandId = (id) => {
     return () => {
@@ -36,7 +42,7 @@ export default withLayout((props) => {
     data.map((item) => {
       params[item.key] = item.result
     })
-    fetch({url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: params}).then(() => {
+    fetch({url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: {...params, type: CurrentDemandId}}).then(() => {
       
     })
   }
@@ -44,7 +50,7 @@ export default withLayout((props) => {
   return (
     <view className='Page helpToFindHouse'>
 
-      <ScrollView scroll-y={true} refresher-enabled={false}>
+      <ScrollView scroll-y refresher-enabled={false}>
         <view className='PageContent'>
 
           {
@@ -68,19 +74,19 @@ export default withLayout((props) => {
           {/* 买房 */}
           {
             CurrentDemandId === 1 &&
-            <BuyHouse change={StepChange} toSubmit={submitForm}></BuyHouse>
+            <BuyHouse change={StepChange} toSubmit={submitForm} CityList={CityList}></BuyHouse>
           }
 
           {/* 租房 */}
           {
             CurrentDemandId === 2 &&
-            <RentingHouse></RentingHouse>
+            <RentingHouse change={StepChange} toSubmit={submitForm} CityList={CityList}></RentingHouse>
           }
 
           {/* 置业 */}
           {
             CurrentDemandId === 3 &&
-            <HousePurchasing></HousePurchasing>
+            <HousePurchasing change={StepChange} toSubmit={submitForm} CityList={CityList}></HousePurchasing>
           }
 
         </view>

src/pages/mine/components/MyCollectForActivity/index.jsx

@@ -1,14 +1,48 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
+import { useState, useEffect } from 'react'
 import { ScrollView } from '@tarojs/components'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_ACTIVITY_SAVE } from '@/constants/api'
+import './index.scss'
 import ActivityListItem from '../../../index/components/ActivityListItem/index'
 
-export default function MyCollectForActivity (props) {
-  const { Data = {} } = props
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
+export default function MyCollectForActivity () {
+
+  const user = useSelector(state => state.user)
+  const [PersonId, setPersonId] = useState(null)
+  const [pageNumber, setPageNumber] = useState(null)
+  const [pageSize] = useState(10)
+  const [HasNextPage, setHasNextPage] = useState(true)
+  const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
 
+  useEffect(() => {
+    if (user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    if (PersonId) {
+      setPageNumber(1)
+    }
+  }, [PersonId])
+
+  useEffect(() => {
+    if (pageNumber && HasNextPage) {
+      fetch({ url: API_ACTIVITY_SAVE, method: 'get', payload: { mine: true, pageNumber, pageSize } }).then((res) => {
+        if (res !== null) {
+          setPageList(res.records || [])
+          setHasNextPage(res.current >= res.pages)
+        } else {
+          setPageList([])
+          setHasNextPage(false)
+        }
+      })
+    }
+  }, [pageNumber])
+
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
@@ -24,7 +58,7 @@ export default function MyCollectForActivity (props) {
 
   return (
     <view className='components MyCollectForActivity'>
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
         <view className='PageContent'>
           <view className='List'>
             {

src/pages/mine/components/MyCollectForBuilding/index.jsx

@@ -1,14 +1,43 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
+import { useState, useEffect } from 'react'
 import { ScrollView } from '@tarojs/components'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_ITEMS_LIST } from '@/constants/api'
+import './index.scss'
 import MyShareListItem from '../MyShareListItem/index'
 
-export default function MyCollectForBuilding (props) {
-  const { Data = {} } = props
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
+export default function MyCollectForBuilding () {
+  
+  const user = useSelector(state => state.user)
+  const [PersonId, setPersonId] = useState(null)
+  const [pageNumber, setPageNumber] = useState(null)
+  const [pageSize] = useState(10)
+  const [HasNextPage, setHasNextPage] = useState(true)
+  const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
 
+  useEffect(() => {
+    if(user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    if(PersonId) {
+      setPageNumber(1)
+    }
+  }, [PersonId])
+
+  useEffect(() => {
+    if(pageNumber && HasNextPage) {
+      fetch({ url: API_ITEMS_LIST, method: 'get', payload: { mine: true, pageNumber, pageSize } }).then((res) => {
+        setPageList(res.records || [])
+        setHasNextPage(res.current >= res.pages)
+      })
+    }
+  }, [pageNumber])
+
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
@@ -24,7 +53,7 @@ export default function MyCollectForBuilding (props) {
 
   return (
     <view className='components MyCollectForBuilding'>
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
         <view className='PageContent'>
           <view className='List'>
             {

src/pages/mine/components/MyCollectForNews/index.jsx

@@ -1,14 +1,43 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
+import { useState, useEffect } from 'react'
 import { ScrollView } from '@tarojs/components'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_NEWS_LIST } from '@/constants/api'
 import NewsListItem from '../../../index/components/NewsListItem/index'
+import './index.scss'
 
-export default function MyCollectForNews (props) {
-  const { Data = {} } = props
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
+export default function MyCollectForNews () {
+  
+  const user = useSelector(state => state.user)
+  const [PersonId, setPersonId] = useState(null)
+  const [pageNumber, setPageNumber] = useState(null)
+  const [pageSize] = useState(10)
+  const [HasNextPage, setHasNextPage] = useState(true)
+  const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
 
+  useEffect(() => {
+    if(user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    if(PersonId) {
+      setPageNumber(1)
+    }
+  }, [PersonId])
+
+  useEffect(() => {
+    if(pageNumber && HasNextPage) {
+      fetch({ url: API_NEWS_LIST, method: 'get', payload: { mine: true, pageNumber, pageSize } }).then((res) => {
+        setPageList(res.records || [])
+        setHasNextPage(res.current >= res.pages)
+      })
+    }
+  }, [pageNumber])
+
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
@@ -24,7 +53,7 @@ export default function MyCollectForNews (props) {
 
   return (
     <view className='components MyCollectForNews'>
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
         <view className='PageContent'>
           <view className='List'>
             {

src/pages/mine/myActivity/index.jsx

@@ -1,16 +1,44 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import './index.scss'
 import { ScrollView } from '@tarojs/components'
-import '../../../assets/css/iconfont.css'
+import '@/assets/css/iconfont.css'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_ACTIVITY_LIST_CUSTOMER } from '@/constants/api'
+import './index.scss'
 import MyActivityListItem from '../components/MyActivityListItem/index'
 
-export default withLayout((props) => {
-
-  // const [PageProps] = useState(props)
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
+export default withLayout(() => {
+  
+  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(null)
+  const [pageSize] = useState(10)
+  const [HasNextPage, setHasNextPage] = useState(true)
+
+  useEffect(() => {
+    if(user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    if(PersonId) {
+      setPageNumber(1)
+    }
+  }, [PersonId])
+
+  useEffect(() => {
+    if(pageNumber && HasNextPage) {
+      fetch({ url: API_ACTIVITY_LIST_CUSTOMER, method: 'get', payload: { customerId: PersonId, pageNumber, pageSize } }).then((res) => {
+        setPageList(res.records || [])
+        setHasNextPage(res.current >= res.pages)
+      })
+    }
+  }, [pageNumber])
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
@@ -28,7 +56,7 @@ export default withLayout((props) => {
   return (
     <view className='Page myActivity'>
 
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#f8f8f8'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#f8f8f8'>
         <view className='PageContent'>
           <view className='List'>
             {

src/pages/mine/myCollect/index.jsx

@@ -1,20 +1,18 @@
-import React, { useState, useEffect } from 'react'
+import { useState } from 'react'
 import withLayout from '@/layout'
+import '@/assets/css/iconfont.css'
 import './index.scss'
-import '../../../assets/css/iconfont.css'
 import MyCollectForBuilding from '../components/MyCollectForBuilding/index'
 import MyCollectForNews from '../components/MyCollectForNews/index'
 import MyCollectForActivity from '../components/MyCollectForActivity/index'
 import MyCollectForCourse from '../components/MyCollectForCourse/index'
 
-export default withLayout((props) => {
-
-  // const [PageProps] = useState(props)
+export default withLayout(() => {
   const [MenuList] = useState([
     { name: '项目', id: 1 },
-    { name: '资讯', id: 2 },
-    { name: '活动', id: 3 },
-    { name: '课程', id: 4 }
+    { name: '资讯', id: 3 },
+    { name: '活动', id: 4 },
+    { name: '课程', id: 2 }
   ])
   const [CurrentMenuId, setCurrentMenuId] = useState(1)
 
@@ -50,19 +48,19 @@ export default withLayout((props) => {
 
           {/* 资讯 */}
           {
-            CurrentMenuId === 2 &&
+            CurrentMenuId === 3 &&
             <MyCollectForNews></MyCollectForNews>
           }
 
           {/* 活动 */}
           {
-            CurrentMenuId === 3 &&
+            CurrentMenuId === 4 &&
             <MyCollectForActivity></MyCollectForActivity>
           }
 
           {/* 课程 */}
           {
-            CurrentMenuId === 4 &&
+            CurrentMenuId === 2 &&
             <MyCollectForCourse></MyCollectForCourse>
           }
           

src/pages/mine/myShare/index.jsx

@@ -1,16 +1,44 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import './index.scss'
 import { ScrollView } from '@tarojs/components'
-import '../../../assets/css/iconfont.css'
+import '@/assets/css/iconfont.css'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_SHARE_LIST } from '@/constants/api'
+import './index.scss'
 import MyShareListItem from '../components/MyShareListItem/index'
 
-export default withLayout((props) => {
+export default withLayout(() => {
 
-  // const [PageProps] = useState(props)
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
+  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(null)
+  const [pageSize] = useState(10)
+  const [HasNextPage, setHasNextPage] = useState(true)
+
+  useEffect(() => {
+    if(user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    if(pageNumber && HasNextPage) {
+      fetch({ url: API_SHARE_LIST, method: 'get', payload: { personId: PersonId, pageNumber, pageSize } }).then((res) => {
+        setPageList(res.records || [])
+        setHasNextPage(res.current >= res.pages)
+      })
+    }
+  }, [pageNumber])
+
+  useEffect(() => {
+    if(PersonId) {
+      setPageNumber(1)
+    }
+  }, [PersonId])
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
@@ -28,7 +56,7 @@ export default withLayout((props) => {
   return (
     <view className='Page MyShare'>
 
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
         <view className='PageContent'>
           <view className='List'>
             {