liaot

config/dev.js

     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
     // HOST: '"http://192.168.2.51:8080"',
-    // WSS_HOST: '"http://192.168.2.51:8080"',
+    // WSS_HOST: '"ws://192.168.2.51:8080"',
     Version: 'V3.5.3'
   },
   weapp: {},

src/components/amap/PoiAround.js

 const centerIcon = require('@assets/dingwei.png')
 const centerProject = 'project-999'
 
-function ObjEqual (a = {}, b = {}) { return JSON.stringify(a) === JSON.stringify(b) }
+function ObjEqual(a = {}, b = {}) { return JSON.stringify(a) === JSON.stringify(b) }
 
 export default class PoiAround extends Component {
   map = null;
 
-  componentDidMount () {
+  componentDidMount() {
     this.map = wx.createMapContext('poi-around', this)
   }
 
-  componentWillReceiveProps (nextProps) {
+  componentWillReceiveProps(nextProps) {
     if (this.map) {
       if (!ObjEqual(nextProps.markers, this.props.markers)) {
         this.map.moveToLocation({
   }
 
   render() {
-    const markers =  (this.props.markers || []).map((marker, index) => {
+    const markers = (this.props.markers || []).map((marker, index) => {
       const icon = icons[index].normal
       const activeIcon = icons[index].active
 
         latitude={this.props.latitude}
         onMarkerTap={this.handleTap}
         style={this.props.style}
+        enable-scroll={this.props.coverShow ? false : true}
+        enable-zoom={this.props.coverShow ? false : true}
       />
     )
   }

src/pages/activity/detail/assemble.js

 import FormIdCollector from '@components/formIdCollector'
 import dayjs from 'dayjs'
 // import WxParse from '@components/wxParse/wxParse'
-// import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
 import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@utils/tools'
 import { getQrCodeParams } from '@utils/qrcode'
 import { ROLE_CODE } from '@constants/user'
 import Consultant from '@components/consultant'
 import * as noticeType from '@constants/common.js'
+import { reportClient } from '@services/report'
 
 const waitImg = require('@assets/helpgroup/wait.png')
 const memberImg = require('@assets/helpgroup/group/member.png')
       }
       this.initPageData()
     })
-    const router = Taro.getStorageSync('router')
-    const consultant = this.$router.params.consultant || router.query.consultant
-    if (consultant) {
-      getCardDetail(consultant).then(res => {
-        this.setState({
-          consultData: res,
-          consultShow: true
-        })
-      })
-    }
   }
 
   componentWillUnmount() {
       }, () => this.startTicker())
 
       // Taro.setNavigationBarTitle({ title: res.taShareActivity.activityName })
-
       // WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
 
       savePoint({
         this.setState({ pointRecordId: res.recordId })
       })
     })
+    const router = Taro.getStorageSync('router')
+    const consultant = this.$router.params.consultant || router.query.consultant
+    if (consultant) {
+      this.reportClientFn()
+      getCardDetail(consultant).then(res => {
+        this.setState({
+          consultData: res,
+          consultShow: true
+        })
+      })
+    }
+  }
+   // 报备客户
+   reportClientFn() {
+
+    const router = Taro.getStorageSync('router') || { query: {} }
+    const consultant = this.$router.params.consultant || router.query.consultant || ""
+    const { userInfo: { person: { phone, tel, userId } } } = this.props
+
+    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)
+      })
+    }
   }
 
   currentPageAndParams() {
     }
   }
 
+
   // 立即参团
   joinGroup = () => {
     const { userInfo: { miniApp: { tpls } } } = this.props

src/pages/activity/detail/assistance.js

 import { getCardDetail } from '@services/card'
 import { ROLE_CODE } from '@constants/user'
 import Consultant from '@components/consultant'
+<<<<<<< HEAD
 import * as noticeType from '@constants/common.js'
+=======
+import { reportClient } from '@services/report'
+>>>>>>> a3f7df9baf06351593fb04059e798f0df825cfc3
 
 const successImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success2.png'
 const failImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/help%20failure.png'
       }
 
       this.initPageData()
-      const router = Taro.getStorageSync('router')
-      const consultant = this.$router.params.consultant || router.query.consultant
-      if (consultant) {
-        getCardDetail(consultant).then(res => {
-          this.setState({
-            consultData: res,
-            consultShow: true
-          })
-        })
-      }
+
     })
   }
 
       }, () => this.startTicker())
 
       // Taro.setNavigationBarTitle({ title: res.helpActivity.title })
-
       // WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
 
       savePoint({
         this.setState({ pointRecordId: res.recordId })
       })
     })
