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

config/dev.js

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

src/components/FirstScreen/index.jsx

@@ -0,0 +1,27 @@
+import { useState, useEffect } from 'react'
+import { Image } from '@tarojs/components'
+import { getImgURL } from '@/utils/image'
+import './style.scss'
+
+export default (props) => {
+  const { info, visible = false, onClose } = props
+
+  const ImgClick = () => {
+
+  }
+
+  console.log('---------info------>', info, visible)
+
+  return (
+    <view className='components Adv' style={{display: visible ? 'block' : 'none'}}>
+      <view className='centerLabel'>
+        <view>
+          <view className='Img' onClick={ImgClick}>
+            <Image mode='scaleToFill' src={getImgURL(info?.image)}></Image>
+          </view>
+          <text className='iconfont icon-guanbi' onClick={onClose}></text>
+        </view>
+      </view>
+    </view>
+  )
+}

src/components/FirstScreen/style.scss

@@ -0,0 +1,36 @@
+.components.Adv {
+  width: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  z-index: 1000;
+  background: rgba(0, 0, 0, 0.6);
+  >view {
+    width: 100%;
+    >view {
+      padding: 0 134px;
+      position: relative;
+      overflow: hidden;
+      text-align: center;
+      >.Img {
+        width: 100%;
+        position: relative;
+        overflow: hidden;
+        padding-bottom: 150%;
+        background: #eee;
+        border-radius: 24px;
+        >image {
+          width: 100%;
+          height: 100%;
+        }
+      }
+      >text {
+        display: inline-block;
+        font-size: 60px;
+        color: #fff;
+        margin-top: 30px;
+      }
+    }
+  }
+}

src/constants/api.js

@@ -121,7 +121,14 @@ export const API_TYPE_DATA = resolvePath('awesome/dict/recommendcustomer')
 // channel
 export const API_CHANNEL_REPORT = resolvePath('channel/report')
 
+// 驻场
+export const API_MANAGE_CUSTOMER_LIST = resolvePath('marking/customers')
+export const API_TOBE_MANAGER = resolvePath('marketing')
+export const API_MY_BUILDINGIDS = resolvePath('building/mine')
+
+
 // report
+export const API_REPORT_CUETOMER = resolvePath('customer/manualReport ')
 export const API_REPORT_LIST = resolvePath('myReport')
 export const API_REPORT_CLIENT = resolvePath('customer/report')
 export const API_RECOMMEND_GET = resolvePath('customer/recommend/get')

src/layout/index.js

@@ -8,15 +8,18 @@ import AuthAvatar from '@/components/Auth/AuthAvatar'
 import AuthPhone from '@/components/Auth/AuthPhone'
 import Spin from '@/components/Spin/Spin2'
 import FixedConsultant from '@/components/FixedConsultant'
+import FirstScreen from '@/components/FirstScreen'
 import { report as reportCustomer } from '@/utils/customer'
 import { ROLE_CODE } from '@/constants/user'
 import useAuth from './useAuth'
