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

src/onlineSelling/pages/houseList/index.js

@@ -191,8 +191,9 @@ export default class HouseList extends Component {
     const consultant = this.$router.params.consultant || qrcodeParams.consultant || Taro.getStorageSync('consultantId') || ""
     const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
     const recommender = this.$router.params.recommender || qrcodeParams.recommender || ""
-
-    if (consultant) {
+    const { userInfo: { person: { personId } } } = this.props
+    const notSelf = personId != consultant
+    if (notSelf && consultant) {
       getCardDetail(consultant).then(res => {
         this.setState({
           consultData: res,

src/onlineSelling/pages/live/index.js

@@ -123,8 +123,9 @@ export default class livePage extends Component {
     let { qrcodeParams, queryInfo } = this.state
     const consultant = this.$router.params.consultant || qrcodeParams.consultant || Taro.getStorageSync('consultantId') || ''
     const recommender = this.$router.params.recommender || qrcodeParams.recommender || Taro.getStorageSync('recommender') || ''
-
-    if (consultant) {
+    const { userInfo: { person: { personId } } } = this.props
+    const notSelf = personId != consultant
+    if (notSelf && consultant) {
       getCardDetail(consultant).then(res => {
         this.setState({
           consultData: res,
@@ -234,7 +235,7 @@ export default class livePage extends Component {
     this.setState({ showShareMenu: false })
     const id = this.$router.params.id || this.state.liveDetail.liveActivityId
     const { userInfo: { person: { personId, personType, userId } } } = this.props
-    const { liveDetail: { shareContents, buildingId },qrcodeParams } = this.state
+    const { liveDetail: { shareContents, buildingId }, qrcodeParams } = this.state
     const consultantId1 = this.$router.params.consultantId || qrcodeParams.consultantId || ''
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : consultantId1
     const shareData = shareContents && shareContents.length ? shareContents[0] : { shareContentTitle: '精彩直播', shareContentImg: null };

src/pages/news/detail/index.js

@@ -251,7 +251,7 @@ export default class NewsDetail extends Component {
     const consultant = this.$router.params.consultant || qrcodeParams.consultant || Taro.getStorageSync('consultantId') || ''
     const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
     const recommender = this.$router.params.recommender || qrcodeParams.recommender || Taro.getStorageSync('recommender') || ''
-    const { dispatchProjectDetail } = this.props
+    const { dispatchProjectDetail, userInfo = {} } = this.props
     Taro.showLoading()
     console.log(newsId, "newsIdnewsIdnewsIdnewsIdnewsId")
     queryNewsDetail(newsId, queryInfo, { ['x-consultant']: consultant, ['x-recommender']: recommender }).then(res => {
@@ -289,12 +289,10 @@ export default class NewsDetail extends Component {
           })
         }
       })
-
       WxParse.wxParse('article', 'html', res.newsDetail, this.$scope, 0)
-
     })
-
-    if (consultant) {
+    const notSelf = userInfo.person.personId != consultant
+    if (notSelf && consultant) {
       getCardDetail(consultant).then(res => {
         this.setState({
           consultData: res,

src/pages/project/detail/index.js

@@ -254,7 +254,7 @@ export default class Index extends Component {
       this.loadHelpGroupList()
 
       addItemUv(id)
-      const { qrcodeParams } = this.state
+      const { sceneParams = {} } = this.state
       // 埋点
       const consultant = this.$router.params.consultant || sceneParams.consultant || Taro.getStorageSync('consultantId') || ''
       // const consultant = this.$router.params.consultant || qrcodeParams.consultant
@@ -275,8 +275,9 @@ export default class Index extends Component {
       //   })
       //   console.log('项目详情')
       // })
-
-      if (consultant) {
+      const { userInfo: { person: { personId } } } = this.props
+      const notSelf = personId != consultant
+      if (notSelf && consultant) {
         getCardDetail(consultant).then(res => {
           this.setState({
             consultData: res,