feats

src/components/FixedConsultant/index.jsx

@@ -0,0 +1,61 @@
+import { useState } from 'react'
+import Taro from '@tarojs/taro'
+import { Image } from '@tarojs/components'
+import { getImgURL } from '@/utils/image'
+import './index.scss'
+
+export default function FixedCard (props) {
+  const { consultant } = props
+  const { id: consultantId, name, picture, company, avatar, phone } = consultant || {}
+
+  const [Show, setShow] = useState(false)
+
+  const handleChat = () => {
+    Taro.navigateTo({
+      url: `/pages/chat/chatDetail/index?targetPerson=${consultantId}}`
+    })
+  }
+  
+  const handleCall = () => {
+    if (phone) {
+      Taro.makePhoneCall({ phoneNumber: phone })
+      return
+    }
+
+    Taro.showToast({ title: '暂无联系电话', icon: 'none' })
+  }
+
+  return !!consultantId && (
+    <view className='components FixedCard'>
+      <view className='Icon' onClick={() => setShow(true)}>
+        <Image mode='aspectFill' src={getImgURL(picture||avatar)}></Image>
+      </view>
+      <view className='Name'>
+        <text>{name}</text>
+        <text style={{display: Show ? 'block' : 'none'}}>{company}</text>
+      </view>
+      <text
+        style={{display: Show ? 'inline-block' : 'none'}}
+        className='iconfont icon-liaotian Btn'
+        onClick={handleChat}
+      ></text>
+
+      <text
+        style={{display: Show ? 'inline-block' : 'none'}}
+        className='iconfont icon-dianhua1 Btn'
+        onClick={handleCall}
+      ></text>
+
+      <text
+        style={{display: Show ? 'inline-block' : 'none'}}
+        className='iconfont icon-guanbi Btn'
+        onClick={() => setShow(false)}
+      ></text>
+
+      <text
+        style={{display: Show ? 'none' : 'inline-block'}}
+        className='iconfont icon-jiantouright'
+      ></text>
+    </view>
+  )
+}

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

