静态页面

config/dev.js

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

src/pages/index/activityList/index.jsx

@@ -1,65 +1,72 @@
 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

@@ -0,0 +1,142 @@
+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

@@ -1,45 +1,147 @@
-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

@@ -1,12 +1,172 @@
-.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/buildingDetail/components/Periphery/index.jsx

@@ -1,5 +1,6 @@
 
 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'
@@ -31,7 +32,7 @@ export default function Periphery (props) {
 
   const CutTab = () => {
     return () => {
-      
+      Taro.navigateTo({url: `/pages/index/buildingAround/index?id=${Info.buildingId}`})
     }
   }
 

src/pages/index/buildingDynamic/index.jsx

@@ -1,11 +1,23 @@
-
+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'>
@@ -15,17 +27,17 @@ export default withLayout((props) => {
           <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/helpToFindHouse/components/SubmitBuyHouseResult/index.jsx

@@ -1,6 +1,7 @@
 
 import '@/assets/css/iconfont.css'
 import { Image, Block } from '@tarojs/components'
+import Taro from '@tarojs/taro'
 import './index.scss'
 
 export default function SubmitBuyHouseResult (props) {
@@ -39,19 +40,19 @@ 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/newsList/index.jsx

@@ -1,124 +1,80 @@
-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>