Merge branch 'dev'

config/prod.js

@@ -5,13 +5,11 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://192.168.2.54:8080"',
     // WSS_HOST: '"ws://192.168.2.54:8080"',
-    // HOST: '"https://dev.jinchengjiaye.com"',//测试
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://dev.pawoma.cn"',// 新测试
     // WSS_HOST: '"wss://dev.pawoma.cn"',
     HOST: '"https://lt.pawoma.cn"',
     WSS_HOST: '"wss://lt.pawoma.cn"',
-    Version: 'V3.5.11'
+    Version: 'V3.5.12'
   },
   weapp: {},
   h5: {}

src/pages/project/h5Page.js

@@ -30,6 +30,7 @@ export default class Index extends Component {
     codeParams: {}, // 解析二维码参数
     h5Id: undefined,
     reportedCustomer: false,
+    buildingId: undefined,
   }
 
   componentWillMount() {
@@ -40,7 +41,8 @@ export default class Index extends Component {
           console.log(res, "解析二维码返回值")
           this.setState({
             codeParams: res || {},
-            h5Id: res.id
+            h5Id: res.id,
+            buildingId: res.buildingId || '',
           }, () => {
             if (isEmpty(res.id)) {
               Taro.showModal({
@@ -130,7 +132,7 @@ export default class Index extends Component {
 
   // 埋点
   success() {
-    const { codeParams } = this.state
+    const { codeParams, buildingId } = this.state
     const firstShare = this.$router.params.firstShare || codeParams.firstShare || ""
     const consultant = this.$router.params.consultant || codeParams.consultant || ""
     const sharePersonId = this.$router.params.sharePersonId || codeParams.sharePersonId || ""
@@ -140,6 +142,7 @@ export default class Index extends Component {
       event: 'detail',
       eventType: 'h5',
       propertyName: 'h5详情',
+      buildingId: buildingId,
       consultantId: consultant,
       sharePersonId: sharePersonId,
       targetId: h5Id,
@@ -154,7 +157,7 @@ export default class Index extends Component {
 
   // 分享好友
   onShareAppMessage = () => {
-    const { pageInfo, h5Id } = this.state
+    const { pageInfo, h5Id, buildingId } = this.state
     const currentPage = `/${this.currentPageAndParams().join('?')}`
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
@@ -168,6 +171,7 @@ export default class Index extends Component {
       consultantId: consultantId,
       sharePersonId: personId,
       targetId: h5Id,
+      buildingId: buildingId,
       data: '{}'
     }, 'h5')
     // savePoint({
@@ -190,7 +194,7 @@ export default class Index extends Component {
 
   currentPageAndParams() {
     const { userInfo: { person } } = this.props
-    const { h5Id } = this.state
+    const { h5Id, buildingId } = this.state
 
     const consultantId = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
     const firstShare = this.$router.params.firstShare || person.personId
@@ -202,7 +206,8 @@ export default class Index extends Component {
       `from=h5_share`,
       // `consultantId=${consultantId}`,
       `firstShare=${firstShare}`,
-      `id=${h5Id}`
+      `id=${h5Id}`,
+      `buildingId=${buildingId}`
     ]
 
     const res = [
@@ -228,6 +233,7 @@ export default class Index extends Component {
         this.setState({
           pageInfo: res,
           h5Id: id,
+          buildingId: res.buildingId || '',
         })
       } else {
         Taro.showModal({
@@ -336,29 +342,6 @@ export default class Index extends Component {
     }
   }
 
-  // // 报备客户
-  // reportClientFn() {
-  //   const { codeParams } = this.state
-  //   const consultant = this.$router.params.consultant || codeParams.consultant || ""
-  //   const { userInfo: { person: { phone, tel, personId, userId, personType } } } = this.props
-  //   // const isConsultant = personType == ROLE_CODE['CONSULTANT']
-  //   console.log(this.$router, "this.$routerthis报备客户哈哈哈哈")
-  //   console.log(this.props.userInfo.person, "person报备客户哈哈哈哈")
-  //   if (isConsultant && 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)
-  //     })
-  //   }
-  // }
-
   renderMaskBanner() {
     const { avatarVisible, phoneVisible, pageInfo, h5Id } = this.state
     return (
@@ -382,7 +365,7 @@ export default class Index extends Component {
   }
   render() {
 
-    const { pageInfo, webViewVisible, codeParams, pageHide, h5Id } = this.state
+    const { pageInfo, webViewVisible, codeParams, pageHide, h5Id, buildingId } = this.state
     const { userInfo: { person } } = this.props
     const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
     const firstShare = this.$router.params.firstShare || person.personId
@@ -390,6 +373,7 @@ export default class Index extends Component {
       `personId=${person.personId}`,
       `recommender=${person.personId}`,
       `h5id=${h5Id}`,
+      `buildingId=${buildingId}`,
       `consultant=${consultant}`,
       `firstShare=${firstShare}`,
       `codeParams=${encodeURIComponent(codeParams['__raw'])}`,

src/utils/track.js

@@ -29,6 +29,7 @@ export async function trackUserSource(router) {
     propertyName: pageInfo.desc,
     data: '{}',
     id: (query || {}).id,
+    buildingId: (query || {}).buildingId || '',
     sceneId: scene,
     sharePersonId: (query || {}).recommender,
   }