savepoint

src/components/consultant/index.js

@@ -15,7 +15,7 @@ export default class Index extends Component {
         data: []
     }
     componentDidMount() {
-        
+
     }
     // 报备客户
     reportClient() {
@@ -72,10 +72,10 @@ export default class Index extends Component {
     }
     render() {
         const { show } = this.state
-        const { data, style } = this.props
+        const { data, style, smallStyle } = this.props
         return (
             <View >
-                <View className={show ? "consultant show" : "consultant hide"} style={style} onClick={this.handleClick}  >
+                <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>

src/components/consultant/index.scss

@@ -10,8 +10,6 @@
   z-index: 99;
   display: flex;
   align-items: center;
- 
-  transition: all 1s;
   .left-img{
       width: 18px;
       height: 34px;
@@ -55,7 +53,7 @@
     right: 0;
     display: flex;
     align-items: center;
-   
+    z-index: 99;
     .cancel-img{
         width: 36px;
         height: 36px;

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}`)
@@ -322,11 +339,15 @@ export default class Detail extends Component {
   onShareAppMessage = () => {
     const { shares } = 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,
       data: '{}'
     })
 
@@ -502,6 +523,8 @@ export default class Detail extends Component {
       qrCode,
       leftTime,
       ltTicker,
+      consultData,
+      consultShow
     } = this.state
 
     const { userInfo } = this.props
@@ -531,6 +554,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 +573,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}`)
@@ -323,11 +340,15 @@ export default class Detail extends Component {
   onShareAppMessage = () => {
     const { shares } = 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,
       data: '{}'
     })
 
@@ -494,6 +515,8 @@ export default class Detail extends Component {
       qrCode,
       leftTime,
       ltTicker,
+      consultData,
+      consultShow
     } = this.state
 
     const { userInfo } = this.props
@@ -509,15 +532,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 +556,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 +568,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 +638,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,27 @@ 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,
       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
     }
 
@@ -328,8 +342,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 +393,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

@@ -36,8 +36,8 @@ export default class NewsDetail extends Component {
     posterShow: 'none',
     posterData: {},
     posterVisible: false,
-    consultData: {},
-    consultShow: false
+    consultData: {}, // 分享的置业顾问信息
+    consultShow: false  // 置业顾问悬浮框显示隐藏
   }
 
   componentWillMount() {
@@ -52,14 +52,12 @@ export default class NewsDetail extends Component {
       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 }, () => {
@@ -123,13 +121,16 @@ export default class NewsDetail extends Component {
   }
   onShareAppMessage = () => {
     const { detail: { shareContents, newsName, newsId, newsImg } } = this.state
-    const { userInfo: { person: { personId, personType } } } = this.props
+    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',
       propertyName: '资讯详情分享',
+      consultantId: consultantId,
+      sharePersonId: personId,
       data: '{}'
     }).then(res => {
       console.info('资讯详情分享')
@@ -253,7 +254,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> */}
@@ -263,9 +263,9 @@ export default class NewsDetail extends Component {
                 </View>
               </ScrollView>
               <Notice></Notice>
-              <BackHomeBtn style={consultShow ? "bottom:320rpx" : ''}></BackHomeBtn>
+              <BackHomeBtn style={consultShow ? "bottom:310rpx" : ''}></BackHomeBtn>
               {
-                consultShow && <Consultant personId={personId} name={name || nickname} data={consultData}></Consultant>
+                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) }}>

src/pages/project/detail/index.js

@@ -294,21 +294,22 @@ export default class Index extends Component {
   onShareAppMessage = () => {
     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: '项目详情分享',
-      data: '{}'
-    }).then(res => {
-      console.log('项目详情分享')
-    })
-    const router = Taro.getStorageSync('router')
-    const consultant = this.$router.params.consultant || router.query.consultant || " "
+        savePoint({
+          event: 'share',
+          eventType: 'building',
+          propertyName: '项目详情分享',
+          consultantId: consultantId,
+          sharePersonId: personId,
+          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}`,//分享地址
@@ -1235,7 +1236,7 @@ export default class Index extends Component {
               </View> */}
               <BackHomeBtn style={consultShow ? "bottom:320rpx" : ''}></BackHomeBtn>
               {
-                consultShow && <Consultant style="bottom:170rpx" personId={userInfo.person.personId} name={userInfo.person.name || userInfo.person.nickname} data={consultData}></Consultant>
+                consultShow && <Consultant style="bottom:160rpx" smallStyle="bottom:188rpx" personId={userInfo.person.personId} name={userInfo.person.name || userInfo.person.nickname} data={consultData}></Consultant>
               }
             </View>
           )