静态页面

src/assets/css/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "4282091",
+      "name": "勾",
+      "font_class": "gou1",
+      "unicode": "e83c",
+      "unicode_decimal": 59452
+    },
     {
       "icon_id": "22219715",
       "name": "电  话",

src/assets/css/iconfont.svg

@@ -14,6 +14,8 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="gou1" unicode="&#59452;" d="M53.730509 348.7232a31.93344 31.93344 0 0 1-45.21984-1.7664 32.16896 32.16896 0 0 1 1.76128-45.3632l359.99744-334.01856a31.93344 31.93344 0 0 1 46.9504 3.80416L1017.217229 741.7344a32.16384 32.16384 0 0 1-5.51424 45.056 31.93344 31.93344 0 0 1-44.91776-5.5296L388.194509 38.4 53.730509 348.7232z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="dianhua1" unicode="&#58889;" d="M512 805.875a421.875 421.875 0 1 0 0-843.75A421.875 421.875 0 1 0 512 805.875zM422.46874982 636.84375027c-20.15624982 3.42187509-37.17187509-3.46875019-63.65624991-20.6249999l-7.59375-4.92187556-6.89062528-4.35937444c-52.50000037-32.43749991-30.32812491-166.12499982 55.3125001-291.46875074 85.35937527-125.06250037 204.14062491-198.18749981 255.93750054-166.21875l17.53124964 10.31250037c22.26562481 13.26562537 34.78125037 24.046875 41.24999982 39.60937491 8.71874973 20.85937537 2.01562482 44.24999991-20.53124973 70.64062536-36.46875037 42.65625009-64.07812491 52.68749991-95.34375 38.4375001a130.40625009 130.40625009 0 0 1-14.29687491-7.68750019l-13.82812482-8.57812527c-10.45312482-6.46875027-42.51562482 24.23437537-80.9531249 80.34375036-37.87499982 55.45312537-54.14062527 95.34375-44.53125046 101.34374936 0.93750018 0.56250027 10.96875 6.65624982 13.78124972 8.4375 39.28125009 24.70312463 45.93749991 51.93750009 15.46875056 109.265625-14.43750019 27.14062527-31.54687482 41.99999963-51.65625037 45.46875064z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="pengyouquan" unicode="&#58908;" d="M690.31560747 504.55256533L690.31560747 795.20317973c0 0-142.22810027 76.24640853-308.25584747 17.45678507L690.31560747 504.55256533zM717.24247787 333.56273812999996L717.24247787 783.20184427c0 0 168.13875947-76.1961984 215.5219296-261.2940064L717.24247787 333.56273812999996zM626.7887584 202.86770773l310.38978133 291.89168c0 0 54.92016107-89.28906027-26.97926293-291.89168L626.7887584 202.86770773zM468.2980032 165.85949867l419.21498453 0c0 0-50.60754027-137.16778347-231.73874026-193.8005504L468.2980032 165.85949867zM331.4522208 258.45806719999996l0-273.25822933c0 0 108.87650453-69.72344533 295.33653867-22.91005227L331.4522208 258.45806719999996zM88.9281056 244.32388906999995L301.274784 434.8520416l0-433.28694613C301.274784 1.5661866699999791 172.9843872 46.09829013000001 88.9281056 244.32388906999995zM83.54688 274.79821973c0 0-48.5740256 156.73121493 19.36477333 292.85768107l292.06523307 0L83.54688 274.79821973zM121.26130667 598.20445653c0 0 61.44312427 139.30062613 228.49035733 204.66123947l199.3531456-204.66123947L121.26130667 598.20445653z"  horiz-adv-x="1024" />

src/constants/api.js

@@ -12,6 +12,10 @@ export const pathname = '/api/wx'
 
 export const resolvePath = api => `${host + pathname}/${api}`
 
+// 课程
+export const API_COURSE_LIST = resolvePath('curriculum') // 课程列表
+export const API_MY_COLLECT_COURSE_LIST = resolvePath('curriculum/save') // 我收藏的课程列表
+
 // 特价房源
 export const API_SPECIAL_ROOM_LIST = resolvePath('buildingSpecialRoom') // 特价房源列表
 

src/pages/index/buildingList/components/FilterForArea/index.jsx

@@ -0,0 +1,43 @@
+import { useState } from 'react'
+import './index.scss'
+
+export default function FilterForArea (props) {
+
+  const { change = () => {}, defaultValue = '-' } = props
+  const [AreaList] = useState([
+    {name: '不限', id: '-'},
+    {name: '50㎡以下', id: '0-50'},
+    {name: '50-70㎡', id: '50-70'},
+    {name: '70-90㎡', id: '70-90'},
+    {name: '90-110㎡', id: '90-110'},
+    {name: '110-130㎡', id: '110-130'},
+    {name: '130-150㎡', id: '130-150'},
+    {name: '150-200㎡', id: '150-200'},
+    {name: '200㎡以上', id: '200-'},
+  ])
+  const [CurrentId, setCurrentId] = useState(defaultValue)
+
+  const CutArea = (id) => {
+    return () => {
+      setCurrentId(id)
+      change({name: 'area', value: id})
+    }
+  }
+
+  return (
+    <view className='components FilterForArea'>
+      {
+        AreaList.map((item, index) => (
+          <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutArea(item.id)}>
+            <text>{item.name}</text>
+            <view className='flex-item'></view>
+            {
+              CurrentId === item.id &&
+              <text className='iconfont icon-gou1'></text>
+            }
+          </view>
+        ))
+      }
+    </view>
+  )
+}

src/pages/index/buildingList/components/FilterForArea/index.scss

