浏览代码

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

zhoulisen 5 年前
父节点
当前提交
c781a7bafd

+ 5
- 3
src/pages/activity/detail/assemble.js 查看文件

114
 
114
 
115
       if (this.$router.params.scene) {
115
       if (this.$router.params.scene) {
116
         getQrCodeParams(this.$router.params.scene).then(res => {
116
         getQrCodeParams(this.$router.params.scene).then(res => {
117
-          console.log(res,"扫码参数")
117
+          console.log(res, "扫码参数")
118
           this.setState({ id: res.id, recordId: res.recordId, qrcodeParams: res }, () => {
118
           this.setState({ id: res.id, recordId: res.recordId, qrcodeParams: res }, () => {
119
             this.loadDetail()
119
             this.loadDetail()
120
           })
120
           })
207
       posterVisible: !posterVisible,
207
       posterVisible: !posterVisible,
208
       actionSheetVisible: showActionSheet,
208
       actionSheetVisible: showActionSheet,
209
     })
209
     })
210
-    const { detail: { groupActivityId } } = this.state
210
+    const { detail: { groupActivityId, buildingId } } = this.state
211
 
211
 
212
 
212
 
213
     shareSavePoint({
213
     shareSavePoint({
216
       targetType: 'group',
216
       targetType: 'group',
217
       propertyName: '生成拼团活动详情海报',
217
       propertyName: '生成拼团活动详情海报',
218
       targetId: groupActivityId,
218
       targetId: groupActivityId,
219
+      buildingId: buildingId || '',
219
       data: '{}'
220
       data: '{}'
220
     }, 'group')
221
     }, 'group')
221
     // savePoint({
222
     // savePoint({
386
   }
387
   }
387
 
388
 
388
   onShareAppMessage = (res) => {
389
   onShareAppMessage = (res) => {
389
-    const { shares, detail: { groupActivityId, activityName, mainImg } } = this.state
390
+    const { shares, detail: { groupActivityId, activityName, mainImg, buildingId } } = this.state
390
     const currentPage = `/${this.currentPageAndParams(res.from).join('?')}`
391
     const currentPage = `/${this.currentPageAndParams(res.from).join('?')}`
391
     const { userInfo: { person: { personId, personType, userId } } } = this.props
392
     const { userInfo: { person: { personId, personType, userId } } } = this.props
392
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
393
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
399
       consultantId: consultantId,
400
       consultantId: consultantId,
400
       sharePersonId: personId,
401
       sharePersonId: personId,
401
       targetId: groupActivityId,
402
       targetId: groupActivityId,
403
+      buildingId: buildingId || '',
402
       data: '{}'
404
       data: '{}'
403
     }, 'group')
405
     }, 'group')
404
 
406
 

+ 6
- 4
src/pages/activity/detail/assistance.js 查看文件

117
 
117
 
118
       if (this.$router.params.scene) {
118
       if (this.$router.params.scene) {
119
         getQrCodeParams(this.$router.params.scene).then(res => {
119
         getQrCodeParams(this.$router.params.scene).then(res => {
120
-          console.log(res,"扫码参数")
120
+          console.log(res, "扫码参数")
121
           this.setState({ id: res.id, initiateId: res.initiateId, qrcodeParams: res, }, () => {
121
           this.setState({ id: res.id, initiateId: res.initiateId, qrcodeParams: res, }, () => {
122
             this.loadDetail()
122
             this.loadDetail()
123
           })
123
           })
210
       posterVisible: !posterVisible,
210
       posterVisible: !posterVisible,
211
       actionSheetVisible: showActionSheet,
211
       actionSheetVisible: showActionSheet,
212
     })
212
     })
213
-    const { id } = this.state
213
+    const { id, detail: { buildingId } } = this.state
214
 
214
 
215
     shareSavePoint({
215
     shareSavePoint({
216
       event: 'poster',
216
       event: 'poster',
218
       targetType: 'help',
218
       targetType: 'help',
219
       propertyName: '生成助力活动详情海报',
219
       propertyName: '生成助力活动详情海报',
220
       targetId: id,
220
       targetId: id,
221
+      buildingId: buildingId || '',
221
       data: '{}'
222
       data: '{}'
222
     }, 'help')
223
     }, 'help')
223
     // savePoint({
224
     // savePoint({
327
         eventType: 'activity',
328
         eventType: 'activity',
328
         targetType: 'help',
329
         targetType: 'help',
329
         propertyName: '助力详情',
330
         propertyName: '助力详情',
330
-        buildingId: res.helpActivity.buildingId,
331
+        buildingId: res.helpActivity.buildingId || '',
331
         consultantId: consultantId,
332
         consultantId: consultantId,
332
         sharePersonId: recommender,
333
         sharePersonId: recommender,
333
         targetId: id,
334
         targetId: id,
392
 
393
 
393
   onShareAppMessage = (res) => {
394
   onShareAppMessage = (res) => {
394
 
395
 
395
-    const { shares, id, detail: { title, img } } = this.state
396
+    const { shares, id, detail: { title, img, buildingId } } = this.state
396
     const currentPage = `/${this.currentPageAndParams(res.from).join('?')}`
397
     const currentPage = `/${this.currentPageAndParams(res.from).join('?')}`
397
     const { userInfo: { person: { personId, personType, userId } } } = this.props
398
     const { userInfo: { person: { personId, personType, userId } } } = this.props
398
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
399
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
404
       consultantId: consultantId,
405
       consultantId: consultantId,
405
       sharePersonId: personId,
406
       sharePersonId: personId,
406
       targetId: id,
407
       targetId: id,
408
+      buildingId: buildingId || '',
407
       data: '{}'
409
       data: '{}'
408
     }, 'help')
410
     }, 'help')
