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

src/components/Adv/index.jsx

@@ -0,0 +1,31 @@
+import { useState, useEffect } from 'react'
+import { Image } from '@tarojs/components'
+import './style.scss'
+
+export default (props) => {
+
+  const { show = false } = props
+
+  const [ShowAdv, setShowAdv] = useState(show)
+
+  const ImgClick = () => {
+
+  }
+
+  const Close = () => {
+    setShowAdv(false)
+  }
+
+  return (
+    <view className='components Adv' style={{display: ShowAdv ? 'block' : 'none'}}>
+      <view className='centerLabel'>
+        <view>
+          <view className='Img' onClick={ImgClick}>
+            <Image mode='scaleToFill' src={null}></Image>
+          </view>
+          <text className='iconfont icon-guanbi' onClick={Close}></text>
+        </view>
+      </view>
+    </view>
+  )
+}

src/components/Adv/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

@@ -124,6 +124,8 @@ 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 ')

src/pages/index/index.jsx

@@ -4,6 +4,7 @@ import Taro from '@tarojs/taro'
 import { ScrollView } from '@tarojs/components'
 import withLayout from '@/layout'
 import ProjectListItem from '@/components/ProjectListItem/index'
+import Adv from '@/components/Adv/index'
 import { fetch } from '@/utils/request'
 import { API_BANNER_LIST, API_INDEX_PROJECTS } from '@/constants/api'
 
@@ -54,6 +55,8 @@ export default withLayout(() => {
   return (
     <view className='Page Index'>
 
+      <Adv show></Adv>
+
       <ScrollView scroll-y>
         <view className='PageContent'>
 

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

@@ -17,13 +17,13 @@ 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>
         <text className='Type'>结佣</text>

src/pages/mine/residentManager/index.jsx

@@ -4,7 +4,7 @@ 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 } from '@/constants/api'
+import { API_MANAGE_CUSTOMER_LIST, API_MY_BUILDINGIDS } from '@/constants/api'
 import './index.scss'
 import ResidentListItem from '../components/ResidentListItem/index'
 
@@ -27,11 +27,14 @@ export default withLayout(() => {
   // }
 
   const user = useSelector(state => state.user)
+  const [BuildingIds, setBuildingIds] = useState([])
   const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
   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(() => {
@@ -42,20 +45,43 @@ export default withLayout(() => {
 
   useEffect(() => {
     if (PersonId) {
-      GetPageList()
+      GetMyBuildingIds()
     }
-  }, [pageNumber, PersonId])
+  }, [PersonId])
 
   useEffect(() => {
-    if(FilterData.keywords) {
-      if(pageNumber === 1) {
+    if (FilterData.keywords) {
+      if (pageNumber === 1) {
         GetPageList()
       } else {
-        setPageNumber(2)
+        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) {
@@ -72,7 +98,7 @@ export default withLayout(() => {
 
   const GetPageList = () => {
     setHasNextPage(false)
-    fetch({ url: API_MANAGE_CUSTOMER_LIST, method: 'get', payload: { pageNumber, pageSize: 10, ...FilterData, buildingId: user.userInfo.person.buildingId } }).then((res) => {
+    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)
@@ -95,6 +121,11 @@ export default withLayout(() => {
     }
   }, [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 })
   }
@@ -102,11 +133,15 @@ export default withLayout(() => {
   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>
           <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'>

src/pages/mine/residentManager/index.scss

@@ -3,10 +3,11 @@
   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;
@@ -32,6 +33,21 @@
         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

@@ -2,7 +2,6 @@ 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/toBeManager/index' }
     ],
     [
       { name: '我的分享', icon: require('../../assets/mine-icon9.png'), router: '/pages/mine/myShare/index' },
@@ -15,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 }
     ]
@@ -60,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.jsx

@@ -4,7 +4,6 @@ import withLayout from '@/layout'
 import { ScrollView, Input } from '@tarojs/components'
 import { fetch } from '@/utils/request'
 import { API_TOBE_MANAGER } from '@/constants/api'
-import login from '@/utils/login'
 import './index.scss'
 
 export default withLayout(() => {
@@ -15,10 +14,9 @@ export default withLayout(() => {
     if (Code !== '') {
       fetch({ url: API_TOBE_MANAGER, method: 'post', payload: { marketingCode: Code } }).then((res) => {
         Taro.showToast({
-          title: '提交成功',
+          title: '绑定成功',
           icon: 'none'
         })
-        login({ path: '', scene: '' })
       })
     } else {
       Taro.showToast({