Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/pages/activity/detail/assemble.js

 import { ROLE_CODE } from '@constants/user'
 import Consultant from '@components/consultant'
 import * as noticeType from '@constants/common.js'
-import { reportClient } from '@services/report'
+import { report as reportCustomer } from '@utils/customer'
 
 const waitImg = require('@assets/helpgroup/wait.png')
 const memberImg = require('@assets/helpgroup/group/member.png')
     grantAvatarVisible: false, // 授权头像
     pointRecordId: undefined, // 埋点ID
     consultData: {}, // 分享的置业顾问信息
-    consultShow: false  // 置业顾问悬浮框显示隐藏
+    consultShow: false,  // 置业顾问悬浮框显示隐藏
+    reportedCustomer: false,
   }
 
   componentWillMount() {
     this.stopTicker()
   }
 
+  componentWillReceiveProps() {
+    this.reportClientFn()
+  }
+
   // 初始化页面数据
   initPageData = () => {
     if (!this.state.detail.groupActivityId) {
     })
 
     if (consultant) {
-      this.reportClientFn()
       getCardDetail(consultant).then(res => {
         this.setState({
           consultData: res,
       })
     }
   }
+
   // 报备客户
   reportClientFn() {
-
     const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const { userInfo: { person: { phone, tel, personId } } } = this.props
-
-    if (consultant && consultant != personId) {
-      const realPhone = phone || tel
-      const payload = {
-        realtyConsultant: consultant, //报备人 置业顾问
-        phone: realPhone,
-        showToast: false
-      }
-      reportClient(payload).then(res => {
-        console.log('恭喜您绑定成功')
-      }).catch(err => {
-        console.error(err)
+    const { userInfo: { person } } = this.props
+
+    if (!this.state.reportedCustomer) {
+      reportCustomer(person, consultant).then(() => {
+        this.setState({ reportedCustomer: true })
       })
     }
   }
     return res
   }
 
-
   onShareAppMessage = (res) => {
     const { shares, detail: { groupActivityId, activityName, mainImg } } = this.state
     const currentPage = `/${this.currentPageAndParams(res.from).join('?')}`

src/pages/activity/detail/assistance.js

 import { ROLE_CODE } from '@constants/user'
 import Consultant from '@components/consultant'
 import * as noticeType from '@constants/common.js'
-import { reportClient } from '@services/report'
+import { report as reportCustomer } from '@utils/customer'
 
 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'
     handleHelpBtn: true, // 立即助力好友
     pointRecordId: undefined, // 埋点ID
     consultData: {}, // 分享的置业顾问信息
-    consultShow: false  // 置业顾问悬浮框显示隐藏
+    consultShow: false,  // 置业顾问悬浮框显示隐藏
+    reportedCustomer: false,
   }
 
   componentWillMount() {
     this.stopTicker()
   }
 
+  componentWillReceiveProps() {
+    this.reportClientFn()
+  }
+
   // 初始化页面数据
   initPageData = () => {
     if (!this.state.detail.helpActivityId) {
     })
 
     if (consultant) {
-      this.reportClientFn()
       getCardDetail(consultant).then(res => {
         this.setState({
           consultData: res,
       })
     }
   }
+
   // 报备客户
   reportClientFn() {
-
     const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const { userInfo: { person: { phone, tel, personId } } } = this.props
-
-    if (consultant && consultant != personId) {
-      const realPhone = phone || tel
-      const payload = {
-        realtyConsultant: consultant, //报备人 置业顾问
-        phone: realPhone,
-        showToast: false
-      }
-      reportClient(payload).then(res => {
-        console.log('恭喜您绑定成功')
-      }).catch(err => {
-        console.error(err)
+    const { userInfo: { person } } = this.props
+
+    if (!this.state.reportedCustomer) {
+      reportCustomer(person, consultant).then(() => {
+        this.setState({ reportedCustomer: true })
       })
     }
   }

src/pages/activity/detail/index.js

 import dayjs from 'dayjs'
 import WxParse from '@components/wxParse/wxParse'
 import getUserPhone from '@utils/getUserPhone'
+import AchievePhone from '@components/achievePhone'
 import ready from '@utils/ready'
 import { getDownloadURL, times, transferImage } from '@utils/tools'
 import { getQrCodeParams } from '@utils/qrcode'
   updatePoint
 } from '@services/common'
 import { connect } from '@tarojs/redux'
-import { reportClient } from '@services/report'
+import { report as reportCustomer } from '@utils/customer'
 
 @connect(state => state.user)
 export default class Detail extends Component {
     canChoose: 'none',
     inputName: '',
     consultData: {}, // 分享的置业顾问信息
-    consultShow: false  // 置业顾问悬浮框显示隐藏
+    consultShow: false,  // 置业顾问悬浮框显示隐藏
+    reportedCustomer: false,
   }
 
   componentWillMount() {
     })
   }
 
+  componentWillReceiveProps() {
+    this.reportClientFn()
+  }
+
   loadDetail() {
     const { id } = this.state
     Taro.showLoading()
         }
       })
       WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
-
-
     })
 
     if (consultant) {
-      this.reportClientFn()
       getCardDetail(consultant).then(res => {
         this.setState({
           consultData: res,
       })
     }
   }
+
   // 报备客户
   reportClientFn() {
-
-    const router = Taro.getStorageSync('router') || { query: {} }
+    const router = Taro.getStorageSync('router')
     const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const { userInfo: { person: { phone, tel, personId } } } = this.props
+    const { userInfo: { person } } = this.props
 
-    if (consultant && consultant != personId) {
-      const realPhone = phone || tel
-      const payload = {
-        realtyConsultant: consultant, //报备人 置业顾问
-        phone: realPhone,
-        showToast: false
-      }
-      reportClient(payload).then(res => {
-        console.log('恭喜您绑定成功')
-      }).catch(err => {
-        console.error(err)
+    if (!this.state.reportedCustomer) {
+      reportCustomer(person, consultant).then(() => {
+        this.setState({ reportedCustomer: true })
       })
     }
   }
     }
   }
 
+  // 手机号获取成功就报备客户
+  handleAuthPhoneSuccess = () => {
+    // 报备放到页面生命周期里面了
+    // this.reportClientFn()
+  }
+
   handleSignup() {
     const { detail: { buildingId, dynamicId }, isSign } = this.state
     const { userInfo: { person: { phone, name, nickname } } } = this.props
       }
     })
   }
