lf

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.2.51:8080"',
-    // WSS_HOST: '"ws://192.168.2.51:8080"',
+    // HOST: '"http://127.0.0.1:8080"',
+    // WSS_HOST: '"ws://127.0.0.1:8080"',
     Version: 'V3.5.3'
   },
   weapp: {},

config/prod.js

@@ -9,7 +9,7 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    Version:'V3.5.2.3'
+    Version:'V3.5.2.3_2019-12-16'
   },
   weapp: {},
   h5: {}

src/app.js

@@ -45,7 +45,9 @@ class App extends Component {
       // 'pages/person/customerAnalysis/followUpCustomer/index',
       // 'pages/person/customerAnalysis/transactionCustomer/index',
       'pages/person/customerAnalysis/myCustomer',
-      'pages/person/accessRecord',
+      'pages/project/detail/map',
+      'pages/person/myShare/accessRecord',
+      'pages/person/myShare/index',
       'pages/shop/index',
       'pages/activity/activity',
       'pages/activity/myActivity',

src/components/consultant/index.js

@@ -0,0 +1,96 @@
+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 = {
+        show: true,
+    }
+    static options = {
+        addGlobalClass: true,
+    };
+    static defaultProps = {
+        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({
+                show: false
+            })
+        }, 260)
+    }
+    handleClickTwo() {
+        setTimeout(() => {
+            this.setState({
+                show: true
+            })
+        }, 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, smallStyle } = this.props
+        return (
+            <View >
+                <View className={show ? "consultant show" : "consultant hide"} style={smallStyle} onClick={this.handleClick}  >
+                    <Image src={require('@assets/person/left.png')} className='left-img'></Image>
+                    <Image src={transferImage(data.picture || require('@assets/default-avatar.png'))} className='img'></Image>
+                    <View className="text">{data.name || ''}</View>
+                </View>
+                <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.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>
+                    <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/components/consultant/index.scss

@@ -0,0 +1,93 @@
+@import "@styles/theme.scss";
+.consultant {
+  position: fixed;
+  bottom: 169px;
+  right: 0;
+  height: 84px;
+  background-color: #fff;
+  box-shadow:0px 4px 12px 0px rgba(0,0,0,0.25);
+  border-radius:78px 0px 0px 78px;
+  z-index: 99;
+  display: flex;
+  align-items: center;
+  .left-img{
+      width: 18px;
+      height: 34px;
+      margin: 0 12px;
+  }
+  .img{
+    width: 48px;
+    height: 48px;
+    border-radius: 24px;
+    margin: 3px 0;
+  }
+  .text {
+    color: $primary-color;
+    font-size: 32px;
+    margin: 0 20px 0 10px;
+  }
+
+}
+    .show{
+    opacity: 1;
+    width: auto;
+    transition: 0.3s all ease-in;
+    }
+    .hide{
+    width: 0;
+    opacity: 0;
+    transition: 0.3s all ease-in;
+    }
+    .more-show{
+    width:706px;
+    opacity: 1;
+    transition: 0.3s all ease-in;
+    }
+
+.consultant-more{
+    height:140px;
+    background:rgba(0,0,0,0.5);
+    border-radius:146px 0px 0px 146px;
+    position: fixed;
+    bottom: 12%;
+    right: 0;
+    display: flex;
+    align-items: center;
+    z-index: 99;
+    .cancel-img{
+        width: 36px;
+        height: 36px;
+        margin: 0 16px;
+      }
+    .touxiang{
+        width: 86px;
+        height: 86px;
+        border-radius: 45px;
+        border:1px solid #fff;
+    }
+    .text{
+        margin:  0 10px;
+        .name{
+            font-size: 32px;
+            color: #fff;
+            width: 300px;
+            @include text-ellipsis;
+        }
+        .company{
+            font-size: 26px;
+            color: #fff;
+            margin-top: 12px;
+            width: 380px;
+            @include text-ellipsis;
+        }
+    }
+    .phone-img{
+        width:42px;
+        height:42px;
+    }
+    .message-img{
+        width:42px;
+        height:42px;
+        margin: 0 30px;
+    }
+}

src/constants/api.js

@@ -184,3 +184,6 @@ export const API_ECHERTS_MONTH = resolvePath('customerStatisticMonthly')
 export const API_BUILDING_TYPE = resolvePath('getByBuildingIdSelectBuildingProjectType')
 export const API_CONSULTANT_VISIT_RECORD = resolvePath('visitRecord')
 export const API_MORE_ACTIVITY = resolvePath('visitRecord/activity')
+
+// 消息模板
+export const API_TEMPLATE_TYPE = resolvePath('template/of/')

src/constants/common.js

@@ -0,0 +1,8 @@
+// 通知消息
+export const TPL_NOTICE = "notice";
+
+// 助力消息
+export const TPL_HELP = "help-result";
+
+// 拼团消息
+export const TPL_GROUP = "group-result";

src/pages/activity/detail/assemble.js

@@ -23,6 +23,9 @@ import {
   updatePoint
 } from '@services/common'
 import { connect } from '@tarojs/redux'
+import { getCardDetail } from '@services/card'
+import { ROLE_CODE } from '@constants/user'
+import Consultant from '@components/consultant'
 
 const waitImg = require('@assets/helpgroup/wait.png')
 const memberImg = require('@assets/helpgroup/group/member.png')
@@ -68,6 +71,8 @@ export default class Detail extends Component {
     grantPhoneVisible: false, // 授权电话
     grantAvatarVisible: false, // 授权头像
     pointRecordId: undefined, // 埋点ID
+    consultData: {}, // 分享的置业顾问信息
+    consultShow: false  // 置业顾问悬浮框显示隐藏
   }
 
   componentWillMount() {
@@ -78,6 +83,16 @@ export default class Detail extends Component {
       }
       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() {
@@ -134,15 +149,15 @@ export default class Detail extends Component {
   }
 
 
-   // 调起授权电话
-   toggleGrantPhone = () => {
+  // 调起授权电话
+  toggleGrantPhone = () => {
     const { userInfo: { person: { phone, tel } } } = this.props
     if (!phone && !tel) {
       this.setState({ grantPhoneVisible: true })
       return false
     }
-    console.log('phone:',phone,'tel:',tel,'!!!!!')
-    console.log(this.props,'this.propsphone!!!!!')
+    console.log('phone:', phone, 'tel:', tel, '!!!!!')
+    console.log(this.props, 'this.propsphone!!!!!')
 
     return true
   }
@@ -156,8 +171,8 @@ export default class Detail extends Component {
       return false
     }
 
-    console.log(avatarurl,"avatarurl")
-    console.log(this.props.userInfo,"this.props")
+    console.log(avatarurl, "avatarurl")
+    console.log(this.props.userInfo, "this.props")
     return true
   }
 
@@ -298,12 +313,14 @@ export default class Detail extends Component {
 
   currentPageAndParams() {
     const { id, recordId } = this.state
-    const { userInfo: { person: { personId } } } = this.props
+    const { userInfo: { person: { personId, personType } } } = this.props
+    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
 
     let queryParams = [
       `id=${id}`,
       `from=group_share`,
-      `recommender=${personId}`
+      `recommender=${personId}`,
+      `consultant=${consultant}`,
     ]
     if (recordId) {
       queryParams.push(`recordId=${recordId}`)
@@ -320,13 +337,18 @@ export default class Detail extends Component {
 
 
   onShareAppMessage = () => {
-    const { shares } = this.state
+    const { shares, detail: { groupActivityId } } = this.state
     const currentPage = this.currentPageAndParams().join('?')
+    const { userInfo: { person: { personId, personType, userId } } } = this.props
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
 
     savePoint({
       event: 'share',
       eventType: 'group',
       propertyName: '拼团详情分享',
+      consultantId: consultantId,
+      sharePersonId: personId,
+      targetId: groupActivityId,
       data: '{}'
     })
 
@@ -502,6 +524,8 @@ export default class Detail extends Component {
       qrCode,
       leftTime,
       ltTicker,
+      consultData,
+      consultShow
     } = this.state
 
     const { userInfo } = this.props
@@ -531,6 +555,10 @@ export default class Detail extends Component {
 
     return (
       <Block>
+        <BackHomeBtn style={consultShow ? "bottom:310rpx" : ''}></BackHomeBtn>
+        {
+          consultShow && <Consultant style="bottom:150rpx" smallStyle="bottom:178rpx" personId={userInfo.person.personId} name={userInfo.person.name || userInfo.person.nickname} data={consultData}></Consultant>
+        }
         {/* 生成海报 */}
         {posterVisible && !ltTicker.processing &&
           (
@@ -546,7 +574,6 @@ export default class Detail extends Component {
           grantAvatarVisible &&
           <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
         }
-        <BackHomeBtn></BackHomeBtn>
         {
           loaded && (
             <View className="ass-page">

src/pages/activity/detail/assistance.js

@@ -23,6 +23,9 @@ import {
   updatePoint
 } from '@services/common'
 import { connect } from '@tarojs/redux'
+import { getCardDetail } from '@services/card'
+import { ROLE_CODE } from '@constants/user'
+import Consultant from '@components/consultant'
 
 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'
@@ -67,6 +70,8 @@ export default class Detail extends Component {
     grantAvatarVisible: false, // 授权头像
     handleHelpBtn: true, // 立即助力好友
     pointRecordId: undefined, // 埋点ID
+    consultData: {}, // 分享的置业顾问信息
+    consultShow: false  // 置业顾问悬浮框显示隐藏
   }
 
   componentWillMount() {
@@ -77,6 +82,16 @@ export default class Detail extends Component {
       }
 
       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
+          })
+        })
+      }
     })
   }
 
@@ -300,12 +315,14 @@ export default class Detail extends Component {
 
   currentPageAndParams() {
     const { id, initiateId } = this.state
-    const { userInfo: { person: { personId } } } = this.props
+    const { userInfo: { person: { personId, personType } } } = this.props
+    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
 
     let queryParams = [
       `id=${id}`,
       `from=help_share`,
-      `recommender=${personId}`
+      `recommender=${personId}`,
+      `consultant=${consultant}`,
     ]
     if (initiateId) {
       queryParams.push(`initiateId=${initiateId}`)
@@ -321,13 +338,18 @@ export default class Detail extends Component {
   }
 
   onShareAppMessage = () => {
-    const { shares } = this.state
+    const { shares, id } = this.state
     const currentPage = this.currentPageAndParams().join('?')
+    const { userInfo: { person: { personId, personType, userId } } } = this.props
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
 
     savePoint({
       event: 'share',
       eventType: 'help',
       propertyName: '助力详情分享',
+      consultantId: consultantId,
+      sharePersonId: personId,
+      targetId: id,
       data: '{}'
     })
 
@@ -494,6 +516,8 @@ export default class Detail extends Component {
       qrCode,
       leftTime,
       ltTicker,
+      consultData,
+      consultShow
     } = this.state
 
     const { userInfo } = this.props
@@ -509,15 +533,16 @@ export default class Detail extends Component {
       date: dayjs().format('YYYY.MM.DD'),
       appName: (userInfo.miniApp || {}).name,
     }
-
     const posterConfigs = this.transTPLs2Configs(posterTpls, posterData)
-
-    console.log('------posterData------', posterData)
-    console.log('------posterConfigs------', posterConfigs)
+    // console.log('------posterData------', posterData)
+    // console.log('------posterConfigs------', posterConfigs)
     const isJoin = helpList.filter(x => x.personId === userInfo.person.personId)[0] || isStarter
-
     return (
       <View>
+        <BackHomeBtn style={consultShow ? "bottom:200rpx" : ''}></BackHomeBtn>
+        {
+          consultShow && <Consultant style="bottom:40rpx" smallStyle="bottom:68rpx" personId={userInfo.person.personId} name={userInfo.person.name || userInfo.person.nickname} data={consultData}></Consultant>
+        }
         {/* 生成海报 */}
         {posterVisible && !ltTicker.processing &&
           (
@@ -532,7 +557,6 @@ export default class Detail extends Component {
           grantAvatarVisible &&
           <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
         }
-        <BackHomeBtn></BackHomeBtn>
         {
           loaded && (
             <View className="ass-page">
@@ -545,14 +569,11 @@ export default class Detail extends Component {
                   <Text className="row-text">{actState != ActFinished ? formateLeftTime(leftTime) : '活动已结束'}</Text>
                 </View>
                 {detail.successNum > 0 &&
-
                   <View className="success-num">
                     <View className="triangle"></View>
                     <View className="text">已成功 {detail.successNum}</View>
                   </View>
-
                 }
-
               </View>
               <ScrollView
                 scrollY
@@ -618,7 +639,7 @@ export default class Detail extends Component {
                     isStarter && actState === ActInProcess && helpState === HelpInProcess &&
                     // (<Block>
                     //   <View className="set-btn">生成海报</View>
-                      <View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.askForHelp}>邀请好友助力</Button></FormIdCollector></View>
+                    <View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.askForHelp}>邀请好友助力</Button></FormIdCollector></View>
                     // </Block>)
                   }
                   {

src/pages/activity/detail/index.js

@@ -9,6 +9,9 @@ import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
 import { getDownloadURL, times, 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 {
   addActivityShareNum,
   signupActivity,
@@ -42,14 +45,23 @@ export default class Detail extends Component {
     selector: [],
     selectorChecked: '1',
     canChoose: 'none',
-    inputName: ''
+    inputName: '',
+    consultData: {}, // 分享的置业顾问信息
+    consultShow: false  // 置业顾问悬浮框显示隐藏
   }
 
   componentWillMount() {
     ready.queue(() => {
       const router = Taro.getStorageSync('router')
-      // const id = this.$router.params.id || router.query.id || '2fe920719b8b0db50011441462e647ad'
-
+      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 => {
@@ -114,25 +126,28 @@ export default class Detail extends Component {
   }
   onShareAppMessage = () => {
     const { detail: { shareContents, title, dynamicId, url } } = this.state
-    const { userInfo: { person: { personId } } } = this.props
+    const { userInfo: { person: { personId, personType, userId } } } = this.props
     console.log(dynamicId, "path")
     console.log(personId, "personId")
 
     addActivityShareNum(dynamicId)
 
-
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
     savePoint({
       event: 'share',
       eventType: 'activity',
       propertyName: '活动详情分享',
+      consultantId: consultantId,
+      sharePersonId: personId,
+      targetId: dynamicId,
       data: '{}'
     }).then(res => {
       console.log('活动详情分享')
     })
-
+    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
     return {
       title: shareContents[0].shareContentTitle,
-      path: `/pages/activity/detail/index?id=${dynamicId}&from=dynamic_share&recommender=${personId}`,//分享地址
+      path: `/pages/activity/detail/index?id=${dynamicId}&from=dynamic_share&recommender=${personId}&consultant=${consultant}`,//分享地址
       imageUrl: shareContents[0].shareContentImg
     }
 
@@ -207,12 +222,16 @@ export default class Detail extends Component {
       }
 
       const { userInfo: { person, miniApp } } = this.props
-      const { avatarurl, nickname, personId } = person
+      const { avatarurl, nickname, personId, personType, phone, tel } = person
       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}`,
+        "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 => {
@@ -328,8 +347,8 @@ export default class Detail extends Component {
   }
 
   render() {
-    const { detail, loaded, isSaved, isSign, posterVisible, posterData, posterShow } = this.state
-    const { userInfo: { person: { phone } } } = this.props
+    const { detail, loaded, isSaved, isSign, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
+    const { userInfo: { person: { phone, personId, nickname, name } } } = this.props
     return (
       <Block>
         {/* 生成海报 */}
@@ -379,16 +398,15 @@ export default class Detail extends Component {
                     <template is='wxParse' data='{{wxParseData:article.nodes}}' /> */}
                   </View>
                   <View style="color:#999;font-size:15px;margin:0 auto 90px auto;text-align:center">已经到底了~</View>
-
                 </View>
               </ScrollView>
-
-              <View className="chat-entrance" onClick={this.handleMoreClick}>
+              {/* <View className="chat-entrance" onClick={this.handleMoreClick}>
                 <Text className="iconfont icon-chat"></Text>
-              </View>
-
-              <BackHomeBtn></BackHomeBtn>
-
+              </View> */}
+              <BackHomeBtn style={consultShow ? "bottom:300rpx" : ''}></BackHomeBtn>
+              {
+                consultShow && <Consultant style="bottom:140rpx" personId={personId} name={name || nickname} data={consultData}></Consultant>
+              }
               <View className="bot-nav flex">
                 {
                   posterShow && (

src/pages/news/detail/index.js

@@ -9,6 +9,9 @@ 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,
@@ -33,6 +36,8 @@ export default class NewsDetail extends Component {
     posterShow: 'none',
     posterData: {},
     posterVisible: false,
+    consultData: {}, // 分享的置业顾问信息
+    consultShow: false  // 置业顾问悬浮框显示隐藏
   }
 
   componentWillMount() {
@@ -44,6 +49,15 @@ 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 }, () => {
@@ -106,12 +120,18 @@ export default class NewsDetail extends Component {
     })
   }
   onShareAppMessage = () => {
-    const { detail: { shareContents,newsName, newsId, newsImg } } = this.state
-    const { userInfo: { person: { personId } } } = this.props
+    const { detail: { shareContents, newsName, newsId, newsImg } } = this.state
+    const { userInfo: { person: { personId, personType, userId } } } = this.props
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
+    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+
     savePoint({
       event: 'share',
-      eventType: 'activity',
+      eventType: 'news',
       propertyName: '资讯详情分享',
+      consultantId: consultantId,
+      sharePersonId: personId,
+      targetId:newsId,
       data: '{}'
     }).then(res => {
       console.info('资讯详情分享')
@@ -122,7 +142,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
     }
   }
@@ -170,10 +190,12 @@ export default class NewsDetail extends Component {
         return
       }
       const { userInfo: { person, miniApp } } = this.props
-      const { avatarurl, nickname, personId } = person
+      const { avatarurl, nickname, personId, personType, phone, tel } = person
       const { newsId, detail: { posters, newsName, createDate } } = this.state
+      const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+      const phoneNum = phone || tel
       const payload = {
-        "scene": `id=${newsId}&from=news_share&recommender=${personId}`,
+        "scene": `id=${newsId}&from=news_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}`,
         "page": 'pages/news/detail/index',
       }
       const _avatarurl = getDownloadURL(avatarurl, 'avatar');
@@ -188,6 +210,7 @@ export default class NewsDetail extends Component {
           createDate: createDate,//资讯时间
           poster: posters[0].posterImg,
           miniAppName: miniApp.name,
+
         }
         resolve(data)
       })
@@ -218,7 +241,8 @@ export default class NewsDetail extends Component {
     })
   }
   render() {
-    const { detail, loaded, isSaved, posterVisible, posterData, posterShow } = this.state
+    const { detail, loaded, isSaved, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
+    const { userInfo: { person: { personId, nickname, name } } } = this.props
     return (
       <Block>
         {/* 生成海报 */}
@@ -234,7 +258,6 @@ export default class NewsDetail extends Component {
                     {/* <View><Text className="iconfont icon-fenxiang1"></Text>{detail.shareNum || 0}</View> */}
                     <View className='fenx'><Image src={require('@assets/person/fenxiang.png')} className='fenxiang1-img'></Image>{detail.shareNum || 0}</View>
                   </View>
-
                   <View>{dayjs(detail.createDate).format('YYYY-MM-DD')}</View>
                 </View>
                 {/* <Image mode="widthFix" style={{ width: '100%', marginTop: '20px' }} src={transferImage(detail.newsImg)}></Image> */}
@@ -243,10 +266,11 @@ export default class NewsDetail extends Component {
                   <template is='wxParse' data='{{wxParseData:article.nodes}}' />
                 </View>
               </ScrollView>
-              
               <Notice></Notice>
-              <BackHomeBtn></BackHomeBtn>
-
+              <BackHomeBtn style={consultShow ? "bottom:310rpx" : ''}></BackHomeBtn>
+              {
+                consultShow && <Consultant style="bottom:150rpx" smallStyle="bottom:178rpx" 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/followUpCustomer/index.js

@@ -10,7 +10,8 @@ import { transferImage } from '@utils/tools'
 
 const maleImg = require('@assets/person/male.png')
 const femaleImg = require('@assets/person/female.png')
-const phoneImg = require('@assets/person/phone.png')
+const phoneImg = require('@assets/person/dianhua.png')
+const communicateImg = require('@assets/person/communicate.png')
 
 @connect(({ user, city }) => ({ user, city }))
 export default class transactionCustomer extends Taro.Component {
@@ -247,7 +248,13 @@ export default class transactionCustomer extends Taro.Component {
       </View>
     )
   }
-
+  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)}`
+    })
+  }
   render() {
     const { customerList, screenVisible, isEmpty, hasMore } = this.state
 
@@ -272,18 +279,13 @@ export default class transactionCustomer extends Taro.Component {
             onScrollToLower={fn => this.onScrollToLower(fn)}
           >
             <View className="list">
-              {
-                !customerList.length &&
-                <View></View>
-                // <View style="margin:50px auto;text-align:center;font-size:14px;color:#888">暂无跟进客户~</View>
-              }
               {
                 customerList.length &&
                 customerList.map((item, index) => (
                   <View class="item" key={index + 'customerList'} onClick={this.toMyCustomer.bind(this, item.customerId)}>
                     <Image src={transferImage(item.picture) || require('@assets/default-avatar.png')} className='img'></Image>
                     <View className="name">
-                      {item.name}
+                      <Text class="name-text">{item.name}</Text>
                       {
                         item.sex == '1' && <Image style="width:36rpx;height:38rpx;margin-left:10rpx" src={maleImg} />
                       }
@@ -291,7 +293,9 @@ export default class transactionCustomer extends Taro.Component {
                         item.sex == '2' && <Image src={femaleImg} style="width:36rpx;height:36rpx;margin-left:10rpx" />
                       }
                     </View>
-                    <View className="phone" onClick={this.handleTelClick.bind(this, item)}>{item.phone}<Image style="width:36rpx;height:36rpx;margin-left:20rpx;" src={phoneImg} /></View>
+                    <View className="phone" >{item.phone}</View>
+                    <Image className="phone-icon" onClick={this.handleTelClick.bind(this, item)} src={phoneImg} />
+                    <Image className="goutong-icon" onClick={this.handleChatClick.bind(this, item)} src={communicateImg}></Image>
                     <View className="status">{item.status == 1 ? '报备' : item.status == 2 ? '到访' : item.status == 3 ? '认筹' : '签约'}</View>
                   </View>
                 ))

src/pages/person/customerAnalysis/followUpCustomer/index.scss

@@ -156,6 +156,12 @@
     top:24px;
     left:120px;
   }
+  .name-text{
+    display: inline-block;
+    max-width: 200px;
+    @include text-ellipsis;
+
+  }
   .phone{
     color: #333;
     font-size: 30px;
@@ -165,8 +171,25 @@
     display: flex;
     align-items: center;
   }
+  .goutong-icon{
+    position: absolute;
+    width:76px;
+    height:76px;
+    top: 36px;
+    right:222px;
+  }
+  .phone-icon{
+    position: absolute;
+    width:76px;
+    height:76px;
+    top: 36px;
+    right:100px;
+  }
   .status{
     color:$primary-color;
     font-size: 32px;
+    position: absolute;
+    top: 20px;
+    right: 20px;
   }
 }

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/person/customerAnalysis/transactionCustomer/index.js

@@ -7,7 +7,8 @@ import { transferImage } from '@utils/tools'
 
 const maleImg = require('@assets/person/male.png')
 const femaleImg = require('@assets/person/female.png')
-const phoneImg = require('@assets/person/phone.png')
+const phoneImg = require('@assets/person/dianhua.png')
+const communicateImg = require('@assets/person/communicate.png')
 
 
 @connect(({ user, city }) => ({ user, city }))
@@ -86,7 +87,13 @@ export default class transactionCustomer 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)}`
+    })
+  }
   render() {
     const { customerList, isEmpty, hasMore } = this.state
 
@@ -102,35 +109,29 @@ export default class transactionCustomer extends Taro.Component {
           onScrollToLower={fn => this.onScrollToLower(fn)}
         >
           <View className="list">
-            {
-              !customerList.length &&
-              <View></View>
-              // <View style="margin:50px auto;text-align:center;font-size:14px;color:#888">暂无成交客户~</View>
-            }
             {
               customerList.length &&
               customerList.map((item, index) => (
                 <View class="item" key={index + 'transaction'} onClick={this.toMyCustomer.bind(this, item.customerId)}>
                   <Image src={transferImage(item.picture) || require('@assets/default-avatar.png')} className='img'></Image>
                   <View className="name">
-                    {item.name}
+                    <Text class="name-text">{item.name}</Text>
                     {
-                      item.sex == '1' && <Image style="width:36rpx;height:38rpx;margin-left:10rpx" src={maleImg} />
+                      item.sex == '1' && <Image style="width:36rpx;height:38rpx;margin-left:20rpx" src={maleImg} />
                     }
                     {
-                      item.sex == '2' && <Image style="width:36rpx;height:36rpx;margin-left:10rpx" src={femaleImg} />
+                      item.sex == '2' && <Image style="width:36rpx;height:36rpx;margin-left:20rpx" src={femaleImg} />
                     }
                   </View>
                   <View className="phone">{item.phone} </View>
-                  <Image style="width:36rpx;height:36rpx;margin-right:20rpx" src={phoneImg} onClick={this.handleTelClick.bind(this, item)} />
+                  <Image className="phone-icon" src={phoneImg} onClick={this.handleTelClick.bind(this, item)} />
+                  <Image className="goutong-icon" onClick={this.handleChatClick.bind(this, item)} src={communicateImg} ></Image>
 
                 </View>
               ))
             }
           </View>
         </ListView>
-
-
       </View>
     )
   }

src/pages/person/customerAnalysis/transactionCustomer/index.scss

@@ -20,6 +20,12 @@
     top:24px;
     left:120px;
   }
+  .name-text{
+    display: inline-block;
+    max-width: 200px;
+    @include text-ellipsis;
+
+  }
   .phone{
     color: #333;
     font-size: 30px;
@@ -27,4 +33,19 @@
     bottom:24px;
     left:120px;
   }
+ 
+  .goutong-icon{
+    position: absolute;
+    width:76px;
+    height:76px;
+    top: 36px;
+    right:220px;
+  }
+  .phone-icon{
+    position: absolute;
+    width:76px;
+    height:76px;
+    top: 36px;
+    right:98px;
+  }
 }

src/pages/person/index.scss

@@ -329,138 +329,4 @@
     height: 40px;
   }
 }
-.access-page{
-  padding: 30px;
-  .item{
-    height: 268px;
-    background: rgba(255,255,255,1);
-    box-shadow: 0px 4px 20px 0px rgba(0,0,0,0.09);
-    border-radius: 12px;
-    padding: 30px;
-    position: relative;
-    margin-bottom: 20px;
-    .tag{
-      position: absolute;
-      left: 26px;
-      top: 102px;
-      width:96px;
-      height:32px;
-      line-height: 32px;
-      text-align: center;
-      background:rgba(237,202,115,1);
-      border-radius:2px;
-      font-size: 22px;
-      color: #fff;
-    }
-    .touxiang{
-      width:88px;
-      height:88px;
-      border-radius: 44px;
-    }
-    .info-top{
-      display: flex;
-      position: absolute;
-      top: 46px;
-      left:140px;
-      align-items: center;
-      justify-content: space-between;
-      width: 520px;
-      .name{
-        font-size: 40px;
-        color: #000;
-        font-weight: 500;
-        max-width: 300px;
-        @include text-ellipsis;
-      }
-      .goutong-icon{
-        width:44px;
-        height:44px;
-        background:rgba(255,219,179,0.2);
-        border-radius: 22px;
-        margin: 0 10px;
-      }
-      .goutong{
-        font-size: 38px;
-        color: $primary-color;
-        border-bottom: 4px solid #EDCA73;
-        line-height: 28px;
-      }
 
-    }
-    .right-icon{
-      position: absolute;
-      right: 30px;
-      top: 150px;
-      width:20px;
-      height:20px;
-      border-top: 3px solid #888888;
-      border-right: 3px solid #888888;
-      transform:rotate(45deg);
-    }
-    .activity-name{
-      font-size: 32px;
-      color: #353535;
-      width: 620px;
-      @include text-ellipsis;
-      line-height: 72px;
-    }
-    .activity-time{
-      font-size: 26px;
-      color:rgba(0,0,0,0.33);
-      line-height: 40px;
-      text-align: right;
-    }
-  }
-}
-.pop-box{
-    position: fixed;
-    width: 100vw;
-    height: 100vh;
-    left: 0;
-    top: 0;
-    z-index: 9999;
-    background: rgba(0, 0, 0, 0.22);
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    .content {
-      width: 92vw;
-      height: 600px;
-      position: absolute;
-      left: 4vw;
-      top: 12vh;
-      background-color: #fff;
-      border-radius: 12px;
-      padding: 20px 20px;
-
-      .scroll-con{
-        height: 500px;
-        width: 100%;
-        overflow-y: scroll;
-        .activity-item{
-          padding: 16px 30px;
-          border-bottom: 2px solid rgba(0,0,0,0.08);
-          .name{
-            font-size: 32px;
-            color: #353535;
-            width: 600px;
-            @include text-ellipsis;
-          }
-          .time{
-            font-size: 26px;
-            color:rgba(0,0,0,0.33);
-            text-align: right;
-            margin-top: 20px;
-          }
-        }
-
-      }
-
-    }
-    .close{
-      font-size: 48px;
-      color: rgba(0,0,0,0.3);
-      float: right;
-    }
-}

src/pages/person/menus.js

@@ -17,7 +17,7 @@ const icons = {
   consultant: require('@assets/mine/consultant.png'),
   customerAnalysis: require('@assets/mine/customerAnalysis.png'),
   fenxi: require('@assets/mine/fenxi.png'),
-  accessrecord: require('@assets/mine/accessrecord.png'),
+  share: require('@assets/mine/accessrecord.png'),
 }
 
 const DRIFT = ROLE_CODE['DRIFT']
@@ -60,9 +60,9 @@ const menus = [
       style: '',
     },
     {
-      name: '访客信息',
-      url: '/pages/person/accessRecord',
-      icon: icons.accessrecord,
+      name: '我的分享',
+      url: '/pages/person/myShare/index',
+      icon: icons.share,
       extends: undefined,
       userTypes: [CONSULTANT],
       style: '',

src/pages/person/accessRecord.js → src/pages/person/myShare/accessRecord.js

@@ -2,7 +2,7 @@ import Taro, { Component } from '@tarojs/taro';
 import ListView from '@components/ListView'
 import { connect } from '@tarojs/redux'
 import './index.scss'
-import { getConsulantVisitRecord, getMoreVisitRecord } from '@services/person'
+import { getConsulantVisitRecord } from '@services/person'
 import { savePoint, updatePoint } from '@services/common'
 import dayjs from 'dayjs';
 
@@ -14,13 +14,11 @@ export default class Person extends Component {
   }
 
   state = {
-    popVisible: false,
     recordId: undefined, // 埋点ID
     recordList: [],
     hasMore: true,
     isEmpty: false,
     pageIndex: 1,
-    moreRecord: []
   }
 
   componentWillMount() {
@@ -41,12 +39,6 @@ export default class Person extends Component {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
-
-  handleMaskClose() {
-    this.setState({
-      popVisible: false,
-    })
-  }
   componentDidShow() {
     Taro.showLoading()
     this.loadList(1)
@@ -96,30 +88,6 @@ export default class Person extends Component {
     rest && rest()
     this.refreshing = false
   }
-
-
-  showActivityList(item) {
-    Taro.showLoading()
-    this.setState({
-      popVisible: true,
-    })
-
-    const { userInfo: { person } } = this.props
-    const payload = {
-      userId: person.userId,
-      personId: item.personId,
-    }
-    getMoreVisitRecord(payload).then(res => {
-      Taro.hideLoading()
-      this.setState({
-        moreRecord: res.records || []
-      })
-
-    }).catch(err => {
-      console.log(err, "获取更多访客信息err")
-      Taro.hideLoading()
-    })
-  }
   handleChatClick(item, e) {
     e.stopPropagation()
     const { userInfo: { person: { personId, nickname, name } } } = this.props
@@ -127,32 +95,12 @@ export default class Person extends Component {
       url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.name || item.nickname)}`
     })
   }
-  renderPop() {
-    const { moreRecord } = this.state
-    return (
-      <View className="pop-box">
-        <View className="content">
-          <Icon className="iconfont close icon-buoumaotubiao20" onClick={this.handleMaskClose}></Icon>
-          <View className="scroll-con">
-            {
-              moreRecord.map(item => (
-                <View className="activity-item">
-                  <View className="name">{item.activityName || '　'}</View>
-                  <View className="time">{`${dayjs(item.visitTime).format('YYYY-MM-DD HH:mm:ss')}`}</View>
-                </View>
-              ))
-            }
-          </View>
-        </View>
-      </View>
-    )
-  }
+
   render() {
-    const { popVisible, isEmpty, hasMore, recordList } = this.state
+    const { isEmpty, hasMore, recordList } = this.state
     return (
-      <Block>
-        {popVisible && this.renderPop()}
 
+      <Block>
         <ListView
           className="wrap"
           needInit
@@ -163,7 +111,6 @@ export default class Person extends Component {
           onScrollToLower={fn => this.onScrollToLower(fn)}
         >
           <View className='access-page'>
-
             {
               recordList.map(item => (
                 <View className='item' key={item + 'more'}>
@@ -173,10 +120,6 @@ export default class Person extends Component {
                     <View className="name">{item.userName || item.nickname || '　'}</View>
                     <View style="display: flex;align-items: center;" onClick={this.handleChatClick.bind(this, item)}><Image className="goutong-icon" src={require('@assets/person/zixun.png')}></Image><Text className="goutong">在线沟通</Text></View>
                   </View>
-                  <View className="activity-name" onClick={this.showActivityList.bind(this, item)}>
-                    {item.activityName || '　'}
-                  </View>
-                  <Text className="right-icon"></Text>
                   <View className="activity-time">
                     {`${dayjs(item.visitTime).format('YYYY-MM-DD HH:mm:ss')}`}
                   </View>

src/pages/person/myShare/index.js

@@ -0,0 +1,124 @@
+import Taro, { Component } from '@tarojs/taro';
+import ListView from '@components/ListView'
+import { connect } from '@tarojs/redux'
+import './index.scss'
+// import { getConsulantVisitRecord} from '@services/person'
+import { savePoint, updatePoint } from '@services/common'
+import dayjs from 'dayjs';
+
+@connect(state => state.user)
+
+export default class Person extends Component {
+  config = {
+    navigationBarTitleText: '我的分享'
+  }
+
+  state = {
+    recordId: undefined, // 埋点ID
+    recordList: [],
+    hasMore: true,
+    isEmpty: false,
+    pageIndex: 1,
+  }
+
+  componentWillMount() {
+
+    savePoint({
+      event: 'list',
+      eventType: 'activity',
+      propertyName: '我的分享',
+      data: '{}'
+    }).then(res => {
+      this.setState({
+        recordId: res.recordId
+      })
+      console.log('我的分享')
+    })
+  }
+  componentWillUnmount() {
+    const { recordId } = this.state
+    recordId && updatePoint(recordId)
+  }
+
+  componentDidShow() {
+    // Taro.showLoading()
+    // this.loadList(1)
+  }
+  // loadList(pageNumber) {
+  //   console.log(this.props, "this.props")
+  //   const { userInfo: { person } } = this.props
+
+  //   let payload
+  //   if(person.userId){
+  //     payload = {
+  //       userId: person.userId,
+  //       pageNumber,
+  //       pageSize: 5
+  //     }
+  //   }else{
+  //    payload = {
+  //      userId: Taro.getStorageSync('userId'),
+  //      pageNumber,
+  //      pageSize: 5
+  //    }
+  //   }
+  //   getConsulantVisitRecord(payload).then(res => {
+
+  //     const { records, list, total, current, pages } = res || {}
+  //     const _list = records || list || []
+  //     const newList = current <= 1 ? _list : this.state.recordList.concat(_list)
+  //     this.setState({
+  //       recordList: newList,
+  //       isEmpty: total == 0 || !res,
+  //       hasMore: current < pages,
+  //       pageIndex: current >= pages ? pages : current
+  //     })
+  //     Taro.hideLoading()
+  //   })
+  // }
+  // onScrollToLower = async (fn) => {
+  //   const { pageIndex } = this.state;
+  //   this.loadList(pageIndex + 1)
+  //   fn && fn();
+  // }
+  // onPullDownRefresh = (rest) => {
+  //   // debugger
+  //   if (this.refreshing) return
+  //   this.refreshing = true
+  //   this.loadList(1)
+  //   rest && rest()
+  //   this.refreshing = false
+  // }
+
+  handleItemClick() {
+    Taro.navigateTo({
+      url: `/pages/person/myShare/accessRecord`
+    })
+  }
+
+  render() {
+    const { isEmpty, hasMore, recordList } = this.state
+    return (
+      <ListView
+        className="wrap"
+        needInit
+        isEmpty={isEmpty}
+        emptyText="暂无我的分享~"
+        hasMore={hasMore}
+        onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
+        onScrollToLower={fn => this.onScrollToLower(fn)}
+      >
+        <View className='share-page'>
+          <View className="share-item" onClick={this.handleItemClick}>
+            <Image className="img" src={require('@assets/default-avatar.png')}></Image>
+            <View className="name">鱼嘴润府</View>
+            <View className="price"> 均价35000元/m² </View>
+            <View className="num"> 5人查看了分享 </View>
+            <View className="address"> 南京市锦创广场水西门大街2号 </View>
+          </View>
+        </View>
+      </ListView>
+
+    )
+  }
+}

src/pages/person/myShare/index.scss

@@ -0,0 +1,159 @@
+@import "@styles/theme.scss";
+.share-page{
+  padding: 10px 30px;
+  .share-item{
+    padding: 20px 0;
+    border-bottom: 1px solid rgba(0,0,0,0.08);
+    position: relative;
+    .img{
+      width:220px;
+      height:176px;
+    }
+    .name{
+      position: absolute;
+      left: 240px;
+      top: 50px;
+      color: #333;
+      font-size: 34px;
+      max-width: 190px;
+      @include text-ellipsis;
+    }
+    .price{
+      position: absolute;
+      right: 0px;
+      top: 50px;
+      font-size: 34px;
+      color: #FF2359;
+      max-width: 260px;
+      @include text-ellipsis;
+    }
+    .num{
+      position: absolute;
+      left: 240px;
+      top: 114px;
+      font-size: 28px;
+      color: $primary-color;
+    }
+    .address{
+      font-size: 24px;
+      color: #888;
+      position: absolute;
+      right: 0px;
+      bottom: 20px;
+      max-width: 400px;
+      @include text-ellipsis;
+    }
+  }
+}
+.access-page{
+    padding: 0 30px;
+    .item{
+      padding: 30px 0 12px 0;
+      border-bottom: 1px solid rgba(0,0,0,0.08);
+      position: relative;
+      .tag{
+        position: absolute;
+        left: -2px;
+        top: 102px;
+        width:96px;
+        height:32px;
+        line-height: 32px;
+        text-align: center;
+        background:rgba(237,202,115,1);
+        border-radius:2px;
+        font-size: 22px;
+        color: #fff;
+      }
+      .touxiang{
+        width:88px;
+        height:88px;
+        border-radius: 44px;
+      }
+      .info-top{
+        display: flex;
+        position: absolute;
+        top: 46px;
+        left:112px;
+        align-items: center;
+        .name{
+          font-size: 40px;
+          color: #000;
+          font-weight: 500;
+          max-width: 300px;
+          @include text-ellipsis;
+          margin-right: 24px;
+        }
+        .goutong-icon{
+          width:44px;
+          height:44px;
+          background:rgba(255,219,179,0.2);
+          border-radius: 22px;
+          margin: 0 10px;
+        }
+        .goutong{
+          font-size: 38px;
+          color: $primary-color;
+          border-bottom: 4px solid #EDCA73;
+          line-height: 28px;
+        }
+  
+      }
+      .activity-time{
+        font-size: 26px;
+        color:rgba(0,0,0,0.33);
+        text-align: right;
+      }
+    }
+  }
+//   .pop-box{
+//       position: fixed;
+//       width: 100vw;
+//       height: 100vh;
+//       left: 0;
+//       top: 0;
+//       z-index: 9999;
+//       background: rgba(0, 0, 0, 0.22);
+//       display: flex;
+//       flex-direction: column;
+//       justify-content: center;
+//       align-items: center;
+//       .content {
+//         width: 92vw;
+//         height: 600px;
+//         position: absolute;
+//         left: 4vw;
+//         top: 12vh;
+//         background-color: #fff;
+//         border-radius: 12px;
+//         padding: 20px 20px;
+  
+//         .scroll-con{
+//           height: 500px;
+//           width: 100%;
+//           overflow-y: scroll;
+//           .activity-item{
+//             padding: 16px 30px;
+//             border-bottom: 2px solid rgba(0,0,0,0.08);
+//             .name{
+//               font-size: 32px;
+//               color: #353535;
+//               width: 600px;
+//               @include text-ellipsis;
+//             }
+//             .time{
+//               font-size: 26px;
+//               color:rgba(0,0,0,0.33);
+//               text-align: right;
+//               margin-top: 20px;
+//             }
+//           }
+  
+//         }
+  
+//       }
+//       .close{
+//         font-size: 48px;
+//         color: rgba(0,0,0,0.3);
+//         float: right;
+//       }
+//   }

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

@@ -80,7 +80,7 @@ export default class Pannel extends Component {
     const fixdHeight = this.props.style || 'height: 300rpx'
 
     return (
-      <ScrollView scrollY style={fixdHeight} scrollTop={this.state.currentMarkerPos} onScroll={this.bindScroll}>
+      // <ScrollView scrollY style={fixdHeight} scrollTop={this.state.currentMarkerPos} onScroll={this.bindScroll}>
         <View className="around-pannel">
           {
             this.state.markerList.map((item, index) => {
@@ -114,7 +114,7 @@ export default class Pannel extends Component {
             })
           }
         </View>
-      </ScrollView>
+      // </ScrollView>
     )
   }
 }

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

@@ -7,7 +7,7 @@ export default function Tab(props) {
   const [current, setCurrent] = useState(props.default || 0)
   
   const tabList = props.dataset ? props.dataset : []
-  
+  const className = props.className
   const handleClick = index => () => {
     setCurrent(index)
     if (typeof props.onChange === 'function') {
@@ -16,14 +16,14 @@ export default function Tab(props) {
   }
 
   return (
-    <View className="around-tab">
+    <View className={className}>
       {tabList.map((item, index) => {
         const { key, label, num } = item || {}
         
         return (
           <View
             key={key}
-            className={`around-tab__item ${current === index ? 'active' : ''}`}
+            className={`${className}__item ${current === index ? 'active' : ''}`}
             onClick={handleClick(index)}
           >
             {`${label}(${num})`}

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

@@ -0,0 +1,78 @@
+import Taro, { useState } from '@tarojs/taro'
+import { View, CoverView } from '@tarojs/components'
+import PoiAround from '@components/amap/PoiAround'
+import Tab from './Tab'
+import { POI_TYPES } from '@utils/amap'
+import './around.scss'
+
+export default function Around(props) {
+    const detail = props.building || {}
+
+    const [lat, lng] = (detail.coordinate || '').split(',')
+    const poiDatas = typeof detail.mapJson === 'string' ? JSON.parse(detail.mapJson) : []
+
+    // 展示内容数组
+    const dataList = POI_TYPES.map((poi) => {
+        const jsonData = poiDatas.filter(x => x.key === poi.key)[0] || {}
+        const data = JSON.parse(jsonData.data || '[]')
+        const manualData = (detail[`building${poi.key}`] === '' ? [] : (detail[`building${poi.key}`] || '').split(','))
+
+        return {
+            ...poi,
+            data,
+            manualData,
+            num: data.length + manualData.length,
+        }
+    }).filter(x => x.num)
+
+    // 所有的 markers
+    const markersList = dataList.map((item) => {
+        const mapJson = item.data || '[]'
+        return (mapJson || []).map((it) => {
+            const [longitude, latitude] = (it.location || '').split(',')
+
+            return {
+                id: it.id,
+                latitude,
+                longitude,
+                name: it.name,
+                address: it.address,
+            }
+        })
+    })
+
+    // 部分默认值
+    const [curTab, setCurTab] = useState(0)
+    const [markers, setMarkers] = useState(markersList[curTab])
+    const [curMarker, setCurMarker] = useState()
+
+    // tab 切换
+    const handleTabChange = (index, tabItem) => {
+        setCurTab(index)
+        setMarkers(markersList[index])
+    }
+
+    // marker 点切换
+    const handleMarkerTap = (marker) => {
+        setCurMarker(marker.id)
+    }
+
+    const goto = () => {
+        if (typeof props.onAction === 'function') {
+            props.onAction()
+        }
+    }
+
+    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>
+            </View>
+            <View className="around-body">
+                <Tab dataset={dataList} className="around-project" onChange={handleTabChange} />
+            </View>
+        </View>
+    )
+}

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

@@ -0,0 +1,41 @@
+@import "@styles/mixins.scss";
+@import "@styles/theme.scss";
+
+.around-box {
+  width: 100vw;
+  background-color: #fff;
+    
+  .around-header {
+    width: 100%;
+    height: 500px;
+  }
+  .around-body {
+    padding: 0 30px;
+  
+  }
+}
+
+// .around-project {
+//   display: flex;
+//   flex-wrap:nowrap;
+//   align-items: center;
+//   overflow-x: scroll;
+//   scroll-behavior: smooth;
+//   padding: 24px 0;
+
+//   &__item {
+//     flex: 1 0 auto;
+//     font-size: 32px;
+//     color:#666;
+//     line-height: 44px;
+//     padding: 4px 0;
+//     &.active {
+//         color: #666;
+//         border-bottom: none;
+//     }
+    
+//     & + & {
+//       margin-left: 64px;
+//     }
+//   }
+// }

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

@@ -8,7 +8,7 @@ import './style.scss'
 
 export default function Around(props) {
   const detail = props.building || {}
-  
+
   const [lat, lng] = (detail.coordinate || '').split(',')
   const poiDatas = typeof detail.mapJson === 'string' ? JSON.parse(detail.mapJson) : []
 
@@ -25,7 +25,7 @@ export default function Around(props) {
       num: data.length + manualData.length,
     }
   }).filter(x => x.num)
-  
+
   // 所有的 markers
   const markersList = dataList.map((item) => {
     const mapJson = item.data || '[]'
@@ -46,7 +46,7 @@ export default function Around(props) {
   const [curTab, setCurTab] = useState(0)
   const [markers, setMarkers] = useState(markersList[curTab])
   const [curMarker, setCurMarker] = useState()
-  
+
   // tab 切换
   const handleTabChange = (index, tabItem) => {
     setCurTab(index)
@@ -63,18 +63,31 @@ export default function Around(props) {
       props.onAction()
     }
   }
-  
+
   return (
-    <View className="around-box">
-      <View className="around-header">
-        <PoiAround style="width: 100vw; height: 500rpx;" current={curMarker} markers={markers} longitude={lng} latitude={lat} onMarkerClick={handleMarkerTap}/>
-      </View>
-      <View className="around-body">
-        <Tab dataset={dataList} onChange={handleTabChange} />
-        <Pannel active={curMarker} dataset={dataList[curTab]} onChange={handleMarkerTap}/>
-        <View className="goto-map" onClick={goto}>立即前往</View>
-        <View className="around-hr" />
+    <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} />
       </View>
+      <ScrollView
+        enableBackToTop
+        style=" padding-top: 830rpx; 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>
+            <View className="building-go" onClick={goto}>前往</View>
+          </View>
+          <View className="around-body">
+            <Tab dataset={dataList} className="around-tab" onChange={handleTabChange} />
+            <Pannel active={curMarker} dataset={dataList[curTab]} onChange={handleMarkerTap} />
+            <View className="around-hr" />
+          </View>
+        </View>
+      </ScrollView>
     </View>
   )
 }

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

@@ -9,23 +9,8 @@
     width: 100%;
     height: 500px;
   }
-
   .around-body {
     padding: 0 30px;
-  
-    .goto-map {
-      width: 670px;
-      height: 94px;
-      background-color: #F8F8F8;
-      border-radius: 8px;
-      margin: 0 auto;
-      margin-top: 40px;
-      text-align: center;
-      font-size: 36px;
-      font-weight:400;
-      color:#BB9C79;
-      line-height: 94px;
-    }
   }
 }
 
@@ -104,6 +89,30 @@
     }
   }
 }
+.around-project {
+  display: flex;
+  flex-wrap:nowrap;
+  align-items: center;
+  overflow-x: scroll;
+  scroll-behavior: smooth;
+  padding: 24px 0;
+
+  &__item {
+    flex: 1 0 auto;
+    font-size: 32px;
+    color:#666;
+    line-height: 44px;
+    padding: 4px 0;
+    &.active {
+        color: #666;
+        border-bottom: none;
+    }
+    
+    & + & {
+      margin-left: 64px;
+    }
+  }
+}
 
 .around-cell-title {
   font-size: 32px;
@@ -111,4 +120,28 @@
   color:#666;
   line-height: 44px;
   margin: 42px auto 20px 0;
+}
+
+.building-con{
+  padding: 30px 30px 0px 30px;
+  display: flex;
+  justify-content: space-between;
+  .building-name{
+    font-size: 36px;
+    color: #333;
+  }
+  .building-address{
+    font-size: 28px;
+    color: #666;
+  }
+  .building-go{
+    width:130px;
+    height:72px;
+    line-height: 72px;
+    background:rgba(246,182,29,1);
+    border-radius:40px;
+    font-size: 28px;
+    color:#fff;
+    padding:0 20px;
+  }
 }

src/pages/project/detail/index.js

@@ -4,8 +4,8 @@ import './index.scss'
 import Banner from '../banner'
 import HelpGroupBanner from '../swiper'
 import Poster from './poster'
-import PoiAround from '@components/amap/PoiAround'
-import Around from './Around'
+
+import Around from './Around/around'
 import BackHomeBtn from '@components/BackHomeBtn'
 import AchievePhone from '@components/achievePhone'
 import {
@@ -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 , 再重新找一次
@@ -276,25 +292,29 @@ export default class Index extends Component {
   }
 
   onShareAppMessage = () => {
+    console.log(this.props, "his.props")
     const {
       projectDetail: { shareContents, buildingName, buildingId, poster },
-      userInfo: { person: { personId } }
+      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}`,//分享地址
+      path: `/pages/project/detail/index?id=${buildingId}&from=building_share&recommender=${personId}&consultant=${consultant}`,//分享地址
       imageUrl: shareContents[0].shareContentImg
     }
   }
@@ -315,13 +335,16 @@ export default class Index extends Component {
         resolve(posterData)
         return
       }
+      con
       const {
-        userInfo: { person: { avatarurl, nickname, personId }, miniApp },
+        userInfo: { person: { avatarurl, nickname, personId, personType }, miniApp },
         projectDetail: { posters, buildingId, poster, price, buildingRestaurant, createDate, buildingName, tel, buildingTag, uvList = {} }
       } = this.props
       const { total = 0 } = uvList
+      const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+      const phoneNum = person.phone || person.tel
       const payload = {
-        "scene": `id=${buildingId}&from=building_share&recommender=${personId}`,
+        "scene": `id=${buildingId}&from=building_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}`,
         "page": 'pages/project/detail/index',
       }
       const _avatarurl = getDownloadURL(avatarurl, 'avatar');
@@ -512,6 +535,8 @@ export default class Index extends Component {
     })
   }
 
+
+
   handleAuthPhoneSuccess = () => {
     const { person = {} } = this.props.userInfo || {}
     if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
@@ -685,19 +710,31 @@ export default class Index extends Component {
       </Block>
     )
   }
+  tomapDetail() {
+    const { buildingId } = this.state
+    Taro.navigateTo({
+      url: `/pages/project/detail/map?id=` + buildingId
+    })
+  }
   rendercircum() {
     const building = {
       ...this.props.projectDetail
     }
 
     return (
-      <View style="margin-bottom:-5px">
+      <View style="margin-bottom:-5px" onClick={this.tomapDetail}>
         <View className="section circum">
           <View className="section-head">
             <Text className="section-head__title">位置及周边配套</Text>
+            <View className="section-head__more">
+              更多<Text className="iconfont icon-more"></Text>
+            </View>
           </View>
+          {/* <View className="section-head">
+            <Text className="section-head__title">位置及周边配套</Text>
+          </View> */}
         </View>
-        <Around building={building} onAction={this.openMap.bind(this)}></Around>
+        <Around building={building} ></Around>
       </View>
     )
   }
@@ -1056,17 +1093,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 +1253,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:160rpx" smallStyle="bottom:188rpx" personId={userInfo.person.personId} name={userInfo.person.name || userInfo.person.nickname} data={consultData}></Consultant>
+              }
             </View>
           )
         }

src/pages/project/detail/index.scss

@@ -785,7 +785,7 @@
   position: fixed;
   top: 0;
   width: 100%;
-  height: 500px;
+  height: 600px;
 
   &-img {
     width: 100%;
@@ -1057,29 +1057,7 @@
   }
 }
 
-.around-tab {
-  display: flex;
-  flex-wrap: nowrap;
-  align-items: center;
-  overflow-x: scroll;
-  scroll-behavior: smooth;
-  padding: 24px 0;
 
-  &__item {
-    flex: 1 0 auto;
-    font-size: 32px;
-    color: #666;
-    line-height: 44px;
-    padding: 4px 0;
-    &.active {
-      color: #BB9C79;
-      border-bottom: 1px solid #C8B299;
-    }
-    &+& {
-      margin-left: 64px;
-    }
-  }
-}
 
 .albumimg {
   width: 218px;

src/pages/project/detail/map.js

@@ -0,0 +1,149 @@
+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 'dayjs/locale/zh-cn' // 按需加载
+import ready from '@utils/ready'
+import { getQrCodeParams } from '@utils/qrcode'
+import { connect } from '@tarojs/redux'
+import { dispatchProjectDetail } from '@actions/project'
+
+
+@connect(
+    ({ user, project }) => ({ ...user, ...project }),
+    { dispatchProjectDetail }
+)
+export default class Index extends Component {
+    config = {
+        navigationBarTitleText: '更多周边设施',
+    }
+
+    state = {
+        buildingId: null,
+    }
+
+    componentWillMount() {
+        ready.queue(() => {
+            const router = Taro.getStorageSync('router')
+            const id = this.$router.params.id || router.query.id
+            this.initPageData(id)
+
+        })
+    }
+    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('项目详情')
+            //   })
+        })
+    }
+
+
+
+    loadDetail() {
+        const { buildingId } = this.state
+        const { dispatchProjectDetail } = this.props
+        this.setState({
+            loaded: false,
+        })
+        Taro.showToast({
+            title: '正在加载数据',
+            icon: 'loading'
+        })
+
+        dispatchProjectDetail(buildingId).then(res => {
+            this.setState({
+                loaded: true,
+                // circumOpts: newCircumOpts,
+                isSaved: res.isSave
+            }, () => {
+                if (res.posters && res.posters.length) {
+                    this.setState({
+                        posterShow: 'flex'
+                    })
+                }
+            })
+            Taro.hideToast()
+        })
+    }
+
+
+
+    openMap() {
+        const {
+            buildingName,
+            address,
+            coordinate = ''
+        } = this.props.projectDetail
+
+        const coord = coordinate.split(',')
+        const latitude = parseFloat(coord[0])
+        const longitude = parseFloat(coord[1])
+        Taro.openLocation({
+            latitude,
+            longitude,
+            name: buildingName,
+            address,
+            scale: 18
+        })
+        savePoint({
+            event: 'navigation',
+            eventType: 'building',
+            propertyName: '查看项目地图',
+            data: '{}'
+        }).then(res => {
+            console.log('查看项目地图')
+        })
+    }
+
+    toViewAlbum(index) {
+        const { buildingId } = this.state
+        console.log('1111111', index)
+        this.navigateTo(`/pages/project/album/index?id=${buildingId}&current=${index}`)
+    }
+
+    HandleCircumTabClick(id) {
+        this.setState({
+            curTab: id
+        })
+    }
+
+
+    render() {
+        const building = {
+            ...this.props.projectDetail
+        }
+        return (
+            <Block>
+
+                <Around building={building} onAction={this.openMap.bind(this)}></Around>
+
+            </Block>
+        );
+    }
+}

src/pages/project/h5Page.js

@@ -9,6 +9,8 @@ import { connect } from '@tarojs/redux'
 import { ROLE_CODE } from '@constants/user'
 import { getQrCodeParams } from '@utils/qrcode'
 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
+import { isEmpty } from '@utils/tools'
+
 const bgImg = require('@assets/helpgroup/bg.png')
 
 @connect(state => state.user, { ...actions })
@@ -19,31 +21,40 @@ export default class Index extends Component {
     avatarVisible: false,
     phoneVisible: false,
     webViewVisible: false,
+    // pageHide: true,
     pageInfo: {},
     codeParams: '', // 解析二维码参数
+    h5Id: undefined,
   }
 
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+
+  // componentDidHide() {
+  //   this.setState({ pageHide: true });
+  // }
+
+  // componentDidShow() {
+  //   this.setState({ pageHide: false });
+  // }
+
   // 埋点
   success() {
-    const { userInfo: { person } } = this.props
-
-    const router = Taro.getStorageSync('router')
+    const router = Taro.getStorageSync('router') || { query: {} }
     const firstShare = this.$router.params.firstShare || router.query.firstShare || ""
     const consultant = this.$router.params.consultant || router.query.consultant || ""
     const sharePersonId = this.$router.params.sharePersonId || router.query.sharePersonId || ""
-    const { pageInfo } = this.state
-    const targetId = pageInfo.drainageId || this.$router.params.id || router.query.id || ""
+    const { h5Id } = this.state
+
     savePoint({
       event: 'detail',
       eventType: 'h5',
       propertyName: 'h5活动',
       consultantId: consultant,
       sharePersonId: sharePersonId,
-      targetId: targetId,
+      targetId: h5Id,
       data: '{"firstShare":"' + firstShare + '"}'
     }).then(res => {
       this.setState({
@@ -52,6 +63,7 @@ export default class Index extends Component {
       console.log('访问记录')
     })
   }
+
   // 分享好友
   onShareAppMessage = () => {
     const { pageInfo } = this.state
@@ -74,23 +86,21 @@ export default class Index extends Component {
   //   })
   // }
 
-
   currentPageAndParams() {
     const { userInfo: { person } } = this.props
-    const router = Taro.getStorageSync('router')
+    const { h5Id } = this.state
+    const router = Taro.getStorageSync('router') || { query: {} }
 
     const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
-    const firstShare = this.$router.params.firstShare || person.personId
-    const id = this.$router.params.id || router.query.id || ""
+    const firstShare = this.$router.params.firstShare || router.query.firstShare || person.personId
 
     let queryParams = [
       `sharePersonId=${person.personId}`,
       `consultant=${consultant}`,
       `firstShare=${firstShare}`,
-      `id=${id}`
+      `id=${h5Id}`
     ]
 
-
     const res = [
       'pages/project/h5Page',
       queryParams.join('&'),
@@ -98,45 +108,60 @@ export default class Index extends Component {
 
     return res
   }
+
   componentWillMount() {
     ready.queue(() => {
+
       Taro.showLoading()
       if (this.$router.params.scene) {
 
-        getQrCodeParams(this.$router.params.scene).then((_, codeParams) => {
+        getQrCodeParams(this.$router.params.scene).then((res) => {
           this.setState({
-            codeParams: codeParams || ''
+            codeParams: res['__raw'] || ''
           })
+
+          if (isEmpty(res.id)) {
+            Taro.showModal({
+              title: '提示',
+              content: '活动不存在',
+              success: (res) => {
+                if (res.confirm) {
+                  this.gotoIndex()
+                }
+              },
+            })
+            return;
+          }
+
+          if (!this.state.h5Id) {
+            this.loadH5Profile(res.id)
+          }
           // console.log(codeParams, "解析二维码返回值")
         })
       }
 
-      console.log(this.$router, "this.$router")
-      const router = Taro.getStorageSync('router')
-      console.log(router, "router")
-      const hFiveId = this.$router.params.id || router.query.id || ""
-      console.log(hFiveId, "hFiveId")
-      // h5id 、第一个分享人ID、置业顾问ID、分享人ID
-      getHFiveDetail(hFiveId).then(res => {
-        Taro.hideLoading()
-        if (res.status == 1) {
-          this.setState({
-            pageInfo: res
-          })
-        } else {
-          Taro.showModal({
-            title: '提示',
-            content: '活动已下架',
-            showCancel: false,
-          }).then(() => {
-            Taro.switchTab({
-              url: '/pages/project/index'
-            })
-          })
-        }
-      })
+      const router = Taro.getStorageSync('router') || { query: {} }
+      const hFiveId = this.$router.params.id || router.query.id
+
+      if (!isEmpty(hFiveId)) {
+        this.loadH5Profile(hFiveId)
+      }
+
+      // 没有 H5ID, 也没有分享
+      if (isEmpty(hFiveId) && !this.$router.params.scene) {
+        Taro.showModal({
+          title: '提示',
+          content: '活动不存在',
+          success: (res) => {
+            if (res.confirm) {
+              this.gotoIndex()
+            }
+          },
+        })
+        return;
+      }
+
       const { userInfo: { person: { avatarurl, phone } } } = this.props
-      console.log(this.props, "this.propsthis.propsthis.props")
 
       if (avatarurl && avatarurl.indexOf('wx.qlogo.cn') != -1) {
         console.log(avatarurl, "有头像哦~")
@@ -172,6 +197,34 @@ export default class Index extends Component {
       }
     })
   }
+
+  gotoIndex = () => {
+    Taro.switchTab({
+      url: '/pages/project/index'
+    })    
+  }
+
+  loadH5Profile = (id) => {
+    // h5id 、第一个分享人ID、置业顾问ID、分享人ID
+    getHFiveDetail(id).then(res => {
+      Taro.hideLoading()
+      if (res.status == 1) {
+        this.setState({
+          pageInfo: res,
+          h5Id: id,
+        })
+      } else {
+        Taro.showModal({
+          title: '提示',
+          content: '活动已下架',
+          showCancel: false,
+        }).then(() => {
+          this.gotoIndex()
+        })
+      }
+    })
+  }
+
   // 授权头像成功
   onAvatarSuccess() {
     this.setState({
@@ -222,6 +275,7 @@ export default class Index extends Component {
       }
     })
   }
+
   // 授权手机号
   getPhoneNumber(e) {
     getUserPhone(e, (phoneNumber) => {
@@ -241,15 +295,16 @@ export default class Index extends Component {
       }
     })
   }
+
   // 报备客户
   reportClient() {
 
-    const router = Taro.getStorageSync('router')
+    const router = Taro.getStorageSync('router') || { query: {} }
     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 = {
@@ -267,12 +322,12 @@ export default class Index extends Component {
   }
 
   renderMaskBanner() {
-    const { avatarVisible, phoneVisible, pageInfo } = this.state
+    const { avatarVisible, phoneVisible, pageInfo, h5Id } = this.state
     return (
       <View>
         <Image src={pageInfo.middleImg || bgImg} mode='widthFix' className='bg_img'></Image>
         <View className="middle-page">
-          {avatarVisible &&
+          {avatarVisible && h5Id &&
             <View className="content">
               <View className="title">授权头像，围观活动</View>
               <View className="touxiang"><open-data type="userAvatarUrl"></open-data></View>
@@ -280,7 +335,7 @@ export default class Index extends Component {
               <Button className="btn" open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>好</Button>
             </View>
           }
-          {phoneVisible &&
+          {phoneVisible && h5Id &&
             <Button className="phone-btn" open-type="getPhoneNumber" lang="zh_CN" onGetphonenumber={this.getPhoneNumber}>点击授权查看详情</Button>
           }
         </View>
@@ -288,20 +343,27 @@ export default class Index extends Component {
     )
   }
   render() {
-    const { pageInfo, webViewVisible, codeParams } = this.state
+    const router = Taro.getStorageSync('router') || { query: {} }
+    const { pageInfo, webViewVisible, codeParams, pageHide, h5Id } = this.state
     const { userInfo: { person } } = this.props
     const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
+    const firstShare = this.$router.params.firstShare || router.query.firstShare || person.personId
     const webUrlParams = [
       `personId=${person.personId}`,
-      `h5id=${this.$router.params.id}`,
+      `h5id=${h5Id}`,
       `consultant=${consultant}`,
+      `firstShare=${firstShare}`,
       `codeParams=${encodeURIComponent(codeParams)}`,
     ].join('&')
 
+    const showH5 = !isEmpty(h5Id) && pageInfo.h5Address && pageInfo.h5Address !== 'about' && pageInfo.h5Address !== 'http://about' && pageInfo.h5Address !== 'https://about'
+
+    console.log('----web-h5------>', showH5, `${pageInfo.h5Address}?${webUrlParams}`)
+
     return (
       <Block>
         {this.renderMaskBanner()}
-        {webViewVisible && <WebView src={`${pageInfo.h5Address}?${webUrlParams}`} />}
+        {webViewVisible && showH5 && <WebView src={`${pageInfo.h5Address}?${webUrlParams}`} />}
       </Block>
     )
   }

src/pages/project/index.js

@@ -22,7 +22,44 @@ import Notice from '@components/Notice'
 import Authorize from '@components/authorize'
 
 
-const accountInfo = wx.getAccountInfoSync();
+const { miniProgram: { appId } } = wx.getAccountInfoSync();
+
+// 分享图
+let shareImageOfApp;
+// banner 广告图
+let advImageOfApp;
+
+switch (appId) {
+  case 'wx755faa4b3ec76cd3':
+    // 尾房宝
+    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/cff400dab32e9230f6bf7498b8291d7.jpg';
+    advImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/f58480ff83787b64235b729bca5d805.jpg';
+    break;
+
+  case 'wx1d981b76761246ce':
+    // 橙蕉嘉房
+    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E5%98%89%E6%88%BF.jpg';
+    break;
+
+  case 'wxa431cc21403b51bb':
+    // 橙蕉海房
+    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E6%B5%B7%E6%88%BF.jpg';
+    break;
+
+  case 'wx25c971cd14b0e11d':
+    // 橙蕉越房
+    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E8%B6%8A%E6%88%BF.jpg';
+    break;
+
+  case 'wx593a402c7c27beb9':
+    // 橙蕉金房
+    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/%E6%A9%99%E8%95%89%E9%87%91%E6%88%BF.jpg';
+    break;
+
+  default:
+    shareImageOfApp = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg';
+    break;
+}
 
 @connect(
   state => ({ ...state.project, ...state.city, ...state.user }),
@@ -37,10 +74,8 @@ export default class Index extends Component {
     keywords: '',
     loaded: false,
     maskBanner: '',
-    // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/cff400dab32e9230f6bf7498b8291d7.jpg',
-    shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
-    // shareImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1565358322510-share.jpg',
-    // adImage: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/f58480ff83787b64235b729bca5d805.jpg',
+    shareImg: shareImageOfApp,
+    adImage: advImageOfApp,
     bannerList: [],
     helpGroupList: [],
     newsList: [],

src/services/common.js

@@ -6,7 +6,8 @@ import {
   API_BANNER_LIST,
   API_QUERY_CODE_SCENE,
   API_BURIED_POINT,
-  API_CITY_LIST
+  API_CITY_LIST,
+  API_TEMPLATE_TYPE,
 } from '@constants/api'
 
 /**
@@ -55,4 +56,8 @@ export const updatePoint = (id, payload) => fetch({ url: `${API_BURIED_POINT}/${
 export const queryCityList = () => fetch({ url: API_CITY_LIST })
 
 
-
+/**
+ * 获取消息模板
+ * @param {*} 
+ */
+export const queryMessageTPL = type => fetch({ url: `${API_TEMPLATE_TYPE}/${type}` })

src/utils/qrcode.js

@@ -21,7 +21,10 @@ export function getQrCodeParams(sceneID) {
 
       console.log('解析到二维码场景参数: ', params)
 
-      resolve(params, data.scene)
+      resolve({
+        ...params,
+        '__raw': data.scene,
+      })
     }).catch(err => {
       console.error('解析二维码场景参数失败', err)
       reject('解析二维码场景参数失败')

src/utils/request.js

@@ -1,6 +1,8 @@
 import Taro from '@tarojs/taro'
 import { API_UPLOAD_IMAGE } from '@constants/api'
 import login from '@utils/login'
+import rtLog from './rtLog'
+
 const CODE_SUCCESS = 1000
 const CODE_UNLOGIN = 1001
 const CODE_AUTH_EXPIRED = 1002
@@ -82,7 +84,11 @@ export const fetch = async (options) => {
       throw res.data
     }
   }).catch((err) => {
-    console.error(err, url)
+    rtLog.error('[request]', "==================================")
+    rtLog.error('[request]', err)
+    rtLog.error('[request]', url)
+    rtLog.error('[request]', wx.getLaunchOptionsSync())
+    rtLog.error('[request]', "==================================")
 
     let errMessage = `请求失败: ${err.errMsg}`
     if (err.errMsg) {
@@ -90,13 +96,15 @@ export const fetch = async (options) => {
     }
 
     if (err.message) {
-      errMessage = err.message
+      console.error('请求失败', err.message)
+      errMessage = err.message.indexOf('java') > -1 ? '服务内部错误' : err.message
     }
-    if (showMessage) {
 
+    if (showMessage) {
       Taro.showToast({
         title: errMessage,
-        icon: 'none'
+        icon: 'none',
+        duration: 3000
       })
     }
 

src/utils/rtLog.js

@@ -0,0 +1,50 @@
+
+let logger;
+
+function getLogger() {
+  if (wx.canIUse('getRealtimeLogManager')) {
+    return wx.getRealtimeLogManager()
+  }
+
+  return undefined;
+}
+
+function info(...args) {
+  if (!logger) {
+    logger = getLogger()
+  }
+
+  // 本地打印
+  console.info(...args)
+
+  // 远程提交
+  if (logger) {
+    logger.info(...args)
+  }
+}
+
+function error(...args) {
+  if (!logger) {
+    logger = getLogger()
+  }
+
+  console.error(...args)
+
+  if (logger) {
+    logger.error(...args)
+  }
+}
+
+function warn(...args) {
+  if (!logger) {
+    logger = getLogger()
+  }
+
+  console.warn(...args)
+
+  if (logger) {
+    logger.warn(...args)
+  }
+}
+
+export default { info, error, warn }

src/utils/tools.js

@@ -1,5 +1,31 @@
 import Taro from '@tarojs/taro';
 
+/**
+ * 是否为空
+ * @param {*} o 
+ */
+export function isEmpty(o) {
+  if (typeof o === 'string') {
+    if (!o || o === 'null' || o === 'undefined') {
+      return true
+    }
+  }
+
+  if (typeof o === 'object') {
+    return !Object.keys(o).length
+  }
+
+  if (Array.isArray(o)) {
+    return !o.length
+  }
+
+  if (o === null || o === undefined) {
+    return true
+  }
+
+  return false
+}
+
 /**
  * 是否分享场景(含扫码)
  * @param {*} scene