commit

config/dev.js

@@ -3,14 +3,14 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://dev.fangdeal.cn"', //测试
-    // WSS_HOST: '"wss://dev.fangdeal.cn"',
+    HOST: '"https://dev.fangdeal.cn"', //测试
+    WSS_HOST: '"wss://dev.fangdeal.cn"',
     // HOST: '"http://192.168.0.195:8080"', //魏超
     // WSS_HOST: '"ws://192.168.0.195:8080"',
     // HOST: '"http://192.168.0.144:8080"', //顾邵勇
     // WSS_HOST: '"ws://192.168.0.144:8080"',
-    HOST: '"http://192.168.0.190:8080"', //傅行帆
-    WSS_HOST: '"ws://192.168.0.190:8080"',
+    // HOST: '"http://192.168.0.190:8080"', //傅行帆
+    // WSS_HOST: '"ws://192.168.0.190:8080"',
     OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
     OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
     Version: "V3.5.28"

src/pages/activity/detail/assemble.js

@@ -358,8 +358,9 @@ export default class Detail extends Component {
         this.setState({ pointRecordId: res.recordId })
       })
     })
+    const notSelf = userInfo.person.personId != consultant
 
-    if (consultant) {
+    if (notSelf && consultant) {
       getCardDetail(consultant).then(res => {
         this.setState({
           consultData: res,

src/pages/activity/detail/assistance.js

@@ -359,8 +359,8 @@ export default class Detail extends Component {
         this.setState({ pointRecordId: res.recordId })
       })
     })
-
-    if (consultant) {
+    const notSelf = userInfo.person.personId != consultant
+    if (notSelf && consultant) {
       getCardDetail(consultant).then(res => {
         this.setState({
           consultData: res,

src/pages/activity/detail/index.js

@@ -154,8 +154,9 @@ export default class Detail extends Component {
       })
       WxParse.wxParse('article', 'html', res.desc, this.$scope, 0)
     })
-
-    if (consultant) {
+    const { userInfo = {} } = this.props
+    const notSelf = userInfo.person.personId != consultant
+    if (notSelf && consultant) {
       getCardDetail(consultant).then(res => {
         this.setState({
           consultData: res,

src/pages/person/index.js

@@ -13,6 +13,7 @@ import { menus } from './menus'
 import login from '@/utils/login'
 export const version = Version
 import { rule as ruleToast } from '@/utils/ruleToast'
+import { Loading } from '@/components/Loading'
 
 @connect(({ user, city }) => ({ user, city }), { ...actions })
 
@@ -30,6 +31,7 @@ export default class Person extends Component {
     menus: [],
     roleName: '普通用户',
     pageVisible: false,
+    loading: true,
   }
 
   componentDidShow() {
@@ -42,10 +44,10 @@ export default class Person extends Component {
   loadUserInfo() {
     queryUserInfo().then(users => {
       const [roleSetting, roleName] = this.getRoleName(users.personType)
-
       this.setState({
         users,
         phone: users.phone,
+        loading: false,
         pageVisible: !users.phone && !users.tel,
         menus: menus.map(group => group.filter(x => x.userTypes.indexOf(users.personType) > -1)),
         roleName,
@@ -303,8 +305,11 @@ export default class Person extends Component {
   }
 
   render() {
-    const { phone, tel } = this.state.users
-    const { pageVisible } = this.state
+    // const { phone, tel } = this.state.users
+    const { loading, pageVisible } = this.state
+    if (loading) {
+      return <View style="margin: 80px auto;"><Loading color="#BB9C79" size={100} /></View>
+    }
     return (
       <View className='wrap'>
         {/* {(phone || tel) && this.renderDetail()} */}

src/pages/project/detail/index.js

@@ -193,12 +193,11 @@ export default class Index extends Component {
       projectDetail: { buildingId },
       userInfo: { person: { personId, personType, userId } }
     } = this.props
-    const { sceneParams } = this.state
+    const sceneParams = this._$_scene || {}
     const consultant1 = this.$router.params.consultant || sceneParams.consultant || Taro.getStorageSync('consultantId') || ''
     const consultantId1 = this.$router.params.consultantId || sceneParams.consultantId || ''
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : consultant1
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : consultantId1
-
     const queryParams = [
       `id=${buildingId}`,
       'from=building_share',
@@ -218,7 +217,7 @@ export default class Index extends Component {
       projectDetail: { shareContents, buildingName, buildingId, poster = '' },
       userInfo: { person: { personId, personType, userId } }
     } = this.props
-    const { sceneParams } = this.state
+    const sceneParams = this._$_scene || {}
     const consultantId1 = this.$router.params.consultantId || sceneParams.consultantId || ''
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : consultantId1
     // 分享埋点
@@ -257,7 +256,7 @@ export default class Index extends Component {
       addItemUv(id)
       const { qrcodeParams } = this.state
       // 埋点
-      const consultant = Taro.getStorageSync('consultantId') || ''
+      const consultant = this.$router.params.consultant || sceneParams.consultant || Taro.getStorageSync('consultantId') || ''
       // const consultant = this.$router.params.consultant || qrcodeParams.consultant
       // const consultantId = this.$router.params.consultantId ||  qrcodeParams.consultantId || ""
       // const recommender = this.$router.params.recommender || qrcodeParams.recommender || ""
@@ -351,6 +350,7 @@ export default class Index extends Component {
       title: '正在加载数据',
       icon: 'loading'
     })
+    console.log('项目详情项目详情项目详情项目详情项目详情项目详情项目详情')
     dispatchProjectDetail(buildingId, queryInfo, { header: { ['x-consultant']: consultant, ['x-recommender']: recommender } }).then(res => {
       const connectId = (res.extendContent || [])[0] ? (res.extendContent || [])[0].contentId : null
       const extendContentList = Taro.getStorageSync('extendContent') || []

src/pages/project/index.js

@@ -17,6 +17,7 @@ import * as actions from '@/actions/project'
 import { transferImage } from '@/utils/tools'
 import Notice from '@/components/Notice'
 import NavIcons from './NavIcons'
+import { ROLE_CODE } from '@/constants/user'
 import { share as shareSavePoint } from '@/utils/shareSavePoint'
 
 @connect(
@@ -62,12 +63,6 @@ export default class Index extends Component {
       this.loadData({ curCity: city })
 
       this.getIndexShareInfo()
-      
-      const consultant = this.$router.params.consultant || Taro.getStorageSync('consultantId') || ''
-      const recommender = this.$router.params.recommender || Taro.getStorageSync('recommender') || ''
-      reportIndexCustomer({ ['x-consultant']: consultant, ['x-recommender']: recommender }).then(res => {
-
-      })
 
       savePoint({
         event: 'index',
@@ -136,6 +131,17 @@ export default class Index extends Component {
     this.loadList(props)
     this.loadExtContents(props)
     this.getIndexIcons()
+    console.log('首页分享绑定客户！！！！！！！！！')
+    this.report()
+  }
+  report() {
+    const consultant = this.$router.params.consultant || Taro.getStorageSync('consultantId') || ''
+    const recommender = this.$router.params.recommender || Taro.getStorageSync('recommender') || ''
+    console.log(consultant, "consultantconsultant")
+    console.log(recommender, "recommenderrecommenderrecommenderrecommender")
+    const loadOptions = wx.getLaunchOptionsSync()
+    reportIndexCustomer({ channelId: '', qrCodeId: '', scene: loadOptions.scene, showToast: false }, { ['x-consultant']: consultant, ['x-recommender']: recommender })
+
   }
 
   loadExtContents(props) {
@@ -247,6 +253,7 @@ export default class Index extends Component {
     }, 'main').then(res => {
       console.log('首页分享')
     })
+    console.log('Indexrouter--->', `/pages/project/index?from=share&recommender=${personId}&consultant=${consultant}&consultantId=${consultantId}&id=index`)
     return {
       title: this.state.imgDocument || ` 精准获客—上${this.props.userInfo.miniApp.name || '橙蕉'}，买好房`,//分享内容
       path: `/pages/project/index?from=share&recommender=${personId}&consultant=${consultant}&consultantId=${consultantId}&id=index`,//分享地址

src/services/project.js

@@ -27,7 +27,7 @@ import {
  * 首页绑定私客
  * @param {*} payload
  */
-export const reportIndexCustomer = (header) => fetch({ url: API_INDEX_CUSTOMER, header, method: 'POST' })
+export const reportIndexCustomer = (payload, header) => fetch({ url: API_INDEX_CUSTOMER, payload, header, method: 'POST' })
 /**
  * 获取房源列表
  * @param {*} payload