+    const router = Taro.getStorageSync('router')
+    const consultant = this.$router.params.consultant || router.query.consultant
+    if (consultant) {
+      this.reportClientFn()
+      getCardDetail(consultant).then(res => {
+        this.setState({
+          consultData: res,
+          consultShow: true
+        })
+      })
+    }
+  }
+  // 报备客户
+  reportClientFn() {
+
+    const router = Taro.getStorageSync('router') || { query: {} }
+    const consultant = this.$router.params.consultant || router.query.consultant || ""
+    const { userInfo: { person: { phone, tel, userId } } } = this.props
+
+    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)
+      })
+    }
   }
 
   currentPageAndParams() {

src/pages/activity/detail/index.js

   updatePoint
 } from '@services/common'
 import { connect } from '@tarojs/redux'
+import { reportClient } from '@services/report'
 
 @connect(state => state.user)
 export default class Detail extends Component {
   componentWillMount() {
     ready.queue(() => {
       const router = Taro.getStorageSync('router')
-      const consultant = this.$router.params.consultant || router.query.consultant
-      if (consultant) {
-        getCardDetail(consultant).then(res => {
-          this.setState({
-            consultData: res,
-            consultShow: true
-          })
-        })
-      }
       const id = this.$router.params.id || router.query.id
       if (!id) {
         getQrCodeParams(this.$router.params.scene).then(res => {
         console.log('活动详情')
       })
     })
+    const router = Taro.getStorageSync('router')
+    const consultant = this.$router.params.consultant || router.query.consultant
+    if (consultant) {
+      this.reportClientFn()
+      getCardDetail(consultant).then(res => {
+        this.setState({
+          consultData: res,
+          consultShow: true
+        })
+      })
+    }
+  }
+  // 报备客户
+  reportClientFn() {
+
+    const router = Taro.getStorageSync('router') || { query: {} }
+    const consultant = this.$router.params.consultant || router.query.consultant || ""
+    const { userInfo: { person: { phone, tel, userId } } } = this.props
+
+    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)
+      })
+    }
   }
   onShareAppMessage = () => {
     const { detail: { shareContents, title, dynamicId, url } } = this.state
       const { detail: { dynamicId, posters, createDate } } = this.state
       const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
       const phoneNum = phone || tel
-      
+
       const payload = {
         "scene": `id=${dynamicId}&from=dynamic_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}`,
         "page": 'pages/activity/detail/index',
       }
-   
+
       // debugger
       const _avatarurl = getDownloadURL(avatarurl, 'avatar');
       getMiniQrcode(payload).then(qrcode => {

src/pages/card/index.js

       return
     }
     const buildingId = projects[0]
-
     const realPhone = phoneNumber || phone || tel
 
     // TODO:

src/pages/news/detail/index.js

 import { getCardDetail } from '@services/card'
 import { ROLE_CODE } from '@constants/user'
 import Consultant from '@components/consultant'
+import { reportClient } from '@services/report'
 import {
   addNewsUv,
   favorNews,
 
       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 }, () => {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+  // 报备客户
+  reportClientFn() {
+
+    const router = Taro.getStorageSync('router') || { query: {} }
+    const consultant = this.$router.params.consultant || router.query.consultant || ""
+    const { userInfo: { person: { phone, tel, userId } }} = this.props
+
+    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)
+      })
+    }
+  }
 
   handleFavor() {
     const { newsId, isSaved } = this.state
       propertyName: '资讯详情分享',
       consultantId: consultantId,
       sharePersonId: personId,
-      targetId:newsId,
+      targetId: newsId,
       data: '{}'
     }).then(res => {
       console.info('资讯详情分享')
         console.info('资讯详情')
       })
     })
