commit

config/dev.js

@@ -5,8 +5,8 @@ module.exports = {
   defineConstants: {
     HOST: '"https://dev.fangdeal.cn"', //测试
     WSS_HOST: '"wss://dev.fangdeal.cn"',
-    // HOST: '"http://192.168.1.100:8080"',
-    // WSS_HOST: '"ws://192.168.1.100:8080"',
+    // HOST: '"http://192.168.0.195:8080"', //魏超
+    // WSS_HOST: '"ws://192.168.0.195:8080"',
     OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
     OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
     Version: "V3.5.28"

src/actions/card.js

@@ -17,13 +17,12 @@ import { createAction } from '@/utils/redux'
  * 获取卡片信息
  * @param {*} id 
  */
-export const dispatchCardInfo = id => createAction({
+export const dispatchCardInfo = (id, params) => createAction({
   url: `${API_CARDS_LIST}/${id}`,
-  type: CARD_INFO
+  type: CARD_INFO,
+  fetchOptions: params || {}
 })
 
-
-
 /**
  * 获取置业顾问列表
  */

src/onlineSelling/pages/live/index.js

@@ -47,6 +47,7 @@ export default class livePage extends Component {
     consultShow: false,  // 置业顾问悬浮框显示隐藏
     noRecord: false,
     recordId: undefined, // 埋点ID
+    queryInfo: {}
   }
 
 
@@ -93,7 +94,15 @@ export default class livePage extends Component {
 
     if (this.$router.params.scene) {
       getQrCodeParams(this.$router.params.scene).then((res) => {
-        this.setState({ id: res.id, qrcodeParams: res }, () => {
+        this.setState({
+          id: res.id,
+          qrcodeParams: res,
+          queryInfo: {
+            channelId: res.channelId || '',
+            qrCodeId: res.qrCodeId || '',
+            scene: this.$router.params.scene,
+          }
+        }, () => {
           this.anotherInfo(res.id)
         })
       })
@@ -111,7 +120,7 @@ export default class livePage extends Component {
   anotherInfo(id) {
 
     // this.reportClientFn()
-    let { qrcodeParams } = this.state
+    let { qrcodeParams, queryInfo } = this.state
     const consultant = Taro.getStorageSync('consultantId') || ''
     // const consultant = this.$router.params.consultant || qrcodeParams.consultant
 
@@ -124,13 +133,13 @@ export default class livePage extends Component {
       })
     }
 
-    queryLiveDetail(id).then(res => {
+    queryLiveDetail(id, queryInfo).then(res => {
 
       this.setState({
         liveDetail: res || {},
         noRecord: res.status == '1' ? false : true
       })
-      const { qrcodeParams } = this.state
+      const { qrcodeParams, queryInfo } = this.state
       const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
       const recommender = this.$router.params.recommender || qrcodeParams.recommender || ""
       savePoint({
@@ -143,8 +152,7 @@ export default class livePage extends Component {
         consultantId: consultantId,
         sharePersonId: recommender,
         data: '{}',
-
-
+        ...queryInfo
       }).then(res => {
         this.setState({
           recordId: res.recordId

src/pages/activity/detail/assemble.js

@@ -217,7 +217,7 @@ export default class Detail extends Component {
       posterVisible: !posterVisible,
       actionSheetVisible: showActionSheet,
     })
-    const { detail: { groupActivityId, buildingId }, queryInfo } = this.state
+    const { detail: { groupActivityId, buildingId } } = this.state
 
 
     shareSavePoint({
@@ -228,7 +228,6 @@ export default class Detail extends Component {
       targetId: groupActivityId,
       buildingId: buildingId || '',
       data: '{}',
-      ...queryInfo
     }, 'group')
     // savePoint({
     //   event: 'poster',
@@ -352,7 +351,8 @@ export default class Detail extends Component {
         consultantId: consultantId,
         sharePersonId: recommender,
         targetId: id,
-        data: '{"recordId":"' + recordId + '"}'
+        data: '{"recordId":"' + recordId + '"}',
+        ...queryInfo
       }).then((res) => {
         this.setState({ pointRecordId: res.recordId })
       })
@@ -411,7 +411,7 @@ export default class Detail extends Component {
   }
 
   onShareAppMessage = (res) => {
-    const { shares, detail: { groupActivityId, activityName, mainImg, buildingId }, queryInfo = {} } = this.state
+    const { shares, detail: { groupActivityId, activityName, mainImg, buildingId } } = this.state
     const currentPage = `/${this.currentPageAndParams().join('?')}`
     // const currentPage = `/${this.currentPageAndParams(res.from).join('?')}`
     const { userInfo: { person: { personId, personType, userId } } } = this.props
@@ -427,7 +427,6 @@ export default class Detail extends Component {
       targetId: groupActivityId,
       buildingId: buildingId || '',
       data: '{}',
-      ...queryInfo
     }, 'group')
 
     const shareData = shares && shares.length ? shares[0] : { shareContentTitle: activityName, shareContentImg: mainImg };

src/pages/activity/detail/assistance.js

@@ -220,7 +220,7 @@ export default class Detail extends Component {
       posterVisible: !posterVisible,
       actionSheetVisible: showActionSheet,
     })
-    const { id, detail: { buildingId }, queryInfo = {} } = this.state
+    const { id, detail: { buildingId } } = this.state
 
     shareSavePoint({
       event: 'poster',
@@ -230,7 +230,6 @@ export default class Detail extends Component {
       targetId: id,
       buildingId: buildingId || '',
       data: '{}',
-      ...queryInfo
     }, 'help')
     // savePoint({
     //   event: 'poster',
@@ -354,7 +353,8 @@ export default class Detail extends Component {
         consultantId: consultantId,
         sharePersonId: recommender,
         targetId: id,
-        data: '{"initiateId":"' + initiateId + '"}'
+        data: '{"initiateId":"' + initiateId + '"}',
+        ...queryInfo
       }).then((res) => {
         this.setState({ pointRecordId: res.recordId })
       })
@@ -417,7 +417,7 @@ export default class Detail extends Component {
 
   onShareAppMessage = (res) => {
 
-    const { shares, id, detail: { title, img, buildingId }, queryInfo = {} } = this.state
+    const { shares, id, detail: { title, img, buildingId } } = this.state
     const currentPage = `/${this.currentPageAndParams().join('?')}`
     // const currentPage = `/${this.currentPageAndParams(res.from).join('?')}`
     const { userInfo: { person: { personId, personType, userId } } } = this.props
@@ -432,7 +432,6 @@ export default class Detail extends Component {
       targetId: id,
       buildingId: buildingId || '',
       data: '{}',
-      ...queryInfo
     }, 'help')
 
     // savePoint({

src/pages/activity/detail/index.js

@@ -126,7 +126,8 @@ export default class Detail extends Component {
         targetId: res.dynamicId,
         consultantId: consultantId,
         sharePersonId: recommender,
-        data: '{}'
+        data: '{}',
+        ...queryInfo
       }).then(res1 => {
         this.setState({
           recordId: res1.recordId
@@ -179,7 +180,7 @@ export default class Detail extends Component {
   //   }
   // }
   onShareAppMessage = () => {
-    const { detail: { shareContents, title, dynamicId, imgUrl, buildingId }, queryInfo = {} } = this.state
+    const { detail: { shareContents, title, dynamicId, imgUrl, buildingId } } = this.state
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     console.log(dynamicId, "path")
     console.log(personId, "personId")
@@ -195,7 +196,6 @@ export default class Detail extends Component {
       targetId: dynamicId,
       buildingId: buildingId || '',
       data: '{}',
-      ...queryInfo
     }, 'activity')
 
     // addActivityShareNum(dynamicId)
@@ -342,7 +342,7 @@ export default class Detail extends Component {
         posterVisible: !!flag
       })
     }
-    const { detail: { dynamicId, buildingId }, queryInfo } = this.state
+    const { detail: { dynamicId, buildingId } } = this.state
     shareSavePoint({
       event: 'poster',
       eventType: 'activity',
@@ -351,7 +351,6 @@ export default class Detail extends Component {
       targetId: dynamicId,
       buildingId: buildingId || '',
       data: '{}',
-      ...queryInfo
     }, 'activity')
 
     // savePoint({

src/pages/card/index.js

@@ -46,6 +46,7 @@ export default class Index extends Component {
     bound: false,
     grantPhoneVisible: false, // 授权电话
     grantAvatarVisible: false, // 授权头像
+    queryInfo: {}
   }
 
   componentWillMount() {
@@ -73,10 +74,10 @@ export default class Index extends Component {
     })
     if (this.$router.params.loadInfo == 'need') {
       Taro.navigateBack({ delta: 1 })
-      const { cardId } = this.state
+      const { cardId, queryInfo } = this.state
       const { dispatchCardInfo, dispatchProjectDetail } = this.props
       Taro.showLoading()
-      dispatchCardInfo(cardId).then(res => {
+      dispatchCardInfo(cardId, { ...queryInfo }).then(res => {
         Taro.hideLoading()
         this.setState({
           loaded: true,
@@ -97,7 +98,14 @@ export default class Index extends Component {
     if (this.$router.params.scene) {
 
       getQrCodeParams(this.$router.params.scene).then(res => {
-        this.setState({ cardId: res.id, }, this.loadCardDetail)
+        this.setState({
+          cardId: res.id,
+          queryInfo: {
+            channelId: res.channelId || '',
+            qrCodeId: res.qrCodeId || '',
+            scene: this.$router.params.scene,
+          }
+        }, this.loadCardDetail)
         addCardUv(res.id)
       }).catch(err => {
         Taro.showToast({
@@ -150,10 +158,10 @@ export default class Index extends Component {
   }
 
   loadCardDetail() {
-    const { cardId } = this.state
+    const { cardId, queryInfo } = this.state
     const { dispatchCardInfo, dispatchProjectDetail } = this.props
     Taro.showLoading()
-    dispatchCardInfo(cardId).then(res => {
+    dispatchCardInfo(cardId, { ...queryInfo }).then(res => {
       Taro.hideLoading()
       this.setState({
         loaded: true,
@@ -169,7 +177,8 @@ export default class Index extends Component {
         propertyName: '个人主页',
         buildingId: buildingId,
         targetId: cardId,
-        data: '{}'
+        data: '{}',
+        ...queryInfo
       }).then(res1 => {
         this.setState({
           recordId: res1.recordId

src/pages/news/detail/index.js

@@ -213,7 +213,7 @@ export default class NewsDetail extends Component {
   }
 
   onShareAppMessage = () => {
-    const { detail: { shareContents, newsName, newsId, newsImg, buildingId }, queryInfo } = this.state
+    const { detail: { shareContents, newsName, newsId, newsImg, buildingId } } = this.state
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
@@ -229,7 +229,6 @@ export default class NewsDetail extends Component {
       targetId: newsId,
       buildingId: buildingId || '',
       data: '{}',
-      ...queryInfo
     }, 'news')
 
     // addNewsShareNum(newsId)
@@ -276,7 +275,8 @@ export default class NewsDetail extends Component {
         targetId: res.newsId,
         consultantId: consultantId,
         sharePersonId: recommender,
-        data: '{}'
+        data: '{}',
+        ...queryInfo
       }).then(res2 => {
         this.setState({
           recordId: res2.recordId
@@ -366,7 +366,7 @@ export default class NewsDetail extends Component {
         posterVisible: !!flag
       })
     }
-    const { newsId, detail: { buildingId }, queryInfo } = this.state
+    const { newsId, detail: { buildingId } } = this.state
     shareSavePoint({
       event: 'poster',
       eventType: 'news',
@@ -374,7 +374,6 @@ export default class NewsDetail extends Component {
       targetId: newsId,
       buildingId: buildingId || '',
       data: '{}',
-      ...queryInfo
     }, 'news')
   }
   toProjectDetail = () => {

src/pages/project/detail/index.js

@@ -85,7 +85,8 @@ export default class Index extends Component {
     grantPhoneVisible: false, // 授权电话
     grantAvatarVisible: false, // 授权头像
     maskVisible: false,
-    extendContent: []
+    extendContent: [],
+    queryInfo: {}
   }
 
   componentWillPreload(params) {
@@ -165,7 +166,12 @@ export default class Index extends Component {
       getQrCodeParams(this.$router.params.scene).then(res => {
         console.log(res, "扫码参数")
         this.setState({
-          qrcodeParams: res
+          qrcodeParams: res,
+          queryInfo: {
+            channelId: res.channelId || '',
+            qrCodeId: res.qrCodeId || '',
+            scene: this.$router.params.scene,
+          }
         })
         this.initPageData(res.id)
       }).catch(err => {
@@ -286,12 +292,14 @@ export default class Index extends Component {
     const id = this.$router.params.id || sceneParams.id
     const consultantId = this.$router.params.consultantId || sceneParams.consultantId
     const recommender = this.$router.params.recommender || sceneParams.recommender
+    const { queryInfo } = this.state
 
     return {
       targetId: id,
       buildingId: id,
       consultantId,
       sharePersonId: recommender,
+      ...queryInfo
     }
   }
 
@@ -330,6 +338,7 @@ export default class Index extends Component {
     const sceneParams = this._$_scene || {}
     const buildingId = this.state.buildingId || this.$router.params.id || sceneParams.id
     const { dispatchProjectDetail } = this.props
+    const { queryInfo } = this.state
     this.setState({
       loaded: false,
     })
@@ -337,8 +346,7 @@ export default class Index extends Component {
       title: '正在加载数据',
       icon: 'loading'
     })
-
-    dispatchProjectDetail(buildingId).then(res => {
+    dispatchProjectDetail(buildingId, { ...queryInfo }).then(res => {
       const maskVisible = (res.extendContent || []).length
       this.setState({
         loaded: true,

src/pages/project/h5Page.js

@@ -33,7 +33,8 @@ export default class Index extends Component {
     codeParams: {}, // 解析二维码参数
     h5Id: undefined,
     reportedCustomer: false,
-    buildingId: undefined
+    buildingId: undefined,
+    queryInfo: {}
   };
 
   componentWillMount() {
@@ -46,7 +47,12 @@ export default class Index extends Component {
             {
               codeParams: res || {},
               h5Id: res.id,
-              buildingId: res.buildingId || ""
+              buildingId: res.buildingId || "",
+              queryInfo: {
+                channelId: res.channelId || '',
+                qrCodeId: res.qrCodeId || '',
+                scene: this.$router.params.scene,
+              }
             },
             () => {
               if (isEmpty(res.id)) {
@@ -149,6 +155,7 @@ export default class Index extends Component {
     const sharePersonId =
       this.$router.params.sharePersonId || codeParams.sharePersonId || "";
     const h5Id = this.state.h5Id || this.$router.params.id;
+    const { queryInfo } = this.state
 
     savePoint({
       event: "detail",
@@ -158,7 +165,8 @@ export default class Index extends Component {
       consultantId: consultant,
       sharePersonId: sharePersonId,
       targetId: h5Id,
-      data: '{"firstShare":"' + firstShare + '"}'
+      data: '{"firstShare":"' + firstShare + '"}',
+      ...queryInfo
     }).then(res => {
       this.setState({
         recordId: res.recordId
@@ -257,7 +265,8 @@ export default class Index extends Component {
 
   loadH5Profile = id => {
     // h5id 、第一个分享人ID、置业顾问ID、分享人ID
-    getHFiveDetail(id).then(res => {
+    const { queryInfo } = this.state
+    getHFiveDetail(id, queryInfo).then(res => {
       Taro.hideLoading();
       if (res.status == 1) {
         this.setState({

src/services/item.js

@@ -88,7 +88,7 @@ export const addItemShareNum = id => fetch({ url: `${API_ITEMS_SHARE}/${id}`, me
  * 直播页详情
  * @param {*} id 
  */
-export const queryLiveDetail = id => fetch({ url: `${API_LIVE_DEATIL}/${id}` })
+export const queryLiveDetail = (id, payload) => fetch({ url: `${API_LIVE_DEATIL}/${id}`, payload })
 
 /**
  * 项目详情直播列表

src/services/user.js

@@ -44,18 +44,18 @@ export const getVerifyList = payload => fetch({ url: API_QUERY_DOCUMENTVERIFY_li
  * 提交我的资料 (首次)
  * @param {*} payload
  */
-export const commitDocumentVerify = payload => fetch({ url: API_QUERY_DOCUMENTVERIFY, payload, method: 'POST'  })
+export const commitDocumentVerify = payload => fetch({ url: API_QUERY_DOCUMENTVERIFY, payload, method: 'POST' })
 /**
  * 提交我的资料 (非首次)
  * @param {*} payload
  */
-export const editDocumentVerify = payload => fetch({ url:`${API_QUERY_DOCUMENTVERIFY}/${payload.id}`, payload, method: 'PUT'  })
+export const editDocumentVerify = payload => fetch({ url: `${API_QUERY_DOCUMENTVERIFY}/${payload.id}`, payload, method: 'PUT' })
 
 /**
  * 获取审核资料详情
  *  * @param {*} payload
  */
-export const getProfileDetail = payload => fetch({ url:`${API_QUERY_DOCUMENTVERIFY}/${payload}`, payload  })
+export const getProfileDetail = payload => fetch({ url: `${API_QUERY_DOCUMENTVERIFY}/${payload}`, payload })
 
 /**
  * 用户签到
@@ -65,17 +65,17 @@ export const doUserSignin = payload => fetch({ url: API_USER_SIGNIN, payload, me
 
 /**
  * 获取h5中间页信息
- * @param {*} payload 
+ * @param {*} id 
  */
-export const getHFiveDetail = payload => fetch({ url:`${API_QUERY_TADRAINGE}/${payload}`, payload  })
+export const getHFiveDetail = (id, payload) => fetch({ url: `${API_QUERY_TADRAINGE}/${id}`, payload })
 /**
  * 获取首页分享信息
  * @param {*} payload
  */
-export const getIndexShare = payload => fetch({ url:API_TACUSTOMIMG, payload  })
+export const getIndexShare = payload => fetch({ url: API_TACUSTOMIMG, payload })
 /**
  * 获取积分规则
  * @param {*} payload
  */
-export const getPointsRule = payload => fetch({ url:API_POINTS_RULE, payload  })
+export const getPointsRule = payload => fetch({ url: API_POINTS_RULE, payload })