+
   getPosterData = () => {
     return new Promise(resolve => {
       const { posterData } = this.state
       })
     })
   }
+
   // 开始生成海报
   togglePosterStatus = (flag) => {
     if (flag) {
   }
 
   render() {
+    const router = Taro.getStorageSync('router')
     const { detail, loaded, isSaved, isSign, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
-    const { userInfo: { person: { phone, personId, nickname, name } } } = this.props
+    const { userInfo = {} } = this.props
+    const { person: { phone, personId, nickname, name, tel } = {} } = userInfo
+    const consultant = this.$router.params.consultant || router.query.consultant || ""
+
     return (
       <Block>
         {/* 生成海报 */}
         {posterVisible && (<Poster data={posterData} toggle={this.togglePosterStatus}></Poster>)}
 
+        {
+          (personId && !phone && !tel && consultant) &&
+          <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
+        }
+
         {
           loaded && (
             <View>

src/pages/news/detail/index.js

 import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
 import { getDownloadURL, transferImage } from '@utils/tools'
 import { getQrCodeParams } from '@utils/qrcode'
+import { report as reportCustomer } from '@utils/qrcode'
 import { getCardDetail } from '@services/card'
 import { ROLE_CODE } from '@constants/user'
 import Consultant from '@components/consultant'
     posterData: {},
     posterVisible: false,
     consultData: {}, // 分享的置业顾问信息
-    consultShow: false  // 置业顾问悬浮框显示隐藏
+    consultShow: false,  // 置业顾问悬浮框显示隐藏
+    reportedCustomer: false,
   }
 
   componentWillMount(options) {
     })
   }
 
+  componentWillReceiveProps(nextProps) {
+    this.reportClientFn()
+  }
+
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
       }
     })
   }
