sharepersonid

config/prod.js

@@ -9,7 +9,7 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    Version:'V3.5.4_2019-12-182140'
+    Version:'V3.5.4_2019-12-191441'
   },
   weapp: {},
   h5: {}

project.config.json

@@ -1,7 +1,7 @@
 {
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
-	"description": "知与行互动",
+	"description": "知与行联调",
 	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,

src/pages/activity/detail/assistance.js

@@ -257,6 +257,10 @@ export default class Detail extends Component {
     const { userInfo } = this.props
 
     Taro.showLoading()
+    const router = Taro.getStorageSync('router')
+    const consultant = this.$router.params.consultant || router.query.consultant
+    const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
+    const recommender = this.$router.params.recommender || router.query.recommender || ""
     getHelpDetail(id, initiateId).then(res => {
       this.stopTicker()
 
@@ -297,14 +301,15 @@ export default class Detail extends Component {
         eventType: 'help',
         propertyName: '助力详情',
         buildingId: res.helpActivity.buildingId,
+        consultantId: consultantId,
+        sharePersonId: recommender,
         targetId: id,
         data: '{"initiateId":"' + initiateId + '"}'
       }).then((res) => {
         this.setState({ pointRecordId: res.recordId })
       })
     })
-    const router = Taro.getStorageSync('router')
-    const consultant = this.$router.params.consultant || router.query.consultant
+
     if (consultant) {
       this.reportClientFn()
       getCardDetail(consultant).then(res => {
@@ -339,14 +344,16 @@ export default class Detail extends Component {
 
   currentPageAndParams() {
     const { id, initiateId } = this.state
-    const { userInfo: { person: { personId, personType } } } = this.props
+    const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
 
     let queryParams = [
       `id=${id}`,
       `from=help_share`,
       `recommender=${personId}`,
       `consultant=${consultant}`,
+      `&consultantId=${consultantId}`,
     ]
     if (initiateId) {
       queryParams.push(`initiateId=${initiateId}`)
@@ -396,7 +403,7 @@ export default class Detail extends Component {
   handleHelp = () => {
     const { userInfo: { miniApp: { tpls } } } = this.props
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HELP && x.isSubscribe == true))[0].tplId
-    const that=this
+    const that = this
     wx.requestSubscribeMessage({
       tmplIds: [tplId],
       success(res) {
@@ -412,7 +419,7 @@ export default class Detail extends Component {
         that.setState({ submitting: true }, () => {
           const { detail, initiateDetail } = that.state
           const person = that.props.userInfo.person
-    
+
           giveFriendHelp({
             buildingId: detail.buildingId,
             helpActivityId: detail.helpActivityId,
@@ -425,7 +432,7 @@ export default class Detail extends Component {
             Taro.hideLoading()
             const helpList = that.state.helpList || []
             helpList.push(res.helpRecord)
-    
+
             that.setState({
               submitting: false,
               helpList,
@@ -433,16 +440,16 @@ export default class Detail extends Component {
               initiateId: res.helpInitiateRecord.helpRecordInitiateId,
               helpState: res.helpInitiateRecord.status === undefined ? HelpInProcess : res.helpInitiateRecord.status,
             })
-    
+
             Taro.showToast({
               title: '助力成功',
               icon: 'success'
             })
-    
+
           }).catch(err => {
             console.log('err:', err)
             Taro.hideLoading()
-    
+
             Taro.showToast({
               title: '失败: ' + err.message,
               icon: 'none'
@@ -455,7 +462,7 @@ export default class Detail extends Component {
         })
       }
     })
-   
+
   }
 
   // 发起我的助力
@@ -501,7 +508,7 @@ export default class Detail extends Component {
   askForHelp = () => {
     const { userInfo: { miniApp: { tpls } } } = this.props
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HELP && x.isSubscribe == true))[0].tplId
-    const that=this
+    const that = this
     wx.requestSubscribeMessage({
       tmplIds: [tplId],
       success(res) {

src/pages/activity/detail/index.js

@@ -81,6 +81,10 @@ export default class Detail extends Component {
   loadDetail() {
     const { id } = this.state
     Taro.showLoading()
+    const router = Taro.getStorageSync('router')
+    const consultant = this.$router.params.consultant || router.query.consultant
+    const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
+    const recommender = this.$router.params.recommender || router.query.recommender || ""
     queryActivityDetail(id).then(res => {
       Taro.hideLoading()
       const { isSaved, isSign } = res
@@ -107,6 +111,8 @@ export default class Detail extends Component {
         propertyName: '活动详情',
         buildingId: res.buildingId,
         targetId: res.dynamicId,
+        consultantId: consultantId,
+        sharePersonId: recommender,
         data: '{}'
       }).then(res1 => {
         this.setState({
@@ -115,8 +121,7 @@ export default class Detail extends Component {
         console.log('活动详情')
       })
     })
-    const router = Taro.getStorageSync('router')
-    const consultant = this.$router.params.consultant || router.query.consultant
+
     if (consultant) {
       this.reportClientFn()
       getCardDetail(consultant).then(res => {
@@ -149,7 +154,7 @@ export default class Detail extends Component {
     }
   }
   onShareAppMessage = () => {
-    const { detail: { shareContents, title, dynamicId, url } } = this.state
+    const { detail: { shareContents, title, dynamicId, imgUrl } } = this.state
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     console.log(dynamicId, "path")
     console.log(personId, "personId")
@@ -170,11 +175,10 @@ export default class Detail extends Component {
     })
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
     return {
-      title: shareContents[0].shareContentTitle,
-      path: `/pages/activity/detail/index?id=${dynamicId}&from=dynamic_share&recommender=${personId}&consultant=${consultant}`,//分享地址
-      imageUrl: shareContents[0].shareContentImg
+      title: shareContents[0].shareContentTitle || title,
+      path: `/pages/activity/detail/index?id=${dynamicId}&from=dynamic_share&recommender=${personId}&consultant=${consultant}&consultantId=${consultantId}`,//分享地址
+      imageUrl: shareContents[0].shareContentImg || imgUrl
     }
-
   }
 
   handleSignup() {
@@ -246,13 +250,14 @@ export default class Detail extends Component {
       }
 
       const { userInfo: { person, miniApp } } = this.props
-      const { avatarurl, nickname, personId, personType, phone, tel } = person
+      const { avatarurl, nickname, personId, personType, phone, tel, userId } = person
       const { detail: { dynamicId, posters, createDate } } = this.state
       const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+      const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
       const phoneNum = phone || tel
 
       const payload = {
-        "scene": `id=${dynamicId}&from=dynamic_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}`,
+        "scene": `id=${dynamicId}&from=dynamic_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}&consultantId=${consultantId}`,
         "page": 'pages/activity/detail/index',
       }
 

src/pages/news/detail/index.js

@@ -41,8 +41,9 @@ export default class NewsDetail extends Component {
     consultShow: false  // 置业顾问悬浮框显示隐藏
   }
 
-  componentWillMount() {
-    console.log(this.$router,"this.$router")
+  componentWillMount(routerProps) {
+    console.log(routerProps,"routerProps")
+
     console.info('ready status3', ready)
     ready.queue(() => {
       const router = Taro.getStorageSync('router')
@@ -156,15 +157,18 @@ export default class NewsDetail extends Component {
     console.log(`/pages/news/detail/index?id=${newsId}&from=news_share&recommender=${personId}&consultant=${consultant}`, "path")
 
     return {
-      title: shareContents[0].shareContentTitle,
-      path: `/pages/news/detail/index?id=${newsId}&from=news_share&recommender=${personId}&consultant=${consultant}`,//分享地址
-      imageUrl: shareContents[0].shareContentImg
+      title: shareContents[0].shareContentTitle || newsName,
+      path: `/pages/news/detail/index?id=${newsId}&from=news_share&recommender=${personId}&consultant=${consultant}&consultantId=${consultantId}`,//分享地址
+      imageUrl: shareContents[0].shareContentImg || newsImg
     }
-
   }
 
   loadDetail() {
     const { newsId } = this.state
+    const router = Taro.getStorageSync('router')
+    const consultant = this.$router.params.consultant || router.query.consultant
+    const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
+    const recommender = this.$router.params.recommender || router.query.recommender || ""
     Taro.showLoading()
     queryNewsDetail(newsId).then(res => {
       Taro.hideLoading()
@@ -189,6 +193,8 @@ export default class NewsDetail extends Component {
         propertyName: '资讯详情',
         buildingId: res.buildingId,
         targetId: res.newsId,
+        consultantId: consultantId,
+        sharePersonId: recommender,
         data: '{}'
       }).then(res => {
         this.setState({
@@ -197,8 +203,7 @@ export default class NewsDetail extends Component {
         console.info('资讯详情')
       })
     })
-    const router = Taro.getStorageSync('router')
-    const consultant = this.$router.params.consultant || router.query.consultant
+
     if (consultant) {
       this.reportClientFn()
       getCardDetail(consultant).then(res => {
@@ -217,12 +222,13 @@ export default class NewsDetail extends Component {
         return
       }
       const { userInfo: { person, miniApp } } = this.props
-      const { avatarurl, nickname, personId, personType, phone, tel } = person
+      const { avatarurl, nickname, personId, personType, phone, tel, userId } = person
       const { newsId, detail: { posters, newsName, createDate } } = this.state
       const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+      const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
       const phoneNum = phone || tel
       const payload = {
-        "scene": `id=${newsId}&from=news_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}`,
+        "scene": `id=${newsId}&from=news_share&recommender=${personId}&consultant=${consultant}&phoneNum=${phoneNum}&consultantId=${consultantId}`,
         "page": 'pages/news/detail/index',
       }
       const _avatarurl = getDownloadURL(avatarurl, 'avatar');

src/pages/person/menus.js

@@ -17,7 +17,7 @@ const icons = {
   consultant: require('@assets/mine/consultant.png'),
   customerAnalysis: require('@assets/mine/customerAnalysis.png'),
   fenxi: require('@assets/mine/fenxi.png'),
-  share: require('@assets/mine/accessrecord.png'),
+  share: require('@assets/mine/share.png'),
 }
 
 const DRIFT = ROLE_CODE['DRIFT']