409
 
411
 

+ 6
- 4
src/pages/activity/detail/index.js 查看文件

68
       const id = this.$router.params.id
68
       const id = this.$router.params.id
69
       if (this.$router.params.scene) {
69
       if (this.$router.params.scene) {
70
         getQrCodeParams(this.$router.params.scene).then(res => {
70
         getQrCodeParams(this.$router.params.scene).then(res => {
71
-          console.log(res,"扫码参数")
71
+          console.log(res, "扫码参数")
72
           this.setState({ id: res.id, qrcodeParams: res }, () => {
72
           this.setState({ id: res.id, qrcodeParams: res }, () => {
73
             this.loadDetail()
73
             this.loadDetail()
74
           })
74
           })
112
         eventType: 'activity',
112
         eventType: 'activity',
113
         targetType: 'dynamic',
113
         targetType: 'dynamic',
114
         propertyName: '活动详情',
114
         propertyName: '活动详情',
115
-        buildingId: res.buildingId,
115
+        buildingId: res.buildingId || '',
116
         targetId: res.dynamicId,
116
         targetId: res.dynamicId,
117
         consultantId: consultantId,
117
         consultantId: consultantId,
118
         sharePersonId: recommender,
118
         sharePersonId: recommender,
169
     }
169
     }
170
   }
170
   }
171
   onShareAppMessage = () => {
171
   onShareAppMessage = () => {
172
-    const { detail: { shareContents, title, dynamicId, imgUrl } } = this.state
172
+    const { detail: { shareContents, title, dynamicId, imgUrl, buildingId } } = this.state
173
     const { userInfo: { person: { personId, personType, userId } } } = this.props
173
     const { userInfo: { person: { personId, personType, userId } } } = this.props
174
     console.log(dynamicId, "path")
174
     console.log(dynamicId, "path")
175
     console.log(personId, "personId")
175
     console.log(personId, "personId")
183
       consultantId: consultantId,
183
       consultantId: consultantId,
184
       sharePersonId: personId,
184
       sharePersonId: personId,
185
       targetId: dynamicId,
185
       targetId: dynamicId,
186
+      buildingId: buildingId || '',
186
       data: '{}'
187
       data: '{}'
187
     }, 'activity')
188
     }, 'activity')
188
 
189
 
334
         posterVisible: !!flag
335
         posterVisible: !!flag
335
       })
336
       })
336
     }
337
     }
337
-    const { detail: { dynamicId } } = this.state
338
+    const { detail: { dynamicId, buildingId } } = this.state
338
     shareSavePoint({
339
     shareSavePoint({
339
       event: 'poster',
340
       event: 'poster',
340
       eventType: 'activity',
341
       eventType: 'activity',
341
       targetType: 'dynamic',
342
       targetType: 'dynamic',
342
       propertyName: '生成活动详情海报',
343
       propertyName: '生成活动详情海报',
343
       targetId: dynamicId,
344
       targetId: dynamicId,
345
+      buildingId: buildingId || '',
344
       data: '{}'
346
       data: '{}'
345
     }, 'activity')
347
     }, 'activity')