@@ -0,0 +1,25 @@
+.components.FilterForArea {
+  padding: 0 30px;
+  background: #fff;
+  position: relative;
+  overflow: hidden;
+  >view {
+    padding: 0 30px;
+    position: relative;
+    overflow: hidden;
+    border-bottom: 2px solid rgba(0, 0, 0, 0.08);
+    align-items: center;
+    &.active {
+      >text {
+        color: #193C83;
+        &:first-child {
+          font-weight: bold;
+        }
+      }
+    }
+    >text {
+      font-size: 28px;
+      line-height: 80px;
+    }
+  }
+}

src/pages/index/buildingList/components/FilterForHouseType/index.jsx

@@ -0,0 +1,40 @@
+import { useState } from 'react'
+import './index.scss'
+
+export default function FilterForHouseType (props) {
+
+  const { change = () => {}, defaultValue = '-' } = props
+  const [HouseTypeList] = useState([
+    {name: '不限', id: '-'},
+    {name: '一室', id: 1},
+    {name: '两室', id: 2},
+    {name: '三室', id: 3},
+    {name: '四室', id: 4},
+    {name: '五室以上', id: 5}
+  ])
+  const [CurrentId, setCurrentId] = useState(defaultValue)
+
+  const CutArea = (id) => {
+    return () => {
+      setCurrentId(id)
+      change({name: 'houseType', value: id})
+    }
+  }
+
+  return (
+    <view className='components FilterForHouseType'>
+      {
+        HouseTypeList.map((item, index) => (
+          <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutArea(item.id)}>
+            <text>{item.name}</text>
+            <view className='flex-item'></view>
+            {
+              CurrentId === item.id &&
+              <text className='iconfont icon-gou1'></text>
+            }
+          </view>
+        ))
+      }
+    </view>
+  )
+}

src/pages/index/buildingList/components/FilterForHouseType/index.scss

@@ -0,0 +1,25 @@
+.components.FilterForHouseType {
+  padding: 0 30px;
+  background: #fff;
+  position: relative;
+  overflow: hidden;
+  >view {
+    padding: 0 30px;
+    position: relative;
+    overflow: hidden;
+    border-bottom: 2px solid rgba(0, 0, 0, 0.08);
+    align-items: center;
+    &.active {
+      >text {
+        color: #193C83;
+        &:first-child {
+          font-weight: bold;
+        }
+      }
+    }
+    >text {
+      font-size: 28px;
+      line-height: 80px;
+    }
+  }
+}

src/pages/index/buildingList/components/FilterForMore/index.jsx

@@ -0,0 +1,37 @@
+import { useState } from 'react'
+import './index.scss'
+
+export default function FilterForMore (props) {
+
+  const { change = () => {}, defaultValue = '-' } = props
+  const [BuildingTypeList] = useState([
+    {name: '不限', id: '-'},
+    {name: '别墅', id: '1'},
+    {name: '高层', id: '2'}
+  ])
+  const [CurrentId, setCurrentId] = useState(defaultValue)
+
+  const CutArea = (id) => {
+    return () => {
+      setCurrentId(id)
+      change({name: 'buildingType', value: id})
+    }
+  }
+
+  return (
+    <view className='components FilterForMore'>
+      {
+        BuildingTypeList.map((item, index) => (
+          <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutArea(item.id)}>
+            <text>{item.name}</text>
+            <view className='flex-item'></view>
+            {
+              CurrentId === item.id &&
+              <text className='iconfont icon-gou1'></text>
+            }
+          </view>
+        ))
+      }
+    </view>
+  )
+}

src/pages/index/buildingList/components/FilterForMore/index.scss

@@ -0,0 +1,25 @@
+.components.FilterForMore {
+  padding: 0 30px;
+  background: #fff;
+  position: relative;
+  overflow: hidden;
+  >view {
+    padding: 0 30px;
+    position: relative;
+    overflow: hidden;
+    border-bottom: 2px solid rgba(0, 0, 0, 0.08);
+    align-items: center;
+    &.active {
+      >text {
+        color: #193C83;
+        &:first-child {
+          font-weight: bold;
+        }
+      }
+    }
+    >text {
+      font-size: 28px;
+      line-height: 80px;
+    }
+  }
+}

src/pages/index/buildingList/components/FilterForPrice/index.jsx

@@ -0,0 +1,99 @@
+import { useState } from 'react'
+import './index.scss'
+
+export default function FilterForPrice (props) {
+
+  const { change = () => { }, priceType = 'average', price = '-' } = props
+  const [PriceTypeList] = useState([
+    { name: '单价', id: 'average' },
+    { name: '总价', id: 'total' }
+  ])
+  const [CurrentTypeId, setCurrentTypeId] = useState(priceType || 'average')
+  const [AverageList] = useState([
+    { name: '不限', id: '-' },
+    { name: '10000/㎡以下', id: '0-10000' },
+    { name: '10000-20000元/㎡', id: '10000-20000' },
+    { name: '20000-30000元/㎡', id: '20000-30000' },
+    { name: '30000-50000元/㎡', id: '30000-50000' },
+    { name: '50000-70000元/㎡', id: '50000-70000' },
+    { name: '70000-100000元/㎡', id: '70000-100000' },
+    { name: '100000元/㎡以上', id: '100000-' },
+  ])
+  const [TotalList] = useState([
+    { name: '不限', id: '-' },
+    { name: '100万以下', id: '0-1000000' },
+    { name: '100-150万', id: '1000000-1500000' },
+    { name: '150-200万', id: '1500000-2000000' },
+    { name: '200-250万', id: '2000000-2500000' },
+    { name: '250-500万', id: '2500000-5000000' },
+    { name: '500-1000万', id: '5000000-10000000' },
+    { name: '1000万以上', id: '10000000-' },
+  ])
+  const [CurrentId, setCurrentId] = useState(price || '-')
+
+  const CutPrice = (id) => {
+    return () => {
+      setCurrentId(id)
+      change({ priceType: CurrentTypeId, price: id })
+    }
+  }
+
+  const CutType = (id) => {
+    return () => {
+      setCurrentTypeId(id)
+    }
+  }
+
+  return (
+    <view className='components FilterForPrice flex-h'>
+      <view className='TypeList'>
+        {
+          PriceTypeList.map((item, index) => (
+            <text key={`typeItem${index}`} className={CurrentTypeId === item.id ? 'active' : ''} onClick={CutType(item.id)}>{item.name}</text>
+          ))
+        }
+      </view>
+      <view className='flex-item'>
+
+        {/* 单价 */}
+        {
+          CurrentTypeId === 'average' &&
+          <view>
+            {
+              AverageList.map((item, index) => (
+                <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutPrice(item.id)}>
+                  <text>{item.name}</text>
+                  <view className='flex-item'></view>
+                  {
+                    CurrentId === item.id &&
+                    <text className='iconfont icon-gou1'></text>
+                  }
+                </view>
+              ))
+            }
+          </view>
+        }
+
+        {/* 总价 */}
+        {
+          CurrentTypeId === 'total' &&
+          <view>
+            {
+              TotalList.map((item, index) => (
+                <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutPrice(item.id)}>
+                  <text>{item.name}</text>
+                  <view className='flex-item'></view>
+                  {
+                    CurrentId === item.id &&
+                    <text className='iconfont icon-gou1'></text>
+                  }
+                </view>
+              ))
+            }
+          </view>
+        }
+
+      </view>
+    </view>
+  )
+}

