projectdetail

src/components/consultant/index.js

@@ -1,6 +1,7 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import { transferImage } from '@utils/tools'
+import { reportClient } from '@services/report'
 
 export default class Index extends Component {
     state = {
@@ -13,6 +14,34 @@ export default class Index extends Component {
         style: {},
         data: []
     }
+    componentDidMount() {
+        
+    }
+    // 报备客户
+    reportClient() {
+
+        // const router = Taro.getStorageSync('router')
+        // const consultant = this.$router.params.consultant || router.query.consultant || ""
+        // const {
+        //     userInfo: { person: { phone, tel, userId } }
+        // } = this.props
+        // // debugger
+        // if (consultant && consultant != userId) {
+        //     const realPhone = phone || tel
+        //     const payload = {
+        //         realtyConsultant: consultant, //报备人 置业顾问
+        //         phone: realPhone,
+        //         showToast: false
+        //     }
+
+        //     reportClient(payload).then(res => {
+        //         console.log('恭喜您绑定成功')
+        //     }).catch(err => {
+        //         console.error(err)
+        //     })
+        // }
+    }
+    //   悬浮框显示隐藏
     handleClick() {
         setTimeout(() => {
             this.setState({
@@ -27,32 +56,39 @@ export default class Index extends Component {
             })
         }, 260)
     }
+    // 拨打电话
+    handleTelClick(data, e) {
+        e.stopPropagation()
+        Taro.makePhoneCall({
+            phoneNumber: data.phone
+        })
+    }
+    handleChatClick(data, e) {
+        e.stopPropagation()
+        const { personId, name } = this.props
+        Taro.navigateTo({
+            url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name)}&receiverId=${data.id}&receiverName=${encodeURIComponent(data.name)}`
+        })
+    }
     render() {
         const { show } = this.state
-        const { data,style } = this.props
+        const { data, style } = this.props
         return (
             <View >
-                {/* {show && */}
                 <View className={show ? "consultant show" : "consultant hide"} style={style} onClick={this.handleClick}  >
                     <Image src={require('@assets/person/left.png')} className='left-img'></Image>
-                    <Image src={transferImage(data.touxiang)} className='img'></Image>
-                    <View className="text">{data.name}</View>
+                    <Image src={transferImage(data.picture || require('@assets/default-avatar.png'))} className='img'></Image>
+                    <View className="text">{data.name || ''}</View>
                 </View>
-                {/* } */}
-                {/* {!show && */}
                 <View className={show ? "consultant-more hide " : "consultant-more more-show "} style={style} >
                     <Image src={require('@assets/person/cancel.png')} onClick={this.handleClickTwo} className='cancel-img'></Image>
-                    <Image src={transferImage(data.touxiang)}  className='touxiang'></Image>
+                    <Image src={transferImage(data.picture || require('@assets/default-avatar.png'))} className='touxiang'></Image>
                     <View className="text">
-                        <View className="name">{data.name}</View>
-                        <View className="company">{data.company}</View>
+                        <View className="name">{data.name || ''}</View>
+                        <View className="company">{data.company || ''}</View>
                     </View>
-                    <Image src={require('@assets/person/phone.png')} className='phone-img'></Image>
-                    <Image src={require('@assets/person/message.png')} className='message-img'></Image>
-                </View>
-                {/* } */}
-
-                <View>
+                    <Image src={require('@assets/person/phone.png')} onClick={this.handleTelClick.bind(this, data)} className='phone-img'></Image>
+                    <Image src={require('@assets/person/message.png')} onClick={this.handleChatClick.bind(this, data)} className='message-img'></Image>
                 </View>
             </View>
         );

src/pages/news/detail/index.js

@@ -5,11 +5,13 @@ import dayjs from 'dayjs'
 import Poster from './poster'
 import WxParse from '@components/wxParse/wxParse'
 import BackHomeBtn from '@components/BackHomeBtn'
-import Consultant from '@components/consultant'
 import Notice from '@components/Notice'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
 import { getDownloadURL, transferImage } from '@utils/tools'
 import { getQrCodeParams } from '@utils/qrcode'
+import { getCardDetail } from '@services/card'
+import { ROLE_CODE } from '@constants/user'
+import Consultant from '@components/consultant'
 import {
   addNewsUv,
   favorNews,
@@ -34,7 +36,8 @@ export default class NewsDetail extends Component {
     posterShow: 'none',
     posterData: {},
     posterVisible: false,
-    btnData: { name: '哈哈哈哈', touxiang: 'http://pic3.zhimg.com/50/v2-55f854baa56381deff541029d51662d0_hd.jpg', company: '南京橙蕉互动数字科技有限公司' }
+    consultData: {},
+    consultShow: false
   }
 
   componentWillMount() {
@@ -46,6 +49,17 @@ export default class NewsDetail extends Component {
 
       const newsId = this.$router.params.id || router.query.id
 
+      const consultant = this.$router.params.consultant || router.query.consultant
+      if (consultant) {
+        getCardDetail(consultant).then(res => {
+
+          this.setState({
+            consultData: res,
+            consultShow: true
+          })
+        })
+      }
+
       if (!newsId) {
         getQrCodeParams(this.$router.params.scene).then(res => {
           this.setState({ newsId: res.id }, () => {
@@ -109,7 +123,9 @@ export default class NewsDetail extends Component {
   }
   onShareAppMessage = () => {
     const { detail: { shareContents, newsName, newsId, newsImg } } = this.state
-    const { userInfo: { person: { personId } } } = this.props
+    const { userInfo: { person: { personId, personType } } } = this.props
+    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+
     savePoint({
       event: 'share',
       eventType: 'activity',
@@ -124,7 +140,7 @@ export default class NewsDetail extends Component {
 
     return {
       title: shareContents[0].shareContentTitle,
-      path: `/pages/news/detail/index?id=${newsId}&from=news_share&recommender=${personId}`,//分享地址
+      path: `/pages/news/detail/index?id=${newsId}&from=news_share&recommender=${personId}&consultant=${consultant}`,//分享地址
       imageUrl: shareContents[0].shareContentImg
     }
   }
@@ -220,7 +236,8 @@ export default class NewsDetail extends Component {
     })
   }
   render() {
-    const { detail, loaded, isSaved, posterVisible, posterData, posterShow, btnData } = this.state
+    const { detail, loaded, isSaved, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
+    const { userInfo: { person: { personId, nickname, name } } } = this.props
     return (
       <Block>
         {/* 生成海报 */}
@@ -245,11 +262,11 @@ export default class NewsDetail extends Component {
                   <template is='wxParse' data='{{wxParseData:article.nodes}}' />
                 </View>
               </ScrollView>
-
               <Notice></Notice>
-              <BackHomeBtn style="bottom:160px" ></BackHomeBtn>
-              {/* <Consultant data={btnData}></Consultant> */}
-
+              <BackHomeBtn style={consultShow ? "bottom:320rpx" : ''}></BackHomeBtn>
+              {
+                consultShow && <Consultant personId={personId} name={name || nickname} data={consultData}></Consultant>
+              }
               <View className="bot-nav flex">
                 <View className='btn poster-btn' style={{ display: posterShow }} onClick={() => { this.handleTogglePoster(true) }}>
                   {/* <Text className="iconfont icon-xiazai"></Text> */}

src/pages/person/customerAnalysis/index.scss

@@ -182,15 +182,15 @@
     border-radius: 50%;
     position: absolute;
     top:50%;
-    left: 128px;
+    left: 56px;
     margin-top: -88px;
   }
   .user__left__name{
     font-size:32px;
     color: $primary-color;
     position: absolute;
-    top:76px;
-    left:320px;
+    top:66px;
+    left:250px;
     display: flex;
     align-items: center;
     .text{
@@ -202,8 +202,8 @@
     font-size:32px;
     color: #333;
     position: absolute;
-    bottom:76px;
-    left:320px;
+    bottom:62px;
+    left:250px;
     display: flex;
     align-items: center;
   }

src/pages/person/customerAnalysis/myCustomer.js

@@ -13,6 +13,7 @@ import emptyImg from '@assets/empty.png'
 const maleImg = require('@assets/person/male.png')
 const femaleImg = require('@assets/person/female.png')
 const phoneImg = require('@assets/person/phone.png')
+const messageImg = require('@assets/person/message.png')
 
 @connect(({ user, city }) => ({ user, city }))
 export default class myCustomer extends Taro.Component {
@@ -363,6 +364,13 @@ export default class myCustomer extends Taro.Component {
       followVisible: false,
     })
   }
+  handleChatClick(item, e) {
+    e.stopPropagation()
+    const { userInfo: { person: { personId, nickname, name } } } = this.props
+    Taro.navigateTo({
+      url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
+    })
+  }
   renderBaseBox() {
     const { baseInfo, desc, selector, sexSelector } = this.state
     return (
@@ -462,7 +470,10 @@ export default class myCustomer extends Taro.Component {
               customerDetail.sex == '2' && <Image style="width:36rpx;height:36rpx;margin-left:10rpx" src={femaleImg} />
             }
           </View>
-          <View onClick={this.handleTelClick.bind(this, customerDetail)} className='user__left__phone'>{customerDetail.phone}<Image style="width:36rpx;height:36rpx;margin-left:20rpx;" src={phoneImg} /></View>
+          <View className='user__left__phone'>{customerDetail.phone}
+            <Image onClick={this.handleTelClick.bind(this, customerDetail)} style="width:36rpx;height:36rpx;margin-left:20rpx;background:rgba(255,219,179,0.2);padding: 14rpx;border-radius: 30rpx;" src={phoneImg} />
+            <Image onClick={this.handleChatClick.bind(this, item)} style="width:36rpx;height:36rpx;margin-left:40rpx;background:rgba(255,219,179,0.2);padding: 14rpx;border-radius: 30rpx;" src={messageImg} />
+          </View>
         </View>
         <AtTabs height="calc(100vh - 300rpx)" className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >

src/pages/project/detail/index.js

@@ -27,6 +27,8 @@ import { connect } from '@tarojs/redux'
 import { dispatchProjectDetail } from '@actions/project'
 import getUserPhone from '@utils/getUserPhone'
 import { ROLE_CODE } from '@constants/user'
+import { getCardDetail } from '@services/card'
+import Consultant from '@components/consultant'
 const buildBg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/buildbg.png'
 const dotImg = require('@assets/dot.png')
 
@@ -61,6 +63,8 @@ export default class Index extends Component {
     albumCurrent: 0,
     videoPlayShow: 'flex',
     grantPhoneVisible: false, // 授权手机弹框
+    consultData: {}, // 分享的置业顾问信息
+    consultShow: false  // 置业顾问悬浮框显示隐藏
   }
 
   componentWillMount() {
@@ -69,19 +73,31 @@ export default class Index extends Component {
       // const options = wx.getLaunchOptionsSync()
       // console.log('-------options----->', options)
       // if (sceneInShare(options.scene)) {
-        const { person = {} } = this.props.userInfo || {}
-        console.log('-------person----->', person)
-        if ((person.tel || person.phone) && (person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
-          Taro.reLaunch({ url: '/pages/auth/index' })
-          return
-        }
-
-        this.setState({
-          grantPhoneVisible: true,
+      const router = Taro.getStorageSync('router')
+      const consultant = this.$router.params.consultant || router.query.consultant
+      if (consultant) {
+        console.log(consultant, "$$$$$$$$$$$$$$$$$$$$$$$$$$$4444")
+        getCardDetail(consultant).then(res => {
+          console.log(res, "$$$$$$$$$$$$$$$$$$$$$$$$$$$")
+          this.setState({
+            consultData: res,
+            consultShow: true
+          })
         })
+      }
+      const { person = {} } = this.props.userInfo || {}
+      console.log('-------person----->', person)
+      if ((person.tel || person.phone) && (person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
+        Taro.reLaunch({ url: '/pages/auth/index' })
+        return
+      }
+
+      this.setState({
+        grantPhoneVisible: true,
+      })
       // }
 
-      const router = Taro.getStorageSync('router')
+
       const id = this.$router.params.id || router.query.id
 
       // 没有找到 id , 再重新找一次
@@ -291,10 +307,11 @@ export default class Index extends Component {
     }).then(res => {
       console.log('项目详情分享')
     })
-
+    const router = Taro.getStorageSync('router')
+    const consultant = this.$router.params.consultant || router.query.consultant || " "
     return {
       title: shareContents[0].shareContentTitle,//分享内容
-      path: `/pages/project/detail/index?id=${buildingId}&from=building_share&recommender=${personId}`,//分享地址
+      path: `/pages/project/detail/index?id=${buildingId}&from=building_share&recommender=${personId}&consultant=${consultant}`,//分享地址
       imageUrl: shareContents[0].shareContentImg
     }
   }
@@ -1056,17 +1073,16 @@ export default class Index extends Component {
   }
 
   render() {
-    const { posterStatus, posterData, loaded, btnstate, grantPhoneVisible } = this.state
+    const { posterStatus, posterData, loaded, btnstate, grantPhoneVisible, consultData, consultShow } = this.state
     const { projectDetail, userInfo } = this.props
     const { uvList = {} } = projectDetail
     const { total = 0, records = [] } = uvList
     const openDate = projectDetail.openingDate ? dayjs(projectDetail.openingDate).locale('zh-cn').format('YYYY年M月D日') : '暂无'
-
     return (
       <Block>
         {
           (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone) &&
-          <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
+          <AchievePhone user={person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
         }
         {
           loaded && (
@@ -1217,7 +1233,10 @@ export default class Index extends Component {
                 <Text className="iconfont icon-shouyeshouye"></Text>
                 <Text className="text">首页</Text>
               </View> */}
-              <BackHomeBtn></BackHomeBtn>
+              <BackHomeBtn style={consultShow ? "bottom:320rpx" : ''}></BackHomeBtn>
+              {
+                consultShow && <Consultant style="bottom:170rpx" personId={userInfo.person.personId} name={userInfo.person.name || userInfo.person.nickname} data={consultData}></Consultant>
+              }
             </View>
           )
         }