xujing 5 vuotta sitten
vanhempi
commit
5f72432dbc

+ 4
- 4
config/dev.js Näytä tiedosto

3
     NODE_ENV: '"development"'
3
     NODE_ENV: '"development"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    // HOST: '"https://dev.fangdeal.cn"', //测试
7
-    // WSS_HOST: '"wss://dev.fangdeal.cn"',
8
-    HOST: '"http://192.168.2.43:8080"',
9
-    WSS_HOST: '"ws://192.168.2.43:8080"',
6
+    HOST: '"https://dev.fangdeal.cn"', //测试
7
+    WSS_HOST: '"wss://dev.fangdeal.cn"',
8
+    // HOST: '"http://192.168.1.100:8080"',
9
+    // WSS_HOST: '"ws://192.168.1.100:8080"',
10
     OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
10
     OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
11
     OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
11
     OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
12
     Version: "V3.5.28"
12
     Version: "V3.5.28"

+ 1
- 1
src/pages/activity/detail/assemble.js Näytä tiedosto

309
     // const consultant = this.$router.params.consultant || qrcodeParams.consultant
309
     // const consultant = this.$router.params.consultant || qrcodeParams.consultant
310
     const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
310
     const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
311
     const recommender = this.$router.params.recommender || qrcodeParams.recommender || ""
311
     const recommender = this.$router.params.recommender || qrcodeParams.recommender || ""
312
-    getGroupDetail(id, recordI, queryInfo).then(res => {
312
+    getGroupDetail(id, recordId, queryInfo).then(res => {
313
       this.stopTicker()
313
       this.stopTicker()
314
 
314
 
315
       const recordDetail = res.taShareRecord || {}
315
       const recordDetail = res.taShareRecord || {}

+ 18
- 7
src/pages/news/detail/index.js Näytä tiedosto

56
     grantPhoneVisible: false, // 授权电话
56
     grantPhoneVisible: false, // 授权电话
57
     grantAvatarVisible: false, // 授权头像
57
     grantAvatarVisible: false, // 授权头像
58
     webViewVisible: false,
58
     webViewVisible: false,
59
+    queryInfo: {}
59
   }
60
   }
60
 
61
 
61
   componentWillMount(options) {
62
   componentWillMount(options) {
71
       if (this.$router.params.scene) {
72
       if (this.$router.params.scene) {
72
         getQrCodeParams(this.$router.params.scene).then(res => {
73
         getQrCodeParams(this.$router.params.scene).then(res => {
73
           console.log(res, "扫码参数")
74
           console.log(res, "扫码参数")
74
-          this.setState({ newsId: res.id, qrcodeParams: res }, () => {
75
+          this.setState({
76
+            newsId: res.id,
77
+            qrcodeParams: res,
78
+            queryInfo: {
79
+              channelId: res.channelId || '',
80
+              qrCodeId: res.qrCodeId || '',
81
+              scene: this.$router.params.scene,
82
+            }
83
+          }, () => {
75
             this.loadDetail()
84
             this.loadDetail()
76
             addNewsUv(res.id)
85
             addNewsUv(res.id)
77
           })
86
           })
204
   }
213
   }
205
 
214
 
206
   onShareAppMessage = () => {
215
   onShareAppMessage = () => {
207
-    const { detail: { shareContents, newsName, newsId, newsImg, buildingId } } = this.state
216
+    const { detail: { shareContents, newsName, newsId, newsImg, buildingId }, queryInfo } = this.state
208
     const { userInfo: { person: { personId, personType, userId } } } = this.props
217
     const { userInfo: { person: { personId, personType, userId } } } = this.props
209
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
218
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
210
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
219
     const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
219
       sharePersonId: personId,
228
       sharePersonId: personId,
220
       targetId: newsId,
229
       targetId: newsId,
221
       buildingId: buildingId || '',
230
       buildingId: buildingId || '',
222
-      data: '{}'
231
+      data: '{}',
232
+      ...queryInfo
223
     }, 'news')
233
     }, 'news')
224
 
234
 
225
     // addNewsShareNum(newsId)
235
     // addNewsShareNum(newsId)
247
   }
257
   }
248
 
258
 
249
   loadDetail() {
259
   loadDetail() {
250
-    const { newsId, qrcodeParams } = this.state
260
+    const { newsId, qrcodeParams, queryInfo } = this.state
251
     const consultant = Taro.getStorageSync('consultantId') || ''
261
     const consultant = Taro.getStorageSync('consultantId') || ''
252
     // const consultant = this.$router.params.consultant || qrcodeParams.consultant
262
     // const consultant = this.$router.params.consultant || qrcodeParams.consultant
253
     const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
263
     const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
255
     const { dispatchProjectDetail } = this.props
265
     const { dispatchProjectDetail } = this.props
256
     Taro.showLoading()
266
     Taro.showLoading()
257
     console.log(newsId, "newsIdnewsIdnewsIdnewsIdnewsId")
267
     console.log(newsId, "newsIdnewsIdnewsIdnewsIdnewsId")
258
-    queryNewsDetail(newsId).then(res => {
268
+    queryNewsDetail(newsId, queryInfo).then(res => {
259
       Taro.hideLoading()
269
       Taro.hideLoading()
260
       // 埋点
270
       // 埋点
261
       savePoint({
271
       savePoint({
356
         posterVisible: !!flag
366
         posterVisible: !!flag
357
       })
367
       })
358
     }
368
     }
359
-    const { newsId, detail: { buildingId } } = this.state
369
+    const { newsId, detail: { buildingId }, queryInfo } = this.state
360
     shareSavePoint({
370
     shareSavePoint({
361
       event: 'poster',
371
       event: 'poster',
362
       eventType: 'news',
372
       eventType: 'news',
363
       propertyName: '生成资讯详情海报',
373
       propertyName: '生成资讯详情海报',
364
       targetId: newsId,
374
       targetId: newsId,
365
       buildingId: buildingId || '',
375
       buildingId: buildingId || '',
366
-      data: '{}'
376
+      data: '{}',
377
+      ...queryInfo
367
     }, 'news')
378
     }, 'news')
368
   }
379
   }
369
   toProjectDetail = () => {
380
   toProjectDetail = () => {

+ 1
- 1
src/services/news.js Näytä tiedosto

62
  * 获取资讯详情 
62
  * 获取资讯详情 
63
  * @param {*} id
63
  * @param {*} id
64
  */
64
  */
65
-export const queryNewsDetail = id => fetch({ url: `${API_NEWS_LIST}/${id}` })
65
+export const queryNewsDetail = (id, payload) => fetch({ url: `${API_NEWS_LIST}/${id}`, payload })
66
 
66
 
67
 /**
67
 /**
68
  * 首页获取助力拼团 
68
  * 首页获取助力拼团