src/pages/index/buildingList/components/FilterForPrice/index.scss

@@ -0,0 +1,46 @@
+.components.FilterForPrice {
+  padding: 0 30px;
+  background: #fff;
+  position: relative;
+  overflow: hidden;
+  align-items: flex-start;
+  >.TypeList {
+    width: 160px;
+    text-align: center;
+    >text {
+      font-size: 28px;
+      line-height: 80px;
+      display: block;
+      text-align: center;
+      border-bottom: 2px solid rgba(0, 0, 0, 0.08);
+      &.active {
+        color: #193C83;
+        font-weight: bold;
+      }
+    }
+  }
+  >.flex-item {
+    border-left: 2px solid rgba(0, 0, 0, 0.08);
+    >view {
+      >view {
+        position: relative;
+        overflow: hidden;
+        border-bottom: 2px solid rgba(0, 0, 0, 0.08);
+        align-items: center;
+        &.active {
+          >text {
+            color: #193C83;
+            &:first-child {
+              font-weight: bold;
+            }
+          }
+        }
+        >text {
+          font-size: 28px;
+          line-height: 80px;
+          text-indent: 30px;
+        }
+      }
+    }
+  }
+}

src/pages/index/buildingList/index.jsx

@@ -1,43 +1,66 @@
-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 ProjectListItem from '../../../components/ProjectListItem/index'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
 import { API_INDEX_PROJECTS } from '@/constants/api'
+import ProjectListItem from '@/components/ProjectListItem/index'
+import './index.scss'
+import FilterForArea from './components/FilterForArea/index'
+import FilterForPrice from './components/FilterForPrice/index'
+import FilterForHouseType from './components/FilterForHouseType/index'
+import FilterForMore from './components/FilterForMore/index'
 
