xujing 5 anos atrás
pai
commit
acae50c46f

+ 2
- 0
config/dev.js Ver arquivo

@@ -7,6 +7,8 @@ module.exports = {
7 7
     WSS_HOST: '"wss://dev.fangdeal.cn"',
8 8
     // HOST: '"http://192.168.0.195:8080"', //魏超
9 9
     // WSS_HOST: '"ws://192.168.0.195:8080"',
10
+    // HOST: '"http://192.168.0.144:8080"', //顾邵勇
11
+    // WSS_HOST: '"ws://192.168.0.144:8080"',
10 12
     OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
11 13
     OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
12 14
     Version: "V3.5.28"

+ 16
- 10
src/app.js Ver arquivo

@@ -197,6 +197,8 @@ class App extends Component {
197 197
     })
198 198
   }
199 199
 
200
+  _mounted = false
201
+
200 202
   initData() {
201 203
     console.info('router1', this.$router)
202 204
     console.info('ready status1', ready)
@@ -229,16 +231,20 @@ class App extends Component {
229 231
           console.log(payload, "payloadpayloadpayloadpayloadpayloadpayloadpayload")
230 232
 
231 233
           // 清空本地缓存
232
-          Taro.removeStorageSync('activityPageIndex')
233
-          Taro.removeStorageSync('newsPageIndex')
234
-          Taro.removeStorageSync('buildingPageIndex')
235
-          Taro.removeStorageSync('followPageIndex')
236
-          Taro.removeStorageSync('clinchPageIndex')
237
-          // Taro.removeStorageSync('extendContent')
238
-          Taro.setStorageSync('extendContent', [])
239
-          // 获取分享人
240
-          Taro.setStorageSync('recommender', payload.recommender)
241
-          Taro.setStorageSync('consultantId', payload.consultant)
234
+          if (!this._mounted) {
235
+
236
+            Taro.removeStorageSync('activityPageIndex')
237
+            Taro.removeStorageSync('newsPageIndex')
238
+            Taro.removeStorageSync('buildingPageIndex')
239
+            Taro.removeStorageSync('followPageIndex')
240
+            Taro.removeStorageSync('clinchPageIndex')
241
+            // Taro.removeStorageSync('extendContent')
242
+            Taro.setStorageSync('extendContent', [])
243
+            // 获取分享人
244
+            Taro.setStorageSync('recommender', payload.recommender)
245
+            Taro.setStorageSync('consultantId', payload.consultant)
246
+            this._mounted = true
247
+          }
242 248
 
243 249
           // 获取未读消息
244 250
           const { person: { personId } } = res

+ 4
- 2
src/onlineSelling/pages/houseList/index.js Ver arquivo

@@ -669,7 +669,8 @@ export default class HouseList extends Component {
669 669
       loading,
670 670
       salesBatchDetail,
671 671
       buildingId,
672
-      dataType
672
+      dataType,
673
+      queryInfo
673 674
     } = this.state
674 675
     const buildingIdProps = this.$router.params.buildingId || buildingId
675 676
     const salesBatchId = this.$router.params.id || this.state.id
@@ -690,8 +691,9 @@ export default class HouseList extends Component {
690 691
       targetName: salesBatchDetail.salesBatchName || '',
691 692
       targetType: 'house',
692 693
       targetId: salesBatchDetail.salesBatchId || salesBatchId || '',
694
+      ...queryInfo
693 695
     }
694
-    console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
696
+
695 697
     return (
696 698
       <Block>
697 699
         {conditionVisible && this.renderCondition()}

+ 3
- 2
src/onlineSelling/pages/live/index.js Ver arquivo

@@ -350,7 +350,8 @@ export default class livePage extends Component {
350 350
       posterData,
351 351
       posterConfig,
352 352
       liveDetail,
353
-      noRecord
353
+      noRecord,
354
+      queryInfo
354 355
     } = this.state
355 356
 
356 357
     const { userInfo: { person } } = this.props
@@ -361,8 +362,8 @@ export default class livePage extends Component {
361 362
       targetName: liveDetail.liveActivityTitle || '',
362 363
       targetType: 'live',
363 364
       targetId: liveDetail.liveActivityId || '',
365
+      ...queryInfo
364 366
     }
365
-    console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParamsachieveParams")
366 367
     return (
367 368
       <Block>
368 369
         {/* 授权电话与头像 */}

+ 3
- 1
src/pages/activity/detail/assemble.js Ver arquivo

@@ -672,7 +672,8 @@ export default class Detail extends Component {
672 672
       ltTicker,
673 673
       consultData,
674 674
       consultShow,
675
-      id
675
+      id,
676
+      queryInfo
676 677
     } = this.state
677 678
 
678 679
     const { userInfo } = this.props
@@ -704,6 +705,7 @@ export default class Detail extends Component {
704 705
       targetName: detail.activityName || '',
705 706
       targetType: 'group',
706 707
       targetId: id || detail.groupActivityId || '',
708
+      ...queryInfo
707 709
     }
708 710
     return (
709 711
       <Block>

+ 3
- 1
src/pages/activity/detail/assistance.js Ver arquivo

@@ -660,7 +660,8 @@ export default class Detail extends Component {
660 660
       ltTicker,
661 661
       consultData,
662 662
       consultShow,
663
-      id
663
+      id,
664
+      queryInfo
664 665
     } = this.state
665 666
 
666 667
     const { userInfo } = this.props
@@ -685,6 +686,7 @@ export default class Detail extends Component {
685 686
       targetName: detail.title || '',
686 687
       targetType: 'help',
687 688
       targetId: id || detail.helpActivityId || '',
689
+      ...queryInfo
688 690
     }
689 691
 
690 692
     return (

+ 2
- 1
src/pages/activity/detail/index.js Ver arquivo

@@ -464,7 +464,7 @@ export default class Detail extends Component {
464 464
   }
465 465
 
466 466
   render() {
467
-    const { detail, loaded, isSaved, isSign, posterVisible, posterData, posterShow, consultData, consultShow, grantPhoneVisible, grantAvatarVisible } = this.state
467
+    const { detail, loaded, isSaved, isSign, posterVisible, posterData,queryInfo, posterShow, consultData, consultShow, grantPhoneVisible, grantAvatarVisible } = this.state
468 468
     const { userInfo = {} } = this.props
469 469
     const { person: { phone, personId, nickname, name, tel } = {} } = userInfo
470 470
 
@@ -473,6 +473,7 @@ export default class Detail extends Component {
473 473
       targetName: detail.title || '',
474 474
       targetType: 'activity',
475 475
       targetId: detail.dynamicId || '',
476
+      ...queryInfo
476 477
     }
477 478
     console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
478 479
 

+ 2
- 1
src/pages/card/index.js Ver arquivo

@@ -558,7 +558,7 @@ export default class Index extends Component {
558 558
   }
559 559
 
560 560
   render() {
561
-    const { makePosterStatus, posterData, grantPhoneVisible, grantAvatarVisible, cardId } = this.state
561
+    const { makePosterStatus, posterData, grantPhoneVisible, grantAvatarVisible, cardId,queryInfo } = this.state
562 562
     const { userInfo, cardInfo, projectDetail } = this.props
563 563
     const { person: { personType, personId, phone, tel } } = userInfo
564 564
     const { unReadNum, picture, visitors, id, isReport } = cardInfo
@@ -575,6 +575,7 @@ export default class Index extends Component {
575 575
       targetName: '个人主页',
576 576
       targetType: 'other',
577 577
       targetId: cardId || '',
578
+      ...queryInfo
578 579
     }
579 580
     console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
580 581
     return (

+ 3
- 1
src/pages/news/detail/index.js Ver arquivo

@@ -381,7 +381,7 @@ export default class NewsDetail extends Component {
381 381
     Taro.navigateTo({ url: `/pages/project/detail/index?id=${buildingId}` })
382 382
   }
383 383
   render() {
384
-    const { webViewVisible, grantPhoneVisible, grantAvatarVisible, detail, loaded, isSaved, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
384
+    const { webViewVisible, grantPhoneVisible, grantAvatarVisible, detail, queryInfo, loaded, isSaved, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
385 385
     const { userInfo = { person: {} }, cardInfo, projectDetail = {} } = this.props
386 386
 
387 387
     const achieveParams = {
@@ -389,6 +389,8 @@ export default class NewsDetail extends Component {
389 389
       targetName: detail.newsName || '',
390 390
       targetType: 'news',
391 391
       targetId: detail.newsId || '',
392
+      ...queryInfo
393
+
392 394
     }
393 395
     console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
394 396
     return (

+ 2
- 1
src/pages/project/detail/index.js Ver arquivo

@@ -1621,7 +1621,7 @@ export default class Index extends Component {
1621 1621
     )
1622 1622
   }
1623 1623
   render() {
1624
-    const { grantPhoneVisible, grantAvatarVisible, maskVisible, posterStatus, posterData, loaded, btnstate, consultData, consultShow } = this.state
1624
+    const { grantPhoneVisible, grantAvatarVisible, maskVisible, queryInfo, posterStatus, posterData, loaded, btnstate, consultData, consultShow } = this.state
1625 1625
     const { projectDetail, userInfo = { person: {} } } = this.props
1626 1626
     const { uvList = {} } = projectDetail
1627 1627
     const { total = 0, records = [] } = uvList
@@ -1636,6 +1636,7 @@ export default class Index extends Component {
1636 1636
       targetName: projectDetail.buildingName || '',
1637 1637
       targetType: 'building',
1638 1638
       targetId: projectDetail.buildingId || '',
1639
+      ...queryInfo
1639 1640
     }
1640 1641
     console.log(achieveParams, "achieveParamsachieveParamsachieveParamsachieveParams")
1641 1642
     return (

+ 3
- 2
src/pages/project/h5Page.js Ver arquivo

@@ -351,7 +351,7 @@ export default class Index extends Component {
351 351
   }
352 352
   // 授权手机号
353 353
   getPhoneNumber(e) {
354
-    const { buildingId, pageInfo } = this.state;
354
+    const { buildingId, pageInfo, queryInfo } = this.state;
355 355
     const loadOptions = wx.getLaunchOptionsSync();
356 356
     const achieveParams = {
357 357
       buildingId: buildingId || "",
@@ -359,7 +359,8 @@ export default class Index extends Component {
359 359
       targetType: "h5",
360 360
       targetId: pageInfo.drainageId || "",
361 361
       promoter: Taro.getStorageSync("recommender"),
362
-      sceneId: loadOptions.scene
362
+      sceneId: loadOptions.scene,
363
+      ...queryInfo
363 364
     };
364 365
     console.log(
365 366
       achieveParams,