346
 
348
 

+ 5
- 3
src/pages/news/detail/index.js 查看文件

197
   }
197
   }
198
 
198
 
199
   onShareAppMessage = () => {
199
   onShareAppMessage = () => {
200
-    const { detail: { shareContents, newsName, newsId, newsImg } } = this.state
200
+    const { detail: { shareContents, newsName, newsId, newsImg, buildingId } } = this.state
201
     const { userInfo: { person: { personId, personType, userId } } } = this.props
201
     const { userInfo: { person: { personId, personType, userId } } } = this.props
202
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
202
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
203
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
203
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
211
       consultantId: consultantId,
211
       consultantId: consultantId,
212
       sharePersonId: personId,
212
       sharePersonId: personId,
213
       targetId: newsId,
213
       targetId: newsId,
214
+      buildingId: buildingId || '',
214
       data: '{}'
215
       data: '{}'
215
     }, 'news')
216
     }, 'news')
216
 
217
 
252
         event: 'detail',
253
         event: 'detail',
253
         eventType: 'news',
254
         eventType: 'news',
254
         propertyName: '资讯详情',
255
         propertyName: '资讯详情',
255
-        buildingId: res.buildingId,
256
+        buildingId: res.buildingId || '',
256
         targetId: res.newsId,
257
         targetId: res.newsId,
257
         consultantId: consultantId,
258
         consultantId: consultantId,
258
         sharePersonId: recommender,
259
         sharePersonId: recommender,
343
         posterVisible: !!flag
344
         posterVisible: !!flag
344
       })
345
       })
345
     }
346
     }
346
-    const { newsId } = this.state
347
+    const { newsId, detail: { buildingId } } = this.state
347
     shareSavePoint({
348
     shareSavePoint({
348
       event: 'poster',
349
       event: 'poster',
349
       eventType: 'news',
350
       eventType: 'news',
350
       propertyName: '生成资讯详情海报',
351
       propertyName: '生成资讯详情海报',
351
       targetId: newsId,
352
       targetId: newsId,
353
+      buildingId: buildingId || '',
352
       data: '{}'
354
       data: '{}'
353
     }, 'news')
355
     }, 'news')
354
 
356
 

+ 3
- 1
src/pages/project/detail/index.js 查看文件

181
       consultantId: consultantId,
181
       consultantId: consultantId,
182
       sharePersonId: personId,
182
       sharePersonId: personId,
183
       targetId: buildingId,
183
       targetId: buildingId,
184
+      buildingId: buildingId || '',
184
       data: '{}'
185
       data: '{}'
185
     }, 'project')
186
     }, 'project')
186
 
187
 
503
       eventType: 'building',
504
       eventType: 'building',
504
       propertyName: '生成项目详情海报',
505
       propertyName: '生成项目详情海报',
505
       data: '{}',
506
       data: '{}',
506
-      targetId: buildingId
507
+      targetId: buildingId,
508
+      buildingId: buildingId || '',
507
     }, 'project')
509
     }, 'project')
508
 
510
 
509
     // addItemShareNum(buildingId)
511
     // addItemShareNum(buildingId)

+ 2
- 2
src/pages/project/h5Page.js 查看文件

142
       event: 'detail',
142
       event: 'detail',
143
       eventType: 'h5',
143
       eventType: 'h5',
144
       propertyName: 'h5详情',
144
       propertyName: 'h5详情',
145
-      buildingId: buildingId,
145
+      buildingId: buildingId || '',
146
       consultantId: consultant,
146
       consultantId: consultant,
147
       sharePersonId: sharePersonId,
147
       sharePersonId: sharePersonId,
148
       targetId: h5Id,
148
       targetId: h5Id,
171
       consultantId: consultantId,
171
       consultantId: consultantId,
172
       sharePersonId: personId,
172
       sharePersonId: personId,
173
       targetId: h5Id,
173
       targetId: h5Id,
174
-      buildingId: buildingId,
174
+      buildingId: buildingId || '',
175
       data: '{}'
175
       data: '{}'
176
     }, 'h5')
176
     }, 'h5')
177
     // savePoint({
177
     // savePoint({