-export default withLayout((props) => {
+export default withLayout(() => {
 
-  const [PageProps] = useState(props)
   const city = useSelector(state => state.city)
   const [PageList, setPageList] = useState([])
-  const [pageNum, setPageNum] = useState(null)
+  const [pageNumber, setPageNumber] = useState(1)
   const [pageSize] = useState(10)
   const [IsPull, setPull] = useState(false)
-  const [DataLock, setDataLock] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
+  const [HasNextPage, setHasNextPage] = useState(true)
+  const [FilterMenus] = useState([
+    { name: '面积', id: 1 },
+    { name: '价格', id: 2 },
+    { name: '户型', id: 3 },
+    { name: '更多', id: 4 }
+  ])
+  const [CurrentFilter, setCurrentFilter] = useState(null)
+  const [FilterData, setFilterData] = useState({
+    area: '-',
+    price: '-',
+    priceType: null,
+    houseType: '-',
+    buildingType: '-'
+  })
 
   useEffect(() => {
-    if(city.curCity.name) {
-      setPageNum(1)
+    if (city.curCity.name) {
+      GetProjectList()
     }
-  }, [city])
+  }, [pageNumber, city])
 
   useEffect(() => {
-    if(pageNum !== null && !DataLock) {
-      setDataLock(true)
+    if(pageNumber === 1) {
       GetProjectList()
+    } else {
+      setPageNumber(1)
     }
-  }, [pageNum])
+  }, [FilterData])
 
   const GetProjectList = () => { // 获取项目列表
-    fetch({url: API_INDEX_PROJECTS, method: 'get', payload: {cityId: city.curCity.id, pageNum, pageSize}}).then((res) => {
-      setPageList(res.records || [])
-      setDataLock(false)
+    setHasNextPage(false)
+    let Data = {...FilterData}
+    for(let key in Data) {
+      Data[key] = Data[key] === '-' ? null : Data[key]
+    }
+    fetch({ url: API_INDEX_PROJECTS, method: 'get', payload: { cityId: city.curCity.id, pageNumber, pageSize, ...Data } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+      setCurrentFilter(null)
     }).catch(() => {
-      setDataLock(false)
     })
   }
 
@@ -45,12 +68,39 @@ export default withLayout((props) => {
     setPull(true)
   }
 
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if (HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
+  const CutFilter = (id) => {
+    return () => {
+      setCurrentFilter(id === CurrentFilter ? null : id)
+    }
+  }
+
+  const FilterChange = (e) => {
+    let Data = { ...FilterData }
+    Data[e.name] = e.value
+    setFilterData(Data)
+  }
+
+  const PriceChange = (e) => {
+    let Data = { ...FilterData }
+    for (let key in e) {
+      Data[key] = e[key]
+    }
+    setFilterData(Data)
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+      if (pageNumber === 1) {
+        GetProjectList()
+      } else {
+        setPageNumber(1)
+      }
     }
   }, [IsPull])
 
@@ -66,29 +116,48 @@ export default withLayout((props) => {
 
       <view className='Filter'>
         <view className='flex-h'>
-          <view className='flex-item'>
-            <text>区域</text>
-            <text className='iconfont icon-sanjiaoxingdown'></text>
-          </view>
-          <view className='flex-item'>
-            <text>价格</text>
-            <text className='iconfont icon-sanjiaoxingdown'></text>
-          </view>
-          <view className='flex-item'>
-            <text>户型</text>
-            <text className='iconfont icon-sanjiaoxingdown'></text>
-          </view>
-          <view className='flex-item'>
-            <text>更多</text>
-            <text className='iconfont icon-sanjiaoxingdown'></text>
-          </view>
+          {
+            FilterMenus.map((item, index) => (
+              <view className='flex-item' key={`FilterMenusItem-${index}`} onClick={CutFilter(item.id)}>
+                <text>{item.name}</text>
+                <text className={CurrentFilter === item.id ? 'iconfont icon-sanjiaoxingup' : 'iconfont icon-sanjiaoxingdown'}></text>
+              </view>
+            ))
+          }
           <text className='iconfont icon-paixu Sort'></text>
         </view>
       </view>
 
       <view className='flex-item'>
-        <view>
-          <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+        <view className='FilterContainer' style={{ display: !!CurrentFilter ? 'block' : 'none' }}>
+
+          {/* 面积 */}
+          {
+            CurrentFilter === 1 &&
+            <FilterForArea change={FilterChange} defaultValue={FilterData.area}></FilterForArea>
+          }
+
+          {/* 价格 */}
+          {
+            CurrentFilter === 2 &&
+            <FilterForPrice change={PriceChange} priceType={FilterData.priceType} price={FilterData.price}></FilterForPrice>
+          }
+
+          {/* 户型 */}
+          {
+            CurrentFilter === 3 &&
+            <FilterForHouseType change={FilterChange} defaultValue={FilterData.houseType}></FilterForHouseType>
+          }
+
+          {/* 更多 */}
+          {
+            CurrentFilter === 4 &&
+            <FilterForMore change={FilterChange} defaultValue={FilterData.buildingType}></FilterForMore>
+          }
+
+        </view>
+        <view className='ScrollContainer'>
+          <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
             <view className='PageContent'>
               <view className='ProjectList'>
                 {

src/pages/index/buildingList/index.scss

@@ -60,12 +60,22 @@
   > .flex-item {
     position: relative;
     overflow: hidden;
-    > view {
+    >.FilterContainer {
+      width: 100%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
+      z-index: 2;
+      background: rgba(0, 0, 0, 0.6);
+    }
+    > .ScrollContainer {
       width: 100%;
       position: absolute;
       left: 0;
       top: 0;
       bottom: 0;
+      z-index: 1;
       > scroll-view {
         width: 100%;
         height: 100%;

src/pages/index/courseDetail/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '课程详情'
+}

src/pages/index/courseDetail/index.jsx

@@ -0,0 +1,86 @@
+
+import withLayout from '@/layout'
+import { ScrollView, Image, Swiper, SwiperItem } from '@tarojs/components'
+// import Taro from '@tarojs/taro'
+import { getImgURL } from '@/utils/image'
+import '@/assets/css/iconfont.css'
+import './index.scss'
+
+export default withLayout((props) => {
+  const { List = [] } = props
+
+  return (
+    <view className='Page courseDetail'>
+      <ScrollView scroll-y>
+        <view className='Content'>
+
+          {/* 轮播图 or 主图 */}
+          <view className='Banner'>
+            <view>
+              <Swiper autoplay interval={2000} indicator-dots>
+                {
+                  List.map((item, index) => (
+                    <SwiperItem key={`Banner-${index}`}>
+                      <view className='swiper-item'>
+                        <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.image)} />
+                      </view>
+                    </SwiperItem>
+                  ))
+                }
+              </Swiper>
+            </view>
+          </view>
+
+          {/* 楼盘信息 */}
+          <view className='BuildingInfo'>
+
+            <view className='flex-h Title'>
+              <view className='flex-item'>
+                <text className='Name'>句容·恒大养生谷</text>
+                <view className='Address flex-h'>
+                  <view className='flex-item'>
+                    <text>课程内容课程内容课程内容课程内容课程内容课程内容课程内容..</text>
+                  </view>
+                </view>
+                <text className='Time'>4568人在阅读</text>
+              </view>
+              <view className='Option'>
+                <view>
+                  <text className='iconfont icon-fenxiang1'></text>
+                  <text>分享</text>
+                </view>
+                <view>
+                  <text className='iconfont icon-haibao'></text>
+                  <text>海报</text>
+                </view>
+              </view>
+            </view>
+
+          </view>
+
+          {/* 详情介绍 */}
+          <view className='Desc'>
+            <view className='Title'>
+              <text>课程详情</text>
+            </view>
+            <view className='DescContent'></view>
+          </view>
+
+          <view className='Bottom'>
+            <view>
+              <view>
+                <text className='iconfont icon-shengming'></text>
+                <text>免责声明</text>
+              </view>
+              <view>
+                <text>&emsp;&emsp;以上价格仅供参考,具体一房一价的信息以售楼处展示为准。房屋位置交通、医疗、教育、商业等配套信息，来源于第三方不作为要约,仅供参考,双方具体权利义务应以法律规定及买卖合同约定为准。本平台对项目周边文化教育的介绍旨在提供相关信息1 意味着信息发布方对就学安排作出承诺。相关教育资首页信息存在调整的可能,应以政府教育主管部门门及办学颁布的政策规定为准。详情请仔细阅读</text>
+                <text className='active'>《新联宝使用免责条款》</text>
+              </view>
+            </view>
+          </view>
+
+        </view>
+      </ScrollView>
+    </view>
+  )
+})

src/pages/index/courseDetail/index.scss

@@ -0,0 +1,295 @@
+.Page.courseDetail {
+  width: 100%;
+  height: 100%;
+  > scroll-view {
+    width: 100%;
+    height: 100%;
+    .Content {
+      position: relative;
+      overflow: hidden;
+      min-height: 100vh;
+      >.Banner {
+        width: 100%;
+        padding-bottom: 56%;
+        position: relative;
+        overflow: hidden;
+        background: #eee;
+        >view {
+          width: 100%;
+          position: absolute;
+          left: 0;
+          top: 0;
+          bottom: 0;
+          overflow: hidden;
+          > swiper {
+            width: 100%;
+            height: 100%;
+            .swiper-item {
+              width: 100%;
+              height: 100%;
+              position: relative;
+              overflow: hidden;
+              > image {
+                width: 100%;
+                height: 100%;
+                border-radius: 8px;
+              }
+            }
+          }
+        }
+      }
+      >.BuildingInfo {
+        padding: 0 30px;
+        position: relative;
+        overflow: hidden;
+        margin-top: 40px;
+        >.Title {
+          align-items: center;
+          >.flex-item {
+            margin-right: 30px;
+            position: relative;
+            overflow: hidden;
+            padding-right: 30px;
+            &::after {
+              content: '';
+              width: 2px;
+              height: 100%;
+              background: rgba(0, 0, 0, 0.1);
+              display: block;
+              position: absolute;
+              right: 0;
+              top: 0;
+            }
+            >.Name {
+              display: block;
+              font-size: 34px;
+              font-weight: bold;
+              line-height: 1;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
+            >.Address {
+              align-items: center;
+              margin-top: 28px;
+              >.iconfont {
+                font-size: 20px;
+                color: #666;
+                line-height: 1.1;
+              }
+              >.flex-item {
+                margin-left: 4px;
+                >text {
+                  display: block;
+                  font-size: 26px;
+                  font-weight: bold;
+                  white-space: nowrap;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  line-height: 1.1;
+                }
+              }
+              >.Price {
+                font-size: 26px;
+                font-weight: bold;
+                color: #FF0000;
+                margin-left: 30px;
+                line-height: 1.1;
+              }
+            }
+            >.Time {
+              display: block;
+              font-size: 24px;
+              color: #666;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              margin-top: 28px;
+            }
+          }
+          >.Option {
+            >view {
+              font-size: 0;
+              white-space: nowrap;
+              text-align: center;
+              margin-top: 30px;
+              padding-right: 30px;
+              &:first-child {
+                margin-top: 0;
+              }
+              >text {
+                display: inline-block;
+                vertical-align: middle;
+                font-size: 24px;
+                margin-left: 10px;
+                &:first-child {
+                  margin-left: 0;
+                  font-size: 30px;
+                }
+              }
+            }
+          }
+        }
+        >.CountDown {
+          position: relative;
+          overflow: hidden;
+          background: rgba(25, 60, 131, 0.08);
+          padding: 23px 0;
+          text-align: center;
+          font-size: 0;
+          white-space: nowrap;
+          margin-top: 44px;
+          border-radius: 8px;
+          >text {
+            display: inline-block;
+            vertical-align: middle;
+            font-size: 28px;
+            line-height: 1;
+            margin-left: 10px;
+            &:first-child {
+              margin-left: 0;
+            }
+            &.active {
+              color: #193C83;
+            }
+            &.Number {
+              color: #fff;
+              background: #193C83;
+              width: 38px;
+              line-height: 38px;
+              text-align: center;
+              border-radius: 4px;
+            }
+            &.Red {
+              color: #FF0000;
+            }
+          }
+        }
+        >.Apply {
+          position: relative;
+          overflow: hidden;
+          background: rgba(25, 60, 131, 0.08);
+          align-items: center;
+          margin-top: 40px;
+          border-radius: 8px;
+          >.Collect {
+            position: relative;
+            overflow: hidden;
+            width: 90px;
+            &::after {
+              content: '';
+              width: 2px;
+              height: 34px;
+              background: rgba(0, 0, 0, 0.08);
+              display: block;
+              position: absolute;
+              right: 0;
+              top: 50%;
+              transform: translateY(-50%);
+              -webkit-transform: translateY(-50%);
+            }
+            >text {
+              display: block;
+              text-align: center;
+              font-size: 24px;
+              line-height: 1;
+              margin-top: 10px;
+              &:first-child {
+                margin-top: 0;
+                font-size: 30px;
+              }
+            }
+          }
+          >text {
+            &.iconfont {
+              font-size: 30px;
+              color: #193C83;
+              margin-left: 24px;
+            }
+            &.Btn {
+              font-size: 32px;
+              width: 360px;
+              line-height: 92px;
+              border-radius: 92px;
+              background: #193C83;
+              text-align: center;
+              margin-left: 0;
+              color: #fff;
+            }
+          }
+          >.flex-item {
+            margin-left: 12px;
+            >text {
+              display: block;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              font-size: 30px;
+            }
+          }
+        }
+      }
+      >.Desc {
+        padding: 0 30px;
+        position: relative;
+        overflow: hidden;
+        margin-top: 60px;
+        >.Title {
+          position: relative;
+          overflow: hidden;
+          text-align: center;
+          font-size: 0;
+          &::after {
+            content: '';
+            display: block;
+            width: 100%;
+            height: 2px;
+            border-top: 2px dashed rgba(0, 0, 0, 0.1);
+            position: absolute;
+            z-index: 1;
+            left: 0;
+            top: 20px;
+          }
+          >text {
+            display: inline-block;
+            font-size: 32px;
+            color: #5B717A;
+            background: #fff;
+            position: relative;
+            z-index: 2;
+            padding: 0 30px;
+          }
+        }
+        >.DescContent {
+          position: relative;
+          overflow: hidden;
+          margin-top: 30px;
+        }
+      }
+      >.Bottom {
+        padding: 0 30px 30px;
+        position: relative;
+        overflow: hidden;
+        margin-top: 60px;
+        >view {
+          padding: 30px;
+          position: relative;
+          overflow: hidden;
+          background: #F8F8F8;
+          border-radius: 8px;
+          >view {
+            >text {
+              font-size: 20px;
+              color: #999;
+              line-height: 30px;
+              letter-spacing: 2px;
+              &.active {
+                color: #193C83;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -2,7 +2,6 @@ import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
 import { Image, Slider, Textarea, Picker } from '@tarojs/components'
 import './index.scss'
-import SubmitBuyHouseResult from '../SubmitBuyHouseResult/index'
 import questions from './formData'
 
 export default function BuyHouse (props) {
@@ -13,8 +12,6 @@ export default function BuyHouse (props) {
   const [StepId, setStepId] = useState(1)
   const [StepRange, setStepRange] = useState([0, 4])
 
-  const [ShowPopup, setShowPopup] = useState(false)
-
   const [CityName, setCityName] = useState(null)
   const [CityId, setCityId] = useState(null)
 
@@ -79,10 +76,6 @@ export default function BuyHouse (props) {
 
   return (
     <view className='components BuyHouse'>
-      {
-        ShowPopup &&
-        <SubmitBuyHouseResult></SubmitBuyHouseResult>
-      }
       {
         FormData.map((item, index) => (
           <view className='Step' key={`Form-${index}`}>

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

@@ -2,7 +2,6 @@ import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
 import { Image, Slider, Textarea } from '@tarojs/components'
 import './index.scss'
-import SubmitBuyHouseResult from '../SubmitBuyHouseResult/index'
 import questions from './formData'
 
 export default function HousePurchasing (props) {
@@ -13,8 +12,6 @@ export default function HousePurchasing (props) {
   const [StepId, setStepId] = useState(1)
   const [StepRange, setStepRange] = useState([0, 5])
 
-  const [ShowPopup, setShowPopup] = useState(false)
-
   useEffect(() => {
     if(StepId === 1) {
       setStepRange([0, 5])
@@ -65,10 +62,6 @@ export default function HousePurchasing (props) {
 
   return (
     <view className='components BuyHouse'>
-      {
-        ShowPopup &&
-        <SubmitBuyHouseResult></SubmitBuyHouseResult>
-      }
       {
         FormData.map((item, index) => (
           <view className='Step' key={`Form-${index}`}>

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

@@ -2,7 +2,6 @@ import { useState, useEffect } from 'react'
 import '@/assets/css/iconfont.css'
 import { Image, Slider, Textarea } from '@tarojs/components'
 import './index.scss'
-import SubmitBuyHouseResult from '../SubmitBuyHouseResult/index'
 import questions from './formData'
 
 export default function RentingHouse (props) {
@@ -13,8 +12,6 @@ export default function RentingHouse (props) {
   const [StepId, setStepId] = useState(1)
   const [StepRange, setStepRange] = useState([0, 4])
 
-  const [ShowPopup, setShowPopup] = useState(false)
-
   useEffect(() => {
     if(StepId === 1) {
       setStepRange([0, 4])
@@ -67,10 +64,6 @@ export default function RentingHouse (props) {
 
   return (
     <view className='components BuyHouse'>
-      {
-        ShowPopup &&
-        <SubmitBuyHouseResult></SubmitBuyHouseResult>
-      }
       {
         FormData.map((item, index) => (
           <view className='Step' key={`Form-${index}`}>

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

@@ -1,10 +1,10 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
+
 import '@/assets/css/iconfont.css'
-import { Image } from '@tarojs/components'
+import { Image, Block } from '@tarojs/components'
+import './index.scss'
 
 export default function SubmitBuyHouseResult (props) {
-  const { Data = {} } = props
+  const { List = [] } = props
   return (
     <view className='components SubmitBuyHouseResult'>
       <view className='centerLabel'>
@@ -28,28 +28,37 @@ export default function SubmitBuyHouseResult (props) {
             </view>
 
             {/* 匹配楼盘 */}
-            <view className='Recommend'>
-              <view className='Title'>
-                <view>
-                  <text>匹配楼盘</text>
-                </view>
-              </view>
-              <view className='PlanTitle'>“方案一：综合匹配度<text>99%</text>”</view>
-              <view className='RecommendBuildingItem'>
-                <view>
-                  <view className='Img'>
-                    <Image mode='aspectFill' src={null} className='centerLabel'></Image>
-                  </view>
-                  <view className='Title flex-h'>
-                    <view className='flex-item'>
-                      <text>奥园金基天著尚居</text>
-                    </view>
-                    <view className='Price'>约<text>20000/㎡</text></view>
+            {
+              !!List.length &&
+              <view className='Recommend'>
+                <view className='Title'>
+                  <view>
+                    <text>匹配楼盘</text>
                   </view>
-                  <text className='Address'>江宁禄口云熙99路号（诚信大道）</text>
                 </view>
+                {
+                  List.map((item, index) => (
+                    <Block key={`ListItem-${index}`}>
+                      <view className='PlanTitle'>“方案一：综合匹配度<text>99%</text>”</view>
+                      <view className='RecommendBuildingItem'>
+                        <view>
+                          <view className='Img'>
+                            <Image mode='aspectFill' src={null} className='centerLabel'></Image>
+                          </view>
+                          <view className='Title flex-h'>
+                            <view className='flex-item'>
+                              <text>奥园金基天著尚居</text>
+                            </view>
+                            <view className='Price'>约<text>20000/㎡</text></view>
+                          </view>
+                          <text className='Address'>江宁禄口云熙99路号（诚信大道）</text>
+                        </view>
+                      </view>
+                    </Block>
+                  ))
+                }
               </view>
-            </view>
+            }
 
           </view>
         </view>

src/pages/index/helpToFindHouse/index.jsx

@@ -8,9 +8,10 @@ import './index.scss'
 import BuyHouse from './components/BuyHouse/index'
 import RentingHouse from './components/RentingHouse/index'
 import HousePurchasing from './components/HousePurchasing/index'
+import SubmitBuyHouseResult from './components/SubmitBuyHouseResult/index'
 
 export default withLayout(() => {
-  
+
   const [DemandList] = useState([
     { name: '我要买房', id: 1, icon: '', spell: 'MAI FANG' },
     { name: '我要租房', id: 2, icon: '', spell: 'ZU FANG' },
@@ -19,9 +20,11 @@ export default withLayout(() => {
   const [CurrentDemandId, setCurrentDemandId] = useState(1)
   const [ShowDemand, setShowDemand] = useState(true)
   const [CityList, setCityList] = useState([])
+  const [ResultList, setResultList] = useState([])
+  const [ShowPopup, setShowPopup] = useState(false)
 
   useEffect(() => {
-    fetch({url: API_CITY_LIST, method: 'get'}).then((res) => {
+    fetch({ url: API_CITY_LIST, method: 'get' }).then((res) => {
       setCityList(res || [])
     })
   }, [])
@@ -42,13 +45,18 @@ export default withLayout(() => {
     data.map((item) => {
       params[item.key] = item.result
     })
-    fetch({url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: {...params, type: CurrentDemandId}}).then(() => {
-      
+    fetch({ url: API_HELP_FIND_HOUSE_SUBMIT, method: 'post', payload: { ...params, type: CurrentDemandId } }).then((res) => {
+      setResultList(res.taBuildingList || [])
+      setShowPopup(true)
     })
   }
 
   return (
     <view className='Page helpToFindHouse'>
+      {
+        ShowPopup &&
+        <SubmitBuyHouseResult List={ResultList}></SubmitBuyHouseResult>
+      }
 
       <ScrollView scroll-y refresher-enabled={false}>
         <view className='PageContent'>

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

@@ -10,12 +10,10 @@ 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 [pageNumber, setPageNumber] = useState(1)
   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) {
@@ -24,41 +22,43 @@ export default function MyCollectForActivity () {
   }, [user])
 
   useEffect(() => {
-    if (PersonId) {
-      setPageNumber(1)
+    if(PersonId) {
+      GetPageList()
     }
-  }, [PersonId])
+  }, [pageNumber, 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 GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_ACTIVITY_SAVE, method: 'get', payload: { mine: true, pageNumber, pageSize: 10 } }).then((res) => {
+      setPageList(pageNumber === 1 ? res?.records || [] : PageList.concat(res?.records || []))
+      setHasNextPage(res?.current < res?.pages)
+      setPull(false)
+    })
+  }
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
 
+  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])
 
   return (
     <view className='components MyCollectForActivity'>
-      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
         <view className='PageContent'>
           <view className='List'>
             {

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

@@ -10,12 +10,10 @@ 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 [pageNumber, setPageNumber] = useState(1)
   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) {
@@ -25,35 +23,42 @@ export default function MyCollectForBuilding () {
 
   useEffect(() => {
     if(PersonId) {
-      setPageNumber(1)
+      GetPageList()
     }
-  }, [PersonId])
+  }, [pageNumber, 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 GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { mine: true, pageNumber, pageSize: 10 } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+    })
+  }
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
 
+  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])
 
   return (
     <view className='components MyCollectForBuilding'>
-      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
         <view className='PageContent'>
           <view className='List'>
             {

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

@@ -1,30 +1,64 @@
-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_MY_COLLECT_COURSE_LIST } from '@/constants/api'
+import './index.scss'
 import MyCourseListItem from '../../components/MyCourseListItem/index'
 
-export default function MyCollectForCourse (props) {
-  const { Data = {} } = props
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
+export default function MyCollectForCourse () {
+  
+  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_MY_COLLECT_COURSE_LIST, method: 'get', payload: { pageNum: pageNumber, pageSize: 10 } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+    })
+  }
+
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+      if(pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
     }
   }, [IsPull])
 
   return (
     <view className='components MyCollectForCourse'>
-      <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} onscrolltolower={PageLoadMore} refresher-background='#fff'>
         <view className='PageContent'>
           <view className='List'>
             {

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

@@ -10,12 +10,10 @@ 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 [pageNumber, setPageNumber] = useState(1)
   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) {
@@ -25,35 +23,42 @@ export default function MyCollectForNews () {
 
   useEffect(() => {
     if(PersonId) {
-      setPageNumber(1)
+      GetPageList()
     }
-  }, [PersonId])
+  }, [pageNumber, 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 GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_NEWS_LIST, method: 'get', payload: { mine: true, pageNumber, pageSize: 10 } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+    })
+  }
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
 
+  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])
 
   return (
     <view className='components MyCollectForNews'>
-      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
         <view className='PageContent'>
           <view className='List'>
             {

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

@@ -1,33 +1,35 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
+
+import { Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
+import { getImgURL } from '@/utils/image'
+import './index.scss'
 
 export default function MyCourseListItem (props) {
   const { Data = {} } = props
   return (
-    <view className='components MyCourseListItem flex-h' onClick={() => {Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${Data.id}` })}}>
+    <view className='components MyCourseListItem flex-h' onClick={() => {Taro.navigateTo({ url: `/pages/index/courseDetail/index?id=${Data.curriculumId}` })}}>
       <view className='Img'>
         <view>
           {
             Data.img &&
-            <Image mode='aspectFill' className='centerLabel' src={Data.img || null} />
+            <Image mode='aspectFill' className='centerLabel' src={getImgURL(Data.curriculumImg || null)} />
           }
         </view>
       </view>
       <view className='flex-item'>
         <view className='Name flex-h'>
           <view className='flex-item'>
-            <text>课程名称</text>
+            <text>{Data.name}</text>
           </view>
         </view>
-        <text className='Address'>课程描述...</text>
+        <text className='Address'>{Data.remark}</text>
         <view className='ShareInfo'>
           <view className='Users'>
+            {/* <view></view>
             <view></view>
-            <view></view>
-            <view></view>
+            <view></view> */}
           </view>
-          <text>...9人查看</text>
+          <text>...{Data.lookNum}人查看</text>
         </view>
       </view>
     </view>

src/pages/mine/feedBack/index.jsx

@@ -1,27 +1,58 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import './index.scss'
 import { ScrollView, Input } from '@tarojs/components'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_FEEDBACK_SUBMIT } from '@/constants/api'
+import Taro from '@tarojs/taro'
 import '@/assets/css/iconfont.css'
+import './index.scss'
+
+export default withLayout(() => {
+
+  const user = useSelector(state => state.user)
+  const [PersonId, setPersonId] = useState(null)
+  const [FormData, setFormData] = useState({
+    phone: '',
+    message: ''
+  })
+
+  useEffect(() => {
+    if (user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
 
-export default withLayout((props) => {
+  const FormChange = (key, e) => {
+    let Data = { ...FormData }
+    Data[key] = e.detail.value
+    setFormData(Data)
+  }
 
-  // const [PageProps] = useState(props)
+  const Submit = () => {
+    fetch({ url: API_FEEDBACK_SUBMIT, method: 'post', payload: FormData }).then(() => {
+      Taro.showToast({
+        title: '反馈成功', icon: 'none', complete: () => {
+          Taro.navigateBack({ delta: 1 })
+        }
+      })
+    })
+  }
 
   return (
     <view className='Page feedBack flex-v'>
 
       <view className='flex-item'>
         <view>
-          <ScrollView scroll-y={true} refresher-enabled={false} refresher-background='#fff'>
+          <ScrollView scroll-y refresher-enabled={false}>
             <view className='PageContent'>
               <text className='Title'>问题描述</text>
               <view>
-                <Input placeholder='请填写10个字以上的问题描述以便我们提供更好的帮助'></Input>
+                <Input placeholder='请填写10个字以上的问题描述以便我们提供更好的帮助' value={FormData.message} onInput={FormChange.bind(this, 'message')}></Input>
               </view>
               <text className='Title'>联系方式（选填）</text>
               <view>
-                <Input placeholder='输入邮箱/手机号方便联系'></Input>
+                <Input placeholder='输入邮箱/手机号方便联系' value={FormData.phone} onInput={FormChange.bind(this, 'phone')}></Input>
               </view>
             </view>
           </ScrollView>
@@ -29,7 +60,7 @@ export default withLayout((props) => {
       </view>
 
       <view className='Bottom'>
-        <text>提交</text>
+        <text onClick={Submit}>提交</text>
       </view>
 
     </view>

src/pages/mine/myCourse/index.jsx

@@ -1,34 +1,67 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import './index.scss'
 import { ScrollView } from '@tarojs/components'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_COURSE_LIST } from '@/constants/api'
 import '@/assets/css/iconfont.css'
+import './index.scss'
 import MyCourseListItem from '../components/MyCourseListItem/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(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_COURSE_LIST, method: 'get', payload: { pageNum: pageNumber, pageSize: 10 } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+    })
+  }
+
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+      if(pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
     }
   }, [IsPull])
 
   return (
     <view className='Page myCourse'>
 
-      <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} onscrolltolower={PageLoadMore} refresher-background='#fff'>
         <view className='PageContent'>
           <view className='List'>
             {

src/pages/mine/residentManager/index.jsx

@@ -1,13 +1,12 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import './index.scss'
 import { ScrollView, Image } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
+import './index.scss'
 import ResidentListItem from '../components/ResidentListItem/index'
 
-export default withLayout((props) => {
+export default withLayout(() => {
 
-  // const [PageProps] = useState(props)
   const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
@@ -53,7 +52,7 @@ export default withLayout((props) => {
 
       <view className='flex-item'>
         <view>
-          <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='Filter'>
@@ -65,7 +64,7 @@ export default withLayout((props) => {
                         <text>{item.name}</text>
                         {
                           CurrentFilterMenuId === item.id &&
-                          <Image mode='widthFix' src={require('../../../assets/findHouse-icon1.png')}></Image>
+                          <Image mode='widthFix' src={require('@/assets/findHouse-icon1.png')}></Image>
                         }
                       </view>
                     ))

src/routes.js

@@ -228,6 +228,12 @@ const routes = [
     pkg: 'main',
     type: 'building',
   },
+  {
+    name: '课程详情',
+    page: 'pages/index/courseDetail/index',
+    pkg: 'main',
+    type: 'mine',
+  },
 
   //视频
   {