+    const router = Taro.getStorageSync('router')
+    const consultant = this.$router.params.consultant || router.query.consultant
+    if (consultant) {
+      this.reportClientFn()
+      getCardDetail(consultant).then(res => {
+        this.setState({
+          consultData: res,
+          consultShow: true
+        })
+      })
+    }
   }
   getPosterData = () => {
     return new Promise(resolve => {

src/pages/project/detail/Around/Pannel.js

     const { manualData = [] } = this.props.dataset || {}
     const activeKey = this.props.active
 
-    const fixdHeight = this.props.style || 'height: 300rpx'
-
     return (
       // <ScrollView scrollY style={fixdHeight} scrollTop={this.state.currentMarkerPos} onScroll={this.bindScroll}>
         <View className="around-pannel">

src/pages/project/detail/Around/around.js

     return (
         <View className="around-box">
             <View className="around-header">
-                <CoverView style="width: 100%; height: 100%;">
-                    <PoiAround style="width: 100vw; height: 500rpx;" current={curMarker} markers={markers} longitude={lng} latitude={lat} onMarkerClick={handleMarkerTap} />
-                </CoverView>
+                <PoiAround style="width: 100vw; height: 500rpx;" current={curMarker} coverShow={true} markers={markers} longitude={lng} latitude={lat} onMarkerClick={handleMarkerTap} />
             </View>
             <View className="around-body">
                 <Tab dataset={dataList} className="around-project" onChange={handleTabChange} />

src/pages/project/detail/Around/index.js

   return (
     <View >
       <View style="  position: fixed;top: 0; width: 100%; height: 840rpx;">
-        <PoiAround style="width: 100vw; height: 840rpx;" current={curMarker} markers={markers} longitude={lng} latitude={lat} onMarkerClick={handleMarkerTap} />
+        <PoiAround style="width: 100vw; height: 840rpx;" coverShow={false} current={curMarker} markers={markers} longitude={lng} latitude={lat} onMarkerClick={handleMarkerTap} />
       </View>
       <ScrollView
         enableBackToTop
-        style=" padding-top: 830rpx; background: transparent;"
+        style=" padding-top: 800rpx; background: transparent;"
         scrollY>
         <View className="around-box" style="border-radius: 40rpx 40rpx 0 0;">
           <View className="building-con">
             <View>
               <View className="building-name">{detail.buildingName}</View>
-              <View className="building-address">{detail.address}</View>
+              <View className="building-address"><Image className="location" src={require('@assets/location.png')}></Image>{detail.address}</View>
             </View>
-            <View className="building-go" onClick={goto}>前往</View>
+            <View className="building-go" onClick={goto}>前往<Image className="goto" src={require('@assets/goto.png')}></Image></View>
           </View>
           <View className="around-body">
             <Tab dataset={dataList} className="around-tab" onChange={handleTabChange} />

src/pages/project/detail/Around/style.scss

     font-size: 36px;
     color: #333;
   }
+  .location{
+    width: 25px;
+    height: 30px;
+    margin-right: 10px;
+  }
   .building-address{
     font-size: 28px;
     color: #666;
+    margin-top: 8px;
+    width: 520px;
   }
   .building-go{
-    width:130px;
     height:72px;
     line-height: 72px;
     background:rgba(246,182,29,1);
     font-size: 28px;
     color:#fff;
     padding:0 20px;
+    display: flex;
+    align-items: center;
+    .goto{
+      width:44px;
+      height:44px;
+      margin-left: 20px;
+    }
   }
 }

src/pages/project/detail/index.js

 import Banner from '../banner'
 import HelpGroupBanner from '../swiper'
 import Poster from './poster'
-
+import { reportClient } from '@services/report'
 import Around from './Around/around'
 import BackHomeBtn from '@components/BackHomeBtn'
 import AchievePhone from '@components/achievePhone'
       // console.log('-------options----->', options)
       // if (sceneInShare(options.scene)) {
       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 id = this.$router.params.id || router.query.id
 
       // 没有找到 id , 再重新找一次
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+  // 报备客户
+  reportClientFn() {
+
+    const router = Taro.getStorageSync('router') || { query: {} }
+    const consultant = this.$router.params.consultant || router.query.consultant || ""
+    const {
+      userInfo: { person: { phone, tel, userId } }
+    } = this.props
+
+    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)
+      })
+    }
+  }
+  onShareAppMessage = () => {
+    const {
+      projectDetail: { shareContents, buildingName, buildingId, poster },
+      userInfo: { person: { personId, personType, userId } }
+    } = this.props
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
+    // 分享埋点
+    addItemShareNum(buildingId)
+    savePoint({
+      event: 'share',
+      eventType: 'building',
+      propertyName: '项目详情分享',
+      consultantId: consultantId,
+      sharePersonId: personId,
+      targetId: buildingId,
+      data: '{}'
+    }).then(res => {
+      console.log('项目详情分享')
+    })
+    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+    return {
+      title: shareContents[0].shareContentTitle,//分享内容
+      path: `/pages/project/detail/index?id=${buildingId}&from=building_share&recommender=${personId}&consultant=${consultant}`,//分享地址
+      imageUrl: shareContents[0].shareContentImg
+    }
+  }
 
   initPageData(id) {
     console.log('----项目ID---->', id)
         console.log('项目详情')
       })
     })
+    const router = Taro.getStorageSync('router')
+    const consultant = this.$router.params.consultant || router.query.consultant
+    if (consultant) {
+      this.reportClientFn()
+      getCardDetail(consultant).then(res => {
+        this.setState({
+          consultData: res,
+          consultShow: true
+        })
+      })
+    }
   }
 
   loadHelpGroupList() {
     this.navigateTo('/pages/card/fans/index?type=item&id=' + buildingId)
   }
 
