静态页面

src/assets/css/iconfont.json

@@ -1,10 +1,17 @@
 {
   "id": "2603904",
-  "name": "新联家",
+  "name": "新联康",
   "font_family": "iconfont",
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "22219715",
+      "name": "电  话",
+      "font_class": "dianhua1",
+      "unicode": "e609",
+      "unicode_decimal": 58889
+    },
     {
       "icon_id": "834251",
       "name": "朋友圈",

src/assets/css/iconfont.svg

@@ -14,6 +14,8 @@
     />
       <missing-glyph />
       
+      <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" />
       
       <glyph glyph-name="weixin" unicode="&#58898;" d="M358.51538428 533.53846114c-15.57692315 0-31.18846113-10.38461572-31.18846113-25.96153799 0-15.64615372 15.57692315-26.03076943 31.18846112-26.03076944s26.03076943 10.38461572 26.03076945 25.99615371c0 16.26923057-10.38461572 26.03076943-26.03076945 26.03076943z m211.36153887-150.85384541c-10.38461572 0-20.14615371-11.04230742-20.14615372-20.76923146 0-11.07692315 10.38461572-20.83846113 20.14615372-20.83846112 15.57692315 0 25.99615371 10.38461572 25.9961537 20.80384628 0 10.38461572-10.38461572 20.80384628-25.9961537 20.80384629z m-66.98076944 98.86153798c15.57692315 0 25.99615371 11.07692315 25.99615371 25.99615371 0 15.61153886-10.38461572 26.03076943-25.9961537 26.03076943-15.57692315 0-31.22307685-10.38461572-31.22307687-26.03076943 0-15.57692315 15.61153886-25.99615371 31.22307687-25.99615371z m180.13846202-98.86153798c-10.38461572 0-20.18076943-11.04230742-20.18076945-20.76923146 0-11.07692315 10.41923057-20.83846113 20.18076945-20.83846112 15.57692315 0 25.99615371 10.38461572 25.9961537 20.80384628 0 10.38461572-10.38461572 20.80384628-25.9961537 20.80384629zM510.68461573 831.40384629C262.94230742 831.40384629 62 630.46153886 62 382.68461573 62 134.94230742000002 262.94230742-66 510.68461573-66c247.77692315 0 448.71923057 200.94230742 448.71923056 448.68461573C959.40384629 630.46153886 758.46153886 831.40384629 510.68461573 831.40384629z m-85.1538463-563.81538516c-26.03076943 0-46.83461572 5.19230742-71.55 11.07692315l-71.55-36.41538428 20.18076943 63.06923057c-51.36923057 36.41538428-82.59230742 83.87307685-82.59230829 140.46923056 0 99.48461572 92.97692315 177.50769258 205.47692314 177.50769258 100.8 0 189.9-62.41153887 207.45-146.31923056a196.51153886 196.51153886 0 0 1-19.48846113 1.31538427c-97.54615371-1.31538427-174.28846113-74.76923057-174.28846201-165.80769169 0-14.98846113 2.59615372-29.28461573 6.50769258-43.61538516a209.73461572 209.73461572 0 0 0-20.18076944-1.28076944z m304.30384629-72.83076855l15.611538-52.02692315-55.9038463 31.22307685c-20.18076943-5.19230742-40.98461573-10.38461572-61.78846113-10.38461571-98.20384629 0-175.56923057 67.60384629-175.56923057 151.51153886-0.69230742 83.21538428 76.70769258 150.85384628 174.25384542 150.8538463 93.01153887 0 174.94615372-68.26153887 174.94615458-151.51153888 0-46.83461572-30.56538427-88.44230742-71.55-119.66538427z"  horiz-adv-x="1024" />

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

@@ -0,0 +1,31 @@
+import { useState } from 'react'
+import { Image } from '@tarojs/components'
+import { getImgURL } from '@/utils/image'
+import './index.scss'
+
+export default function FixedCard () {
+
+  const [Show, setShow] = useState(false)
+
+  const TriggerShow = (bool) => {
+    return () => {
+      setShow(bool)
+    }
+  }
+
+  return (
+    <view className='components FixedCard'>
+      <view className='Icon' onClick={TriggerShow(true)}>
+        <Image mode='aspectFill' src={null}></Image>
+      </view>
+      <view className='Name'>
+        <text>李双舟</text>
+        <text style={{display: Show ? 'block' : 'none'}}>南京云致科技服务有限公司</text>
+      </view>
+      <text style={{display: Show ? 'inline-block' : 'none'}} className='iconfont icon-liaotian Btn'></text>
+      <text style={{display: Show ? 'inline-block' : 'none'}} className='iconfont icon-dianhua1 Btn'></text>
+      <text style={{display: Show ? 'inline-block' : 'none'}} className='iconfont icon-guanbi Btn' onClick={TriggerShow(false)}></text>
+      <text style={{display: Show ? 'none' : 'inline-block'}} className='iconfont icon-jiantouright'></text>
+    </view>
+  )
+}

src/pages/index/buildingDetail/components/FixedCard/index.scss

@@ -0,0 +1,62 @@
+.components.FixedCard {
+  transition: all .2s ease-out;
+  -webkit-transition: all .2s ease-out;
+  position: fixed;
+  right: 0;
+  background: #fff;
+  box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
+  z-index: 200;
+  padding: 20px 30px;
+  bottom: 206px;
+  font-size: 0;
+  white-space: nowrap;
+  border-radius: 94px 0 0 94px;
+  >view {
+    display: inline-block;
+    vertical-align: middle;
+    &.Icon {
+      width: 54px;
+      height: 54px;
+      position: relative;
+      overflow: hidden;
+      border-radius: 100%;
+      background: #eee;
+      >image {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    &.Name {
+      margin-left: 20px;
+      >text {
+        font-size: 28px;
+        font-weight: bold;
+        white-space: nowrap;
+        line-height: 32px;
+        display: block;
+        &:last-child {
+          font-weight: normal;
+          font-size: 20px;
+          line-height: 1;
+          color: #202020;
+        }
+      }
+    }
+  }
+  >text {
+    display: inline-block;
+    vertical-align: middle;
+    font-size: 32px;
+    &.Btn {
+      font-size: 48px;
+      margin-left: 30px;
+      color: #1A3B83;
+      &.icon-liaotian {
+        font-size: 52px;
+      }
+      &.icon-guanbi {
+        color: #333;
+      }
+    }
+  }
+}

src/pages/index/buildingDetail/index.jsx

@@ -20,6 +20,7 @@ import MarketingActivity from './components/MarketingActivity/index'
 import LivingActivity from './components/LivingActivity/index'
 import News from './components/News/index'
 import Pictures from './components/Pictures/index'
+import FixedCard from './components/FixedCard/index'
 
 import './index.scss'
 
@@ -152,6 +153,8 @@ export default withLayout((props) => {
         onClose={() => setShowPoster(false)}
         onSuccess={() => setShowPoster(false)}
       />
+
+      <FixedCard></FixedCard>
     </view>
   )
 })

src/pages/mine/addCustomer/index.jsx

@@ -49,6 +49,9 @@ export default withLayout(() => {
       fetch({ url: API_RECOMENT_CLIENT, method: 'post', payload: params }).then(() => {
         Taro.showToast({title: '添加成功', icon: 'none'})
         Taro.navigateBack({delta: 1})
+        setCanSubmit(false)
+      }).catch(() => {
+        setCanSubmit(false)
       })
     }
   }, [CanSubmit])

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

@@ -15,26 +15,38 @@ export default function FollowCustomer () {
   const [PullTimer, setPullTimer] = useState(null)
 
   const [StatusMenu] = useState([
-    { name: '全部状态', id: 1 },
+    { name: '全部状态', id: 0 },
+    { name: '报备', id: 1 },
     { name: '到访', id: 2 },
-    { name: '签约', id: 3 },
-    { name: '认筹', id: 4 }
+    { name: '认筹', id: 3 },
+    { name: '签约', id: 4 }
   ])
-  const [CurrentStatusId, setCurrentStatusId] = useState(1)
 
   const [TimeMenu] = useState([
     { name: '全部', id: 1 },
-    { name: '7天未成交', id: 2 },
-    { name: '15天未成交', id: 3 }
+    { name: '7天未成交', id: 7 },
+    { name: '15天未成交', id: 15 }
   ])
-  const [CurrentTimeId, setCurrentTimeId] = useState(1)
+  const [FormData, setFormData] = useState({name: '', status: 0, day: 1})
 
   useEffect(() => {
-    fetch({ url: `${API_CUSTOMER_LIST}/follow`, method: 'get', payload: { pageNumber, pageSize: 10 } }).then((res) => {
+    GetPageList()
+  }, [pageNumber])
+
+  useEffect(() => {
+    if(pageNumber === 1) {
+      GetPageList()
+    } else {
+      setPageNumber(1)
+    }
+  }, [FormData])
+
+  const GetPageList = () => {
+    fetch({ url: `${API_CUSTOMER_LIST}/follow`, method: 'get', payload: { pageNumber, pageSize: 10, ...FormData, day: FormData.day === 1 ? '' : FormData.day } }).then((res) => {
       setPageList(res.records || [])
       setHasNextPage(res.current >= res.pages)
     })
-  }, [pageNumber])
+  }
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
@@ -42,13 +54,13 @@ export default function FollowCustomer () {
 
   const CutStatus = (item) => {
     return () => {
-      setCurrentStatusId(item.id === CurrentStatusId ? null : item.id)
+      setFormData({...FormData, status: item.id})
     }
   }
 
   const CutTime = (item) => {
     return () => {
-      setCurrentTimeId(item.id === CurrentTimeId ? null : item.id)
+      setFormData({...FormData, day: item.id})
     }
   }
 
@@ -80,7 +92,7 @@ export default function FollowCustomer () {
                 <view key={`StatusItem-${index}`} onClick={CutStatus(item)}>
                   <text>{item.name}</text>
                   {
-                    CurrentStatusId === item.id &&
+                    FormData.status === item.id &&
                     <Image mode='widthFix' src={require('../../../../assets/findHouse-icon1.png')}></Image>
                   }
                 </view>
@@ -95,8 +107,8 @@ export default function FollowCustomer () {
                 <view key={`TimeItem-${index}`} onClick={CutTime(item)}>
                   <text>{item.name}</text>
                   {
-                    CurrentTimeId === item.id &&
-                    <Image mode='widthFix' src={require('../../../../assets/findHouse-icon1.png')}></Image>
+                    FormData.day === item.id &&
+                    <Image mode='widthFix' src={require('@/assets/findHouse-icon1.png')}></Image>
                   }
                 </view>
               ))

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

@@ -1,27 +1,27 @@
-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 StatCustomerListItem (props) {
   const { data = {}, showStatus = false } = props
   return (
     <view className='components StatCustomerListItem flex-h'>
-      <view className='Icon' onClick={() => { Taro.navigateTo({url: `/pages/mine/customerDetail/index?id=${data.id}`}) }}>
-        <Image mode='scaleToFill' src={null}></Image>
+      <view className='Icon' onClick={() => { Taro.navigateTo({url: `/pages/mine/customerDetail/index?id=${data.customerId}`}) }}>
+        <Image mode='scaleToFill' src={data.avatarurl}></Image>
       </view>
-      <view className='flex-item' onClick={() => { Taro.navigateTo({url: `/pages/mine/customerDetail/index?id=${data.id}`}) }}>
+      <view className='flex-item' onClick={() => { Taro.navigateTo({url: `/pages/mine/customerDetail/index?id=${data.customerId}`}) }}>
         <view>
-          <text>范丞丞</text>
+          <text>{data.name}</text>
           <text className='iconfont icon-yonghu'></text>
         </view>
-        <text>136 1394 9434</text>
+        <text>{data.phone}</text>
       </view>
       <text className='iconfont icon-liaotian'></text>
       <text className='iconfont icon-dianhua active'></text>
       {
         showStatus &&
-        <text className='Status' onClick={() => { Taro.navigateTo({url: `/pages/mine/customerDetail/index?id=${data.id}`}) }}>报备</text>
+        <text className='Status' onClick={() => { Taro.navigateTo({url: `/pages/mine/customerDetail/index?id=${data.customerId}`}) }}>报备</text>
       }
     </view>
   )

src/pages/mine/index.jsx

@@ -3,9 +3,13 @@ import { useSelector } from 'react-redux'
 import withLayout from '@/layout'
 import { ScrollView, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
+import '@/assets/css/iconfont.css'
+import { fetch } from '@/utils/request'
+import { API_PUT_REGISTERCONSULTANT } from '@/constants/api'
+import login from '@/utils/login'
+import { getImgURL } from '@/utils/image'
 import './index.scss'
 import NeedLogin from './components/NeedLogin'
-import '@/assets/css/iconfont.css'
 import MineMenuList from './tabData'
 
 const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon18.jpg'
@@ -48,7 +52,20 @@ export default withLayout(() => {
 
   const MenuClick = (router) => {
     return () => {
-      if (router) {
+      if(router === 'propertyConsultant') {
+        fetch({ url: API_PUT_REGISTERCONSULTANT, method: 'put' }).then(() => {
+          Taro.showToast({
+            title: '匹配成功',
+            icon: 'none'
+          })
+          login({path: '', scene: ''})
+        }).catch(() => {
+          Taro.showToast({
+            title: '匹配失败，请联系相关管理人员',
+            icon: 'none'
+          })
+        })
+      } else if (router) {
         Taro.navigateTo({ url: router })
       }
     }
@@ -74,7 +91,7 @@ export default withLayout(() => {
               {/* 用户信息 */}
               <view className='UserInfo'>
                 <view className='UserIcon'>
-                  <Image mode='aspectFill' className='centerLabel' src={user?.userInfo?.person?.avatarurl || defaultRuleImage } />
+                  <Image mode='aspectFill' className='centerLabel' src={getImgURL(user?.userInfo?.person?.avatarurl) || defaultRuleImage} />
                 </view>
                 <view className='OtherInfo'>
                   <view className='Name'>

src/pages/mine/myHomepage/index.jsx

@@ -6,6 +6,7 @@ import '@/assets/css/iconfont.css'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
 import { API_AGENT_CURRENT, API_ITEMS_DETAIL } from '@/constants/api'
+import { getImgURL } from '@/utils/image'
 import './index.scss'
 import ProjectListItem from '../../../components/ProjectListItem/index'
 
@@ -72,7 +73,7 @@ export default withLayout(() => {
           <view className='Card UserInfo'>
             <view className='flex-h Top'>
               <view className='Icon'>
-                <Image mode='aspectFill' src={UserInfo.avatarurl}></Image>
+                <Image mode='aspectFill' src={getImgURL(UserInfo.avatarurl)}></Image>
               </view>
               <view className='flex-item'>
                 <view className='flex-h'>

src/pages/mine/tabData.js

@@ -12,6 +12,10 @@ const MineMenuList = {
       { name: '房贷计算器', icon: require('../../assets/mine-icon4.png'), router: '/pages/mine/mortgageCalc/index' },
       { name: '购房百科', icon: require('../../assets/mine-icon2.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
       { name: '意见反馈', icon: require('../../assets/mine-icon16.png'), router: '/pages/mine/feedBack/index' }
+    ],
+    [
+      { name: '成为置业顾问', icon: require('../../assets/mine-icon4.png'), router: 'propertyConsultant' },
+      { name: '成为专业经纪人', icon: require('../../assets/mine-icon2.png'), router: null }
     ]
   ],
   Broker: [ // 经纪人