+import useScreen from './useScreen'
 import { routes } from '../routes'
 
 import './style.scss'
 
 export default (ChildComponent) => (props) => {
   const consultant = useSelector(s => s.system.consultant)
+  const city = useSelector(s => s.city.curCity)
   const { spinning, userInfo } = useSelector(s => s.user)
   const { person, ...extInfo } = userInfo || {}
   const router = useRouter()
@@ -31,6 +34,8 @@ export default (ChildComponent) => (props) => {
   const [shareContent, setShareContent] = useState({})
   // 页面埋点
   const [trackData, setTrackData] = useState({})
+  // 开屏广告
+  const [screenInfo, screenVisible, toggleShowScreen] = useScreen(city.id, person)
 
   // 报备客户
   useEffect(() => {
@@ -90,6 +95,7 @@ export default (ChildComponent) => (props) => {
             router={router}
             consultant={consultant}
             page={page}
+            city={city}
             shareContent={shareContent}
             trackData={trackData}
             {...props}
@@ -100,6 +106,7 @@ export default (ChildComponent) => (props) => {
       {
         !!showConsultant && (<FixedConsultant consultant={consultant} />)
       }
+      <FirstScreen info={screenInfo} visible={screenVisible} onClose={toggleShowScreen} />
     </>
   )
 }

src/layout/useScreen.js

@@ -0,0 +1,37 @@
+/**
+ * 获取开屏广告
+ * @param {*} cityId 
+ */
+import { useEffect, useState, useCallback } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import { queryExtContents } from '@/services/common'
+
+export default function useScreen(cityId, person) {
+  const dispatch = useDispatch()
+
+  const [firstScreen, setFirstScreen] = useState()
+  const canShow = useSelector(s => !s.system.firstScreen.filter(x => x === cityId)[0])
+  const toggle = useCallback(
+    () => dispatch({ type: 'TOGGLE_FIRSTSCREEN', payload: { cityId } }),
+    [cityId, dispatch],
+  )
+
+  useEffect(() => {
+    if (cityId && person?.personId) {
+      queryExtContents({cityId}).then((res) => {
+        const screen = (res || []).filter(x => x.showType === 'screen' && x.showPosition === 'index')[0] || {}
+        setFirstScreen(screen)
+  
+        if (screen) {
+          toggle()
+        }
+      })
+    }
+  }, [cityId, toggle, person?.personId])
+
+  const show = canShow && firstScreen
+
+  console.log('------showshow--------->', show)
+
+  return [firstScreen, show, toggle]
+}

src/pages/index/brandDetail/index.jsx

@@ -4,8 +4,9 @@ import Taro from '@tarojs/taro'
 import { ScrollView, Image } from '@tarojs/components'
 import ProjectListItem from '@/components/ProjectListItem/index'
 import { queryBrandInfo } from '@/services/common';
-import { getItemList } from '@/services/item';
 import { getImgURL } from '@/utils/image'
+import { fetch } from '@/utils/request'
+import { API_ITEMS_LIST } from '@/constants/api'
 import '@/assets/css/iconfont.css'
 import ColumnTitle from '../components/ColumnTitle/index'
 import './index.scss'
@@ -13,40 +14,57 @@ import './index.scss'
 export default withLayout((props) => {
   const { router } = props
   const { id } = router.params
-
-  const [ProjectList, setProjectList] = useState([{}, {}])
+  
+  const [PageList, setPageList] = useState([])
+  const [IsPull, setPull] = useState(false)
+  const [pageNumber, setPageNumber] = useState(1)
+  const [HasNextPage, setHasNextPage] = useState(true)
   const [brandInfo, setBrandInfo] = useState({})
 
-  const getList = (params) => {
-    Taro.showLoading()
-    getItemList({
-      brandId: id,
-      ...(params || {}),
-    }).then((res) => {
-      const { records } = res
-      setProjectList(records || {})
-      Taro.hideLoading()
-    }).catch((err) => {
-      console.error(err)
-      Taro.hideLoading()
+  useEffect(() => {
+    GetPageList()
+  }, [pageNumber])
+
+  const PageRefresh = () => { // 页面下拉刷新回调
+    setPull(true)
+  }
+
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { pageNumber, pageSize: 10 } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
     })
   }
 
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
+  useEffect(() => { // 下拉刷新触发
+    if (IsPull) {
+      if(pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
+    }
+  }, [IsPull])
+
   useEffect(() => {
     if (id) {
       queryBrandInfo(id).then((res) => {
         setBrandInfo(res || {})
-      }).catch((err) => {
-        console.error(err)
       })
-
-      getList({ pageNumber: 1 })
     }
   }, [id])
 
   return (
     <view className='brandDetail'>
-      <ScrollView scroll-y>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
         <view className='Content'>
 
           {/* 主图 */}
@@ -69,7 +87,7 @@ export default withLayout((props) => {
             <ColumnTitle Name='在售项目' Icon='icon-aixin' ShowMore ToMore={() => { Taro.navigateTo({ url: `/pages/index/buildingList/index` }) }}></ColumnTitle>
             <view className='ProjectList'>
               {
-                ProjectList.map((item, index) => (
+                PageList.map((item, index) => (
                   <ProjectListItem Data={item} key={`ProjectListItem-${index}`}></ProjectListItem>
                 ))
               }

src/pages/index/buildingList/index.jsx

@@ -13,7 +13,9 @@ import FilterForHouseType from './components/FilterForHouseType/index'
 import FilterForMore from './components/FilterForMore/index'
 import FilterForHouseSort from './components/FilterForHouseSort/index'
 
-export default withLayout(() => {
+export default withLayout((props) => {
+  const { router } = props
+  const { isRecentOpening } = router.params
 
   const city = useSelector(state => state.city)
   const [PageList, setPageList] = useState([])
@@ -87,7 +89,7 @@ export default withLayout(() => {
         Data[key] = FilterData[key]
       }
     }
-    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { cityId: city.curCity.id, pageNumber, pageSize, ...Data } }).then((res) => {
+    fetch({ url: API_ITEMS_LIST, method: 'get', payload: { cityId: city.curCity.id, pageNumber, pageSize, isRecentOpening, ...Data } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)

src/pages/index/index.jsx

@@ -53,7 +53,6 @@ export default withLayout(() => {
 
   return (
     <view className='Page Index'>
-
       <ScrollView scroll-y>
         <view className='PageContent'>
 

src/pages/mine/addCustomer/index.jsx

@@ -1,10 +1,10 @@
 import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import { ScrollView, Input, Image, Picker } from '@tarojs/components'
+import { ScrollView, Input, Image, Picker, Block } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
-import { API_ITEMS_LIST, API_CARDS_LIST, API_REPORT_CLIENT, API_RECOMENT_CLIENT, API_CHANNEL_REPORT } from '@/constants/api'
+import { API_ITEMS_LIST, API_CARDS_LIST, API_REPORT_CUETOMER, API_RECOMENT_CLIENT, API_CHANNEL_REPORT } from '@/constants/api'
 import Taro from '@tarojs/taro'
 import './index.scss'
 
@@ -12,7 +12,8 @@ const defaultSpecialImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/
 
 export default withLayout((props) => {
 
-  const { type } = props
+  const { router } = props
+  const { type } = router.params
   const user = useSelector(state => state.user)
   const [PersonId, setPersonId] = useState(null)
   const [BuildingName, setBuildingName] = useState(null)
@@ -47,14 +48,19 @@ export default withLayout((props) => {
   useEffect(() => {
     if (CanSubmit) {
       let url = null
-      if(type === 'consultant') { // 置业顾问
-        url = API_REPORT_CLIENT
-      } else if(type === 'customer') { // 普通客户
+      if (type === 'consultant') { // 置业顾问
+        url = API_REPORT_CUETOMER
+      } else if (type === 'customer') { // 普通客户
         url = API_RECOMENT_CLIENT
       } else { // 经纪人
         url = API_CHANNEL_REPORT
       }
-      const params = { ...FormData, sex: SexId, intention: BuildingId, realtyConsultant: CardId }
+      let params = {}
+      if(type === 'consultant') {
+        params = { name: FormData.name, phone: FormData.phone, sex: SexId }
+      } else {
+        params = { ...FormData, sex: SexId, intention: BuildingId, realtyConsultant: CardId }
+      }
       fetch({ url, method: 'post', payload: params }).then(() => {
         Taro.showToast({ title: '添加成功', icon: 'none' })
         Taro.navigateBack({ delta: 1 })
@@ -129,7 +135,7 @@ export default withLayout((props) => {
       Taro.showToast({ title: '请填写正确的客户电话', icon: 'none' })
       return false
     }
-    if (BuildingId === null) {
+    if (BuildingId === null && type !== 'consultant') {
       Taro.showToast({ title: '请选择客户的意向楼盘', icon: 'none' })
       return false
     }
@@ -168,32 +174,37 @@ export default withLayout((props) => {
             <text className='iconfont icon-jiantoudown'></text>
           </view>
 
-          <text>意向楼盘</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Picker range-key='name' onChange={PickerChange} value={0} range={BuildingList}>
-                <text>{BuildingName || '请选择'}</text>
-              </Picker>
-            </view>
-          </view>
-
-          <text>内场接待（选填）</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Picker range-key='name' onChange={CardPickerChange} value={0} range={CardList}>
-                <text>{CardName || '请选择'}</text>
-              </Picker>
-            </view>
-            <Image mode='heightFix' src={defaultSpecialImage}></Image>
-            <text>选择</text>
-          </view>
-
-          <text>备注</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='补充说明（选填）' data-type='describe' onInput={FormInput.bind(this)}></Input>
-            </view>
-          </view>
+          {
+            type !== 'consultant' &&
+            <Block>
+              <text>意向楼盘</text>
+              <view className='FormLine flex-h'>
+                <view className='flex-item'>
+                  <Picker range-key='name' onChange={PickerChange} value={0} range={BuildingList}>
+                    <text>{BuildingName || '请选择'}</text>
+                  </Picker>
+                </view>
+              </view>
+
+              <text>内场接待（选填）</text>
+              <view className='FormLine flex-h'>
+                <view className='flex-item'>
+                  <Picker range-key='name' onChange={CardPickerChange} value={0} range={CardList}>
+                    <text>{CardName || '请选择'}</text>
+                  </Picker>
+                </view>
+                <Image mode='heightFix' src={defaultSpecialImage}></Image>
+                <text>选择</text>
+              </view>
+
+              <text>备注</text>
+              <view className='FormLine flex-h'>
+                <view className='flex-item'>
+                  <Input placeholder='补充说明（选填）' data-type='describe' onInput={FormInput.bind(this)}></Input>
+                </view>
+              </view>
+            </Block>
+          }
 
           <view className='Btn'>
             <text onClick={ToSubmit}>提交</text>

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

@@ -1,25 +1,23 @@
-import React, { useState, useEffect } from 'react'
-import './index.scss'
+
+import { Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
+import './index.scss'
 
 export default function MyCustomerListItem (props) {
-  const { Data = {} } = props
+  const { data = {} } = props
   return (
-    <view className='components MyCustomerListItem flex-h' onClick={() => { Taro.navigateTo({ url: `/pages/mine/myCustomerDetail/index?id=${Data.id}` }) }}>
+    <view className='components MyCustomerListItem flex-h' onClick={() => { Taro.navigateTo({ url: `/pages/mine/myCustomerDetail/index?id=${data.customerId}` }) }}>
       <view className='Img'>
-        {
-          Data.img &&
-          <Image mode='aspectFill' className='centerLabel' src={Data.img || null} />
-        }
+        <Image mode='scaleToFill' src={data.avatarurl}></Image>
       </view>
       <view className='flex-item'>
         <view className='Name flex-h'>
-          <text className='flex-item'>徐慧慧</text>
+          <text className='flex-item'>{data.name}</text>
           <text>11/11 15:12:58收回</text>
         </view>
         <view className='Time flex-h'>
-          <text className='flex-item'>136 **** 9434</text>
-          <text>跟进状态</text>
+          <text className='flex-item'>{data.phone}</text>
+          <text>{data.status === 0 ? '' : data.status === 1 ? '报备' : data.status === 2 ? '到访' : data.status === 3 ? '认筹' : '签约'}</text>
         </view>
       </view>
     </view>

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

@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from 'react'
-import './index.scss'
 import Taro from '@tarojs/taro'
 import { Image } from '@tarojs/components'
+import './index.scss'
 
 export default function ResidentListItem (props) {
-  const { Data = {} } = props
+  const { data = {} } = props
   return (
     <view className='components ResidentListItem'>
       <view className='flex-h'>
@@ -17,15 +17,15 @@ export default function ResidentListItem (props) {
       <view className='flex-h'>
         <text>客户姓名：</text>
         <view className='flex-item'>
-          <text>栋</text>
+          <text>{data.name}</text>
         </view>
       </view>
       <view className='flex-h'>
         <text>手机号码：</text>
         <view className='flex-item'>
-          <text>136****9434</text>
+          <text>{data.phone}</text>
         </view>
-        <Image mode='heightFix' src={require('../../../../assets/mine-icon27.png')}></Image>
+        <Image mode='heightFix' src={require('@/assets/mine-icon27.png')}></Image>
         <text className='Type'>结佣</text>
       </view>
       <view className='flex-h'>

src/pages/mine/myCustomer/index.jsx

@@ -1,27 +1,60 @@
-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 { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_CLIENT_LIST } from '@/constants/api'
+import './index.scss'
 import MyCustomerListItem from '../components/MyCustomerListItem/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_CLIENT_LIST, method: 'get', payload: { customerId: PersonId, 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])
 
@@ -46,13 +79,13 @@ 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} onscrolltolower={PageLoadMore} refresher-background='#fff'>
             <view className='PageContent'>
               <view className='List'>
                 {
                   PageList.map((item, index) => (
                     <view>
-                      <MyCustomerListItem Data={item} key={`MyCustomerListItem-${index}`}></MyCustomerListItem>
+                      <MyCustomerListItem data={item} key={`MyCustomerListItem-${index}`}></MyCustomerListItem>
                     </view>
                   ))
                 }

src/pages/mine/residentManager/index.jsx

@@ -1,53 +1,147 @@
 import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import { ScrollView, Image } from '@tarojs/components'
+import { ScrollView, Input } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_MANAGE_CUSTOMER_LIST, API_MY_BUILDINGIDS } from '@/constants/api'
 import './index.scss'
 import ResidentListItem from '../components/ResidentListItem/index'
 
 export default withLayout(() => {
+  // const [FilterMenu] = useState([
+  //   { name: '报备', id: 1 },
+  //   { name: '到访', id: 2 },
+  //   { name: '认筹', id: 3 },
+  //   { name: '认购', id: 4 },
+  //   { name: '签约', id: 5 },
+  //   { name: '报备无效', id: 6 },
+  //   { name: '报备过期', id: 7 }
+  // ])
+  // const [CurrentFilterMenuId, setCurrentFilterMenuId] = useState(null)
 
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
+  // const CutFilter = (item) => {
+  //   return () => {
+  //     setCurrentFilterMenuId(item.id === CurrentFilterMenuId ? null : item.id)
+  //   }
+  // }
+
+  const user = useSelector(state => state.user)
+  const [BuildingIds, setBuildingIds] = useState([])
+  const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
-  const [FilterMenu] = useState([
-    { name: '报备', id: 1 },
-    { name: '到访', id: 2 },
-    { name: '认筹', id: 3 },
-    { name: '认购', id: 4 },
-    { name: '签约', id: 5 },
-    { name: '报备无效', id: 6 },
-    { name: '报备过期', id: 7 }
-  ])
-  const [CurrentFilterMenuId, setCurrentFilterMenuId] = useState(null)
+  const [PersonId, setPersonId] = useState(null)
+  const [pageNumber, setPageNumber] = useState(1)
+  const [HasNextPage, setHasNextPage] = useState(true)
+  const [CurrentBuildingId, setCurrentBuildingId] = useState(null)
+  const [CurrentBuildingName, setCurrentBuildingName] = useState(null)
+  const [FilterData, setFilterData] = useState({})
+
+  useEffect(() => {
+    if (user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    if (PersonId) {
+      GetMyBuildingIds()
+    }
+  }, [PersonId])
+
+  useEffect(() => {
+    if (FilterData.keywords) {
+      if (pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
+    }
+  }, [FilterData])
+
+  useEffect(() => {
+    if (BuildingIds.length) {
+      setCurrentBuildingId(BuildingIds[0].buildingId)
+      setCurrentBuildingName(BuildingIds[0].name)
+    }
+  }, [BuildingIds])
+
+  useEffect(() => {
+    if (CurrentBuildingId) {
+      if (pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
+    }
+  }, [CurrentBuildingId])
+
+  const GetMyBuildingIds = () => {
+    fetch({ url: API_MY_BUILDINGIDS, method: 'get' }).then((res) => {
+      setBuildingIds(res || [])
+    })
+  }
+
+  // useEffect(() => {
+  //   if(CurrentFilterMenuId) {
+  //     if(pageNumber === 1) {
+  //       GetPageList()
+  //     } else {
+  //       setPageNumber(1)
+  //     }
+  //   }
+  // }, [CurrentFilterMenuId])
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
 
-  const CutFilter = (item) => {
-    return () => {
-      setCurrentFilterMenuId(item.id === CurrentFilterMenuId ? null : item.id)
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_MANAGE_CUSTOMER_LIST, method: 'get', payload: { pageNumber, pageSize: 10, ...FilterData, buildingId: CurrentBuildingId } }).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])
 
+  const PickerChange = (e) => {
+    setCurrentBuildingId(BuildingIds[e.detail.value - 0].buildingId)
+    setCurrentBuildingName(BuildingIds[e.detail.value - 0].name)
+  }
+
+  const SearchConfirm = (e) => {
+    setFilterData({ ...FilterData, keywords: e.detail.value })
+  }
+
   return (
     <view className='Page residentManager flex-v'>
 
-      <view className='Search'>
-        <view>
+      <view className='Search flex-h'>
+        <view className='flex-item'>
           <text className='iconfont icon-sousuo'></text>
-          <text>请输入关键字搜索</text>
+          <Input confirm-type='search' placeholder='请输入关键字搜索' onConfirm={SearchConfirm} onscrolltolower={PageLoadMore}></Input>
         </view>
+        <text>{CurrentBuildingName}</text>
+        <picker value={0} range-key='name' onChange={PickerChange} range={BuildingIds}>
+          <view class='picker'>更换</view>
+        </picker>
       </view>
 
       <view className='flex-item'>
@@ -55,7 +149,7 @@ export default withLayout(() => {
           <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
             <view className='PageContent'>
 
-              <view className='Filter'>
+              {/* <view className='Filter'>
                 <text>筛选条件</text>
                 <view>
                   {
@@ -70,12 +164,12 @@ export default withLayout(() => {
                     ))
                   }
                 </view>
-              </view>
+              </view> */}
 
               <view className='List'>
                 {
                   PageList.map((item, index) => (
-                    <ResidentListItem Data={item} key={`ResidentListItem-${index}`}></ResidentListItem>
+                    <ResidentListItem data={item} key={`ResidentListItem-${index}`}></ResidentListItem>
                   ))
                 }
               </view>

src/pages/mine/residentManager/index.scss

@@ -3,31 +3,51 @@
   position: relative;
   overflow: hidden;
   >.Search {
-    padding: 0 50px 20px;
+    padding: 0 30px 20px;
     position: relative;
     overflow: hidden;
     margin-top: 20px;
+    align-items: center;
     >view {
       position: relative;
       overflow: hidden;
       background: #f8f8f8;
-      border-radius: 44px;
+      border-radius: 80px;
       text-align: center;
       font-size: 0;
       white-space: nowrap;
       >text {
         display: inline-block;
         vertical-align: middle;
+        font-size: 24px;
+        color: #666;
+        line-height: 80px;
+      }
+      >input {
+        display: inline-block;
+        vertical-align: middle;
+        width: 200px;
         font-size: 20px;
-        color: #999;
-        margin-left: 8px;
-        line-height: 44px;
-        &:first-child {
-          margin-left: 0;
-          font-size: 28px;
-        }
+        margin-left: 10px;
+        height: 80px;
+        text-align: left;
       }
     }
+    >text {
+      font-size: 28px;
+      line-height: 40px;
+      max-width: 160px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      margin-left: 20px;
+      margin-right: 10px;
+    }
+    .picker {
+      font-size: 28px;
+      line-height: 40px;
+      color: #193C83;
+    }
   }
   > .flex-item {
     position: relative;

src/pages/mine/tabData.js

@@ -1,7 +1,7 @@
 const MineMenuList = {
   User: [ // 普通用户
     [
-      { name: '推荐客户', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/addCustomer/index?type=customer' }
+      { name: '推荐客户', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/addCustomer/index?type=customer' },
     ],
     [
       { name: '我的分享', icon: require('../../assets/mine-icon9.png'), router: '/pages/mine/myShare/index' },
@@ -14,6 +14,7 @@ const MineMenuList = {
       { name: '意见反馈', icon: require('../../assets/mine-icon16.png'), router: '/pages/mine/feedBack/index' }
     ],
     [
+      { name: '成为驻场管理', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
       { name: '成为置业顾问', icon: require('../../assets/mine-icon4.png'), router: 'propertyConsultant' },
       { name: '成为专业经纪人', icon: require('../../assets/mine-icon2.png'), router: null }
     ]
@@ -39,6 +40,7 @@ const MineMenuList = {
   Adviser: [ // 置业顾问
     [
       { name: '添加客户', icon: require('../../assets/mine-icon7.png'), router: '/pages/mine/addCustomer/index?type=consultant' },
+      { name: '成为驻场管理', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
       { name: '我的主页', icon: require('../../assets/mine-icon15.png'), router: '/pages/mine/myHomepage/index' },
       { name: '我的推广码', icon: require('../../assets/mine-icon14.png'), router: '' },
       { name: '客户分析', icon: require('../../assets/mine-icon5.png'), router: '/pages/mine/customerAnalyse/index' },
@@ -58,7 +60,7 @@ const MineMenuList = {
   ],
   Resident: [ // 驻场管理
     [
-      // { name: '推荐客户', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/addCustomer/index?type=manager' },
+      { name: '绑定楼盘码', icon: require('../../assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
       { name: '驻场管理', icon: require('../../assets/mine-icon17.png'), router: '/pages/mine/residentManager/index' }
     ],
     [

src/pages/mine/toBeManager/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '成为驻场管理'
+}

src/pages/mine/toBeManager/index.jsx

@@ -0,0 +1,52 @@
+import { useState } from 'react'
+import Taro from '@tarojs/taro'
+import withLayout from '@/layout'
+import { ScrollView, Input } from '@tarojs/components'
+import { fetch } from '@/utils/request'
+import { API_TOBE_MANAGER } from '@/constants/api'
+import './index.scss'
+
+export default withLayout(() => {
+
+  const [Code, setCode] = useState('')
+
+  const ToSubmit = () => {
+    if (Code !== '') {
+      fetch({ url: API_TOBE_MANAGER, method: 'post', payload: { marketingCode: Code } }).then((res) => {
+        Taro.showToast({
+          title: '绑定成功',
+          icon: 'none'
+        })
+      })
+    } else {
+      Taro.showToast({
+        title: '请输入楼盘码',
+        icon: 'none'
+      })
+    }
+  }
+
+  const CodeChange = (e) => {
+    setCode(e.detail.value)
+  }
+
+  return (
+    <view className='Page toBeManager'>
+
+      <ScrollView scroll-y>
+        <view className='PageContent'>
+
+          <view className='Input'>
+            <Input placeholder='请输入楼盘码' onInput={CodeChange}></Input>
+          </view>
+
+          <view className='Btn'>
+            <text onClick={ToSubmit}>提交</text>
+          </view>
+
+        </view>
+      </ScrollView>
+
+    </view>
+  )
+})

src/pages/mine/toBeManager/index.scss

@@ -0,0 +1,44 @@
+.Page.toBeManager {
+  background: #fff;
+  height: 100vh;
+  width: 100%;
+  > scroll-view {
+    width: 100%;
+    height: 100%;
+    .PageContent {
+      position: relative;
+      overflow: hidden;
+      min-height: 100vh;
+      >.Input {
+        padding: 0 30px;
+        position: relative;
+        overflow: hidden;
+        margin-top: 30px;
+        >input {
+          display: block;
+          font-size: 28px;
+          line-height: 80px;
+          height: 80px;
+          text-indent: 20px;
+          border: 2px solid rgba(0, 0, 0, 0.08);
+          border-radius: 8px;
+        }
+      }
+      >.Btn {
+        padding: 40px;
+        position: relative;
+        overflow: hidden;
+        > text {
+          display: block;
+          text-align: center;
+          font-size: 32px;
+          line-height: 92px;
+          background: #193c83;
+          color: #fff;
+          font-weight: bold;
+          border-radius: 92px;
+        }
+      }
+    }
+  }
+}

src/reducers/system.js

@@ -13,6 +13,8 @@ const INITIAL_STATE = {
   recommender: {},
   // 当前推荐置业顾问信息
   consultant: {},
+  // 开屏广告 - 如果当前城市已展示过, 那么会把 cityId 放入数组
+  firstScreen: [],
 };
 
 export default function(state = INITIAL_STATE, action) {
@@ -41,6 +43,19 @@ export default function(state = INITIAL_STATE, action) {
         consultant: action.payload
       };
     }
+    case 'TOGGLE_FIRSTSCREEN': {
+      const { cityId } = action.payload
+      const showed = state.firstScreen.filter(x => x === cityId)[0]
+
+      if (!showed) {
+        return {
+          ...state,
+          firstScreen: state.firstScreen.concat(cityId)
+        };
+      }
+
+      return state;
+    }
 
     default:
       return state;

src/routes.js

@@ -259,6 +259,12 @@ const routes = [
     pkg: 'main',
     type: 'mine',
   },
+  {
+    name: '成为驻场管理',
+    page: 'pages/mine/toBeManager/index',
+    pkg: 'main',
+    type: 'mine',
+  },
   {
     name: '推荐客户',
     page: 'pages/mine/recommendUser/index',

src/utils/login.js

@@ -40,7 +40,7 @@ export default (payload) => {
 
           // 获取人员详细信息
           // eslint-disable-next-line no-unused-vars
-          queryUserInfo(person.personId).then(info => {
+          queryUserInfo().then(info => {
             // const { unReadNum } = info
 
             // 默认红点开始就有

src/utils/request.js

@@ -89,12 +89,27 @@ export function optionBuilder(options) {
   const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
   const consultant = Taro.getStorageSync('consultantId') || ''
   const recommender = Taro.getStorageSync('recommender') || ''
+
+  // 去掉 null 跟 undefined 字段
+  const data = typeof payload === 'Object'
+    ? Object.keys(payload).reduce((acc, key) => {
+        const val = payload[key]
+        if (val === null || val === undefined) {
+          return acc;
+        }
+
+        return {
+          ...acc,
+          [key]: val,
+        }
+      }, {})
+    : payload
   
   return [
     {
       url,
       method,
-      data: payload,
+      data,
       header: {
         'content-type': 'application/json',
         'authorization': `Bearer ${Taro.getStorageSync('token')}`,