-  onShareAppMessage = () => {
-    console.log(this.props, "his.props")
-    const {
-      projectDetail: { shareContents, buildingName, buildingId, poster },
-      userInfo: { person: { personId, personType, userId } }
-    } = this.props
-    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
-    // 分享埋点
-    addItemShareNum(buildingId)
-    savePoint({
-      event: 'share',
-      eventType: 'building',
-      propertyName: '项目详情分享',
-      consultantId: consultantId,
-      sharePersonId: personId,
-      targetId: buildingId,
-      data: '{}'
-    }).then(res => {
-      console.log('项目详情分享')
-    })
-    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
-    return {
-      title: shareContents[0].shareContentTitle,//分享内容
-      path: `/pages/project/detail/index?id=${buildingId}&from=building_share&recommender=${personId}&consultant=${consultant}`,//分享地址
-      imageUrl: shareContents[0].shareContentImg
-    }
-  }
 
   getPhoneNumber(e, item) {
     getUserPhone(e, (phoneNumber) => {
   }
 
   toRecomonedPage() {
-    const {
-      userInfo: { person: { personType } }
-    } = this.props
-    if (personType === ROLE_CODE['DRIFT']) {
-      // 游客或者客户 区别是否有电话|| personType === ROLE_CODE['CUSTOMER']
-      Taro.navigateTo({
-        url: `/pages/agent/become/index`
-      })
-    } else {
-      Taro.navigateTo({
-        url: `/pages/agent/recommend/index?type=projectDeatil`
-      })
-    }
+    // const {
+    //   userInfo: { person: { personType } }
+    // } = this.props
+    // if (personType === ROLE_CODE['DRIFT']) {
+    //   // 游客或者客户 区别是否有电话|| personType === ROLE_CODE['CUSTOMER']
+    //   Taro.navigateTo({
+    //     url: `/pages/agent/become/index`
+    //   })
+    // } else {
+    Taro.navigateTo({
+      url: `/pages/agent/recommend/index?type=projectDeatil`
+    })
+    // }
   }
 
   toHome() {
 
     const listimg = list.filter(item => item.buildingImgList.length > 0)
 
-
     return (
-
-
-      <Block> {console.log(list, 'list')}
+      <Block>
         {listimg.length > 0 &&
           (
             <View className='photos__type'>
                       const buildingImgList = item.buildingImgList
                       const buildingImgUrl = buildingImgList.length > 0 ? buildingImgList[0].url : null
 
-                      console.log(buildingImgUrl, 'buildingImgUrl')
+                      // console.log(buildingImgUrl, 'buildingImgUrl')
 
                       // if (buildingImgUrl != null) {
                       return (<View key={index + "listimg"}>
       </Block>
     )
   }
-  tomapDetail() {
+  tomapDetail(e) {
     const { buildingId } = this.state
     Taro.navigateTo({
       url: `/pages/project/detail/map?id=` + buildingId
     }
 
     return (
-      <View style="margin-bottom:-5px" onClick={this.tomapDetail}>
+      <View onClick={this.tomapDetail}>
         <View className="section circum">
           <View className="section-head">
             <Text className="section-head__title">位置及周边配套</Text>
         {
           activityList.length > 0 && (
             <View className="activity" >
-
               <View className="section-head">
                 <Text className="section-head__title" style={{ margin: '10rpx 0 40rpx 35rpx' }}>热门活动</Text>
                 <View className="section-head__more" style={{ marginRight: '20rpx' }} onClick={this.handleActivityMoreClick}>
   }
 
   changeCurrent(current) {
-    console.log(current, 'current')
+    // console.log(current, 'current')
     this.setState({
       current: current + 1
     })

src/pages/project/detail/index.scss

   position: fixed;
   top: 0;
   width: 100%;
-  height: 600px;
+  height: 500px;
 
   &-img {
     width: 100%;

src/pages/project/detail/map.js

 import Taro, { Component } from '@tarojs/taro';
-import { View } from '@tarojs/components'
 import './index.scss'
 import Around from './Around/index'
-import AchievePhone from '@components/achievePhone'
-import { savePoint, updatePoint } from '@services/common'
-import dayjs from 'dayjs'
+import { savePoint } from '@services/common'
 import 'dayjs/locale/zh-cn' // 按需加载
 import ready from '@utils/ready'
-import { getQrCodeParams } from '@utils/qrcode'
 import { connect } from '@tarojs/redux'
 import { dispatchProjectDetail } from '@actions/project'
 
 
         })
     }
-    componentWillUnmount() {
-        const { recordId } = this.state
-        recordId && updatePoint(recordId)
-    }
-
     initPageData(id) {
 
-        // const id='82b54f4a1f5b981df572253792afbfa1' 
         this.setState({
             buildingId: id
         }, () => {
             this.loadDetail()
-
-            // 埋点
-            //   savePoint({
-            //     event: 'detail',
-            //     eventType: 'building',
-            //     propertyName: '项目详情',
-            //     targetId: id,
-            //     buildingId: id,
-            //     data: '{}'
-            //   }).then(res => {
-            //     this.setState({
-            //       recordId: res.recordId
-            //     })
-            //     console.log('项目详情')
-            //   })
         })
     }