xujing 5 years ago
parent
commit
0c7942148a

+ 18
- 12
src/onlineSelling/pages/detail/index.js View File

117
     Taro.navigateTo({ url: url })
117
     Taro.navigateTo({ url: url })
118
   }
118
   }
119
   open() {
119
   open() {
120
-    const { userInfo: { miniApp: { tpls } } } = this.props
121
-  
122
-    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
123
-    const that = this
124
-    wx.requestSubscribeMessage({
125
-      tmplIds: [tplId],
126
-      success(res) { },
127
-      fail(res) { },
128
-      complete() {
129
-        that.setState({ popVisiable: true })
130
-      }
131
-    })
120
+    const { houseDetail: { isPreselect } } = this.state
121
+    if (!isPreselect) {
122
+      const { userInfo: { miniApp: { tpls } } } = this.props
123
+
124
+      const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
125
+      const that = this
126
+      wx.requestSubscribeMessage({
127
+        tmplIds: [tplId],
128
+        success(res) { },
129
+        fail(res) { },
130
+        complete() {
131
+          that.setState({ popVisiable: true })
132
+        }
133
+      })
134
+    } else {
135
+      that.setState({ popVisiable: true })
136
+    }
137
+
132
   }
138
   }
133
 
139
 
134
 
140
 

+ 10
- 0
src/onlineSelling/pages/houseList/index.js View File

25
 import { Loading } from '@/components/Loading'
25
 import { Loading } from '@/components/Loading'
26
 
26
 
27
 @connect(s => s.user)
27
 @connect(s => s.user)
28
+@withDetail({
29
+  track: {
30
+    event: 'house_list',
31
+    eventType: 'house',
32
+    propertyName: '查看房源列表',
33
+    data: '{}',
34
+  }
35
+})
28
 export default class HouseList extends Component {
36
 export default class HouseList extends Component {
29
   config = {
37
   config = {
30
     navigationBarTitleText: '房源',
38
     navigationBarTitleText: '房源',
63
       this.initPageData()
71
       this.initPageData()
64
     })
72
     })
65
   }
73
   }
74
+  
66
 
75
 
67
   componentWillReceiveProps() {
76
   componentWillReceiveProps() {
68
     this.reportClientFn()
77
     this.reportClientFn()
107
       this.getInfo(id)
116
       this.getInfo(id)
108
       this.anotherInfo(id)
117
       this.anotherInfo(id)
109
     }
118
     }
119
+    this._$_dataReady()
110
   }
120
   }
111
 
121
 
112
   getInfo(id) {
122
   getInfo(id) {

+ 11
- 1
src/onlineSelling/pages/live/index.js View File

21
 const bgImg = "https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
21
 const bgImg = "https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
22
 
22
 
23
 @connect(s => s.user)
23
 @connect(s => s.user)
24
+@withDetail({
25
+  track: {
26
+    event: 'detail',
27
+    eventType: 'activity',
28
+    targetType: 'live',
29
+    propertyName: '查看直播详情页',
30
+    data: '{}',
31
+  }
32
+})
24
 export default class livePage extends Component {
33
 export default class livePage extends Component {
25
   config = {
34
   config = {
26
     navigationBarTitleText: '直播活动详情',
35
     navigationBarTitleText: '直播活动详情',
89
     } else {
98
     } else {
90
       this.anotherInfo(id)
99
       this.anotherInfo(id)
91
     }
100
     }
101
+    this._$_dataReady()
92
   }
102
   }
93
 
103
 
94
 
104
 
138
     if (liveAppAppId && liveAppPath) {
148
     if (liveAppAppId && liveAppPath) {
139
       const id = this.$router.params.id || this.state.liveDetail.liveActivityId
149
       const id = this.$router.params.id || this.state.liveDetail.liveActivityId
140
       addLiveNum(id).then(res => { })
150
       addLiveNum(id).then(res => { })
141
-   
151
+
142
       Taro.navigateToMiniProgram({
152
       Taro.navigateToMiniProgram({
143
         appId: liveAppAppId,
153
         appId: liveAppAppId,
144
         path: liveAppPath,
154
         path: liveAppPath,

+ 1
- 1
src/pages/project/floor/index.js View File

72
           </View>
72
           </View>
73
           <View className='item'>
73
           <View className='item'>
74
             <Text className='txt left-txt'>物业类型</Text>
74
             <Text className='txt left-txt'>物业类型</Text>
75
-            <Text className='txt right-txt'>{projectDetail.serviceCompany || '暂无'}</Text>
75
+            <Text className='txt right-txt'>{projectDetail.propertyType || '暂无'}</Text>
76
           </View>
76
           </View>
77
           <View className='item'>
77
           <View className='item'>
78
             <Text className='txt left-txt'>物业费</Text>
78
             <Text className='txt left-txt'>物业费</Text>