@@ -15,6 +15,13 @@ export default function BasicInfo (props) {
 
   const goto = (url) => Taro.navigateTo({ url })
 
+  const handleSubscribeMessage = () => {
+    Taro.showToast({
+      title: '暂未开启',
+      icon: 'none',
+    })
+  }
+
   return (
     <view className='components BasicInfo'>
 
@@ -161,7 +168,7 @@ export default function BasicInfo (props) {
       {/* 互动 */}
       <view className='Interact flex-h'>
         <text className='flex-item' onClick={() => goto(`/pages/index/buildingInfo/index?id=${buildingId}`)}>更多楼盘信息</text>
-        <text className='flex-item active'>订阅活动通知</text>
+        <text className='flex-item active' onClick={handleSubscribeMessage}>订阅活动通知</text>
       </view>
 
       {/* 提示 */}

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

@@ -30,7 +30,7 @@ export default function DetailBottom (props) {
 
     if (consultant?.id) {
       Taro.navigateTo({
-        url: `/pages/chat/detail?targetPerson=${consultant.id}}`
+        url: `/pages/chat/chatDetail/index?targetPerson=${consultant.id}}`
       })
     } else {
       Taro.navigateTo({

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

@@ -1,31 +0,0 @@
-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/PropertyConsultant/index.jsx

@@ -1,23 +1,42 @@
-import { useState } from 'react'
+
 import { Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
-export default function PropertyConsultant (props) {
+const TipsList = [
+  {name: '官方保障', icon: 'icon-baozhang'},
+  {name: '免费咨询', icon: 'icon-zixun'},
+  {name: '户型解读', icon: 'icon-jiedu'},
+  {name: '贴心服务', icon: 'icon-tiexin'}
+]
 
-  const { List = [] } = props
-  const [TipsList] = useState([
-    {name: '官方保障', icon: 'icon-baozhang'},
-    {name: '免费咨询', icon: 'icon-zixun'},
-    {name: '户型解读', icon: 'icon-jiedu'},
-    {name: '贴心服务', icon: 'icon-tiexin'}
-  ])
+export default function PropertyConsultant (props) {
+  const { Info } = props
+  const List = Info?.consultants || []
 
   const CallPhone = (phone) => { // 拨打电话
     Taro.makePhoneCall({ phoneNumber: phone })
   }
 
+  const handleMore = () => {
+    Taro.navigateTo({
+      url: `/pages/index/buildingPropertyConsultant/index?buildingId=${Info?.buildingId}`
+    })
+  }
+
+  const handleChat = (item) => {
+    Taro.navigateTo({
+      url: `/pages/chat/chatDetail/index?targetPerson=${item.id}}`
+    })
+  }
+  
+  const gotoDetail = (item) => {
+    Taro.navigateTo({
+      url: `/pages/mine/myHomepage/index?id=${item.id}`
+    })
+  }
+
   return List.length > 0 ? (
     <view className='components PropertyConsultant'>
 
@@ -25,7 +44,7 @@ export default function PropertyConsultant (props) {
         <view className='flex-item'>
           <text>置业顾问</text>
         </view>
-        <text>更多</text>
+        <text onClick={handleMore}>更多</text>
         <text className='iconfont icon-jiantouright'></text>
       </view>
 
@@ -44,15 +63,15 @@ export default function PropertyConsultant (props) {
         {
           List.map((item, index) => (
             <view key={`PersonItem-${index}`} className='flex-h'>
-              <view className='Icon'>
+              <view className='Icon' onClick={() => gotoDetail(item)}>
                 <Image mode='aspectFill' src={item.photo || item.avatar}></Image>
               </view>
-              <view className='flex-item'>
+              <view className='flex-item' onClick={() => gotoDetail(item)}>
                 <text>{item.userName}</text>
                 <text>{item.description || ''}</text>
               </view>
-              <text className='iconfont icon-liaotian Chat'></text>
-              <text className='iconfont icon-dianhua Phone' onClick={CallPhone(item.phone || item.tel)}></text>
+              <text className='iconfont icon-liaotian Chat' onClick={() => handleChat(item)}></text>
+              <text className='iconfont icon-dianhua Phone' onClick={() => CallPhone(item.phone || item.tel)}></text>
             </view>
           ))
         }

src/pages/index/buildingDetail/index.jsx

@@ -20,7 +20,6 @@ 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'
 
@@ -101,7 +100,7 @@ export default withLayout((props) => {
 
                 {/* 置业顾问 */}
                 <view className='PropertyConsultant' style={{minHeight: 0}}>
-                  <PropertyConsultant List={DetailInfo?.consultants}></PropertyConsultant>
+                  <PropertyConsultant Info={DetailInfo}></PropertyConsultant>
                 </view>
 
                 {/* 位置及周边 */}
@@ -153,8 +152,6 @@ export default withLayout((props) => {
         onClose={() => setShowPoster(false)}
         onSuccess={() => setShowPoster(false)}
       />
-
-      <FixedCard></FixedCard>
     </view>
   )
 })

src/pages/index/buildingPropertyConsultant/index.jsx

@@ -1,38 +1,57 @@
 import { useState, useEffect } from 'react'
+import Taro from '@tarojs/taro'
 import withLayout from '@/layout'
 import { ScrollView, Image } from '@tarojs/components'
+import { getCardList } from '@/services/card'
+import { getImgURL } from '@/utils/image'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default withLayout((props) => {
+  const { router } = props
+  const { buildingId } = router.params
 
-  const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
-  const [List, setList] = useState([
-    { name: '乖戾', icon: '', time: '11:49' },
-    { name: '乖戾', icon: '', time: '11:49' },
-    { name: '乖戾', icon: '', time: '11:49' },
-    { name: '乖戾', icon: '', time: '11:49' },
-    { name: '乖戾', icon: '', time: '11:49' },
-    { name: '乖戾', icon: '', time: '11:49' },
-  ])
+  const [List, setList] = useState([])
 
-  const PageRefresh = () => { // 页面下拉刷新回调
-    setPull(true)
+  const handleChat = (item) => {
+    Taro.navigateTo({
+      url: `/pages/chat/chatDetail/index?targetPerson=${item.id}}`
+    })
   }
 
-  useEffect(() => { // 下拉刷新触发
-    if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+  const handleCall = (item) => {
+    if (item.phone) {
+      Taro.makePhoneCall({ phoneNumber: item.phone })
+      return
     }
-  }, [IsPull])
+
+    Taro.showToast({ title: '暂无联系电话', icon: 'none' })
+  }
+
+  const gotoDetail = (item) => {
+    Taro.navigateTo({
+      url: `/pages/mine/myHomepage/index?id=${item.id}`
+    })
+  }
+
+  useEffect(() => {
+    if (!buildingId) {
+      Taro.showToast({
+        title: '没有楼盘信息',
+        icon: 'none',
+      })
+      return
+    }
+
+    getCardList({ pageSize: 500, buildingId }).then((res) => {
+      const { records } = res || []
+      setList(records)
+    })
+  }, [buildingId])
 
   return (
     <view className='Page buildingPropertyConsultant'>
-      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y>
         <text className='TopTips'>有任何买卖房屋的问题，欢迎随时咨询</text>
         <view className='List'>
           {
@@ -42,24 +61,30 @@ export default withLayout((props) => {
                 <view className='flex-h'>
 
                   <view className='Icon'>
-                    <Image mode='scaleToFill' src={item.icon || null}></Image>
+                    <Image mode='scaleToFill' src={getImgURL(item.photo || item.avatar)}></Image>
                   </view>
 
-                  <view className='flex-item'>
+                  <view className='flex-item' onClick={() => gotoDetail(item)}>
                     <view className='Name'>
-                      <text>陆毅</text>
+                      <text>{item.name}</text>
                       <Image mode='heightFix' src={require('@/assets/index-icon17.png')}></Image>
                     </view>
-                    <text>13045678976</text>
+                    <text>{item.phone}</text>
                   </view>
 
-                  <text className='iconfont icon-liaotian'></text>
-                  <text className='iconfont icon-dianhua'></text>
+                  <text
+                    className='iconfont icon-liaotian'
+                    onClick={() => handleChat(item)}
+                  ></text>
+                  <text
+                    className='iconfont icon-dianhua'
+                    onClick={() => handleCall(item)}
+                  ></text>
                   
                 </view>
 
                 <view className='Desc'>
-                  <text>好评经纪人，熟悉楼盘特色</text>
+                  <text>{item.description}</text>
                 </view>
 
               </view>

src/routes.js

@@ -39,7 +39,6 @@ const routes = [
     name: '聊天',
     page: 'pages/chat/chatDetail/index',
     pkg: 'main',
-    isTab: true,
     type: 'other',
   },