+  
   // 报备客户
   reportClientFn() {
-
     const router = Taro.getStorageSync('router') || { query: {} }
     const consultant = this.$router.params.consultant || router.query.consultant || ""
     const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
-    const { userInfo: { person: { phone, tel, personId } } } = this.props
-
-    if (consultant && consultant != personId) {
-      const realPhone = phone || tel
-      const payload = {
-        realtyConsultant: consultant, //报备人 置业顾问
-        phone: realPhone,
-        showToast: false
-      }
-      reportClient(payload).then(res => {
-        console.log('恭喜您绑定成功')
-      }).catch(err => {
-        console.error(err)
+    const { userInfo: { person } } = this.props
+
+    if (!this.state.reportedCustomer) {
+      reportCustomer(person, consultant).then(() => {
+        this.setState({ reportedCustomer: true })
       })
     }
   }
     })
 
     if (consultant) {
-      this.reportClientFn()
       getCardDetail(consultant).then(res => {
         this.setState({
           consultData: res,

src/pages/project/detail/index.js

 import Banner from '../banner'
 import HelpGroupBanner from '../swiper'
 import Poster from './poster'
-import { reportClient } from '@services/report'
 import Around from './Around/around'
 import BackHomeBtn from '@components/BackHomeBtn'
 import AchievePhone from '@components/achievePhone'
 import { ROLE_CODE } from '@constants/user'
 import { getCardDetail } from '@services/card'
 import Consultant from '@components/consultant'
+import { report as reportCustomer } from '@utils/customer'
 import * as noticeType from '@constants/common.js'
 
 const buildBg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/buildbg.png'
     btnstate: 0,// 1显示视频 0显示图片
     albumCurrent: 0,
     videoPlayShow: 'flex',
-    grantPhoneVisible: false, // 授权手机弹框
     consultData: {}, // 分享的置业顾问信息
-    consultShow: false  // 置业顾问悬浮框显示隐藏
+    consultShow: false,  // 置业顾问悬浮框显示隐藏
+    reportedCustomer: false,
   }
 
   componentWillMount() {
         Taro.reLaunch({ url: '/pages/auth/index' })
         return
       }
-      this.setState({
-        grantPhoneVisible: true,
-      })
-      // }
 
       const id = this.$router.params.id || router.query.id
 
     })
   }
 
+  componentWillReceiveProps() {
+    this.reportClientFn()
+  }
+
   // 报备客户
   reportClientFn() {
-    const router = Taro.getStorageSync('router') || { query: {} }
+    const router = Taro.getStorageSync('router')
     const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const { userInfo: { person: { phone, tel, personId } } } = this.props
-
-    if (consultant && consultant != personId) {
-      const realPhone = phone || tel
-      const payload = {
-        realtyConsultant: consultant, //报备人 置业顾问
-        phone: realPhone,
-        showToast: false
-      }
-      reportClient(payload).then(res => {
-        console.log('恭喜您绑定成功')
-      }).catch(err => {
-        console.error(err)
+    const { userInfo: { person } } = this.props
+
+    if (!this.state.reportedCustomer) {
+      reportCustomer(person, consultant).then(() => {
+        this.setState({ reportedCustomer: true })
       })
     }
   }
         console.log('项目详情')
       })
       if (consultant) {
-        this.reportClientFn()
         getCardDetail(consultant).then(res => {
           this.setState({
             consultData: res,
   navigateTo(url) {
     Taro.navigateTo({ url: url })
   }
+
   // 海报预览图
   previewImage(arr) {
     // console.log('arr:' + arr)
       const { userInfo: { person: { personId, nickname, name } } } = this.props
       const { userInfo: { miniApp: { tpls } } } = this.props
       const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true))[0].tplId
+
       wx.requestSubscribeMessage({
         tmplIds: [tplId],
         success(res) {
           icon: 'none'
         })
       }
-
     }
-
   }
 
   handleTelClick(item, e) {
     })
   }
 
-
-
   handleAuthPhoneSuccess = () => {
     const { person = {} } = this.props.userInfo || {}
     if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
   }
 
   render() {
-    const { posterStatus, posterData, loaded, btnstate, grantPhoneVisible, consultData, consultShow } = this.state
+    const { posterStatus, posterData, loaded, btnstate, consultData, consultShow } = this.state
     const { projectDetail, userInfo = { person: {} } } = this.props
     const { uvList = {} } = projectDetail
     const { total = 0, records = [] } = uvList
     return (
       <Block>
         {
-          (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone && !userInfo.person.tel) &&
+          (userInfo.person.personId && !userInfo.person.phone && !userInfo.person.tel) &&
           <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
         }
         {

src/utils/customer.js

+
+import { reportClient } from '@services/report'
+
+/**
+ * 报备客户
+ * @param {*} userInfo 
+ * @param {*} consultant 
+ * @param {*} showToast 
+ */
+export function report(person, consultant, showToast) {
+  if (!person || !(person.tel || person.phone)) {
+    return Promise.reject('用户手机号不存在');
+  }
+
+  if (!consultant) {
+    return Promise.reject('置业顾问信息不存在');
+  }
+
+  if (consultant == person.personId || consultant == person.userId) {
+    return Promise.resolve();
+  }
+
+  const realPhone = person.tel || person.phone
+  const payload = {
+    realtyConsultant: consultant, //报备人 置业顾问
+    phone: realPhone,
+    showToast,
+  }
+
+  return new Promise((resolve, reject) => {
+    reportClient(payload).then(res => {
+      resolve()
+    }).catch(err => {
+      console.error(err)
+      reject(err.message || err)
+    })
+  })
+}