commit

src/onlineSelling/pages/detail/index.js

@@ -117,18 +117,24 @@ export default class Index extends Component {
     Taro.navigateTo({ url: url })
   }
   open() {
-    const { userInfo: { miniApp: { tpls } } } = this.props
-  
-    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
-    const that = this
-    wx.requestSubscribeMessage({
-      tmplIds: [tplId],
-      success(res) { },
-      fail(res) { },
-      complete() {
-        that.setState({ popVisiable: true })
-      }
-    })
+    const { houseDetail: { isPreselect } } = this.state
+    if (!isPreselect) {
+      const { userInfo: { miniApp: { tpls } } } = this.props
+
+      const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
+      const that = this
+      wx.requestSubscribeMessage({
+        tmplIds: [tplId],
+        success(res) { },
+        fail(res) { },
+        complete() {
+          that.setState({ popVisiable: true })
+        }
+      })
+    } else {
+      that.setState({ popVisiable: true })
+    }
+
   }
 
 

src/onlineSelling/pages/houseList/index.js

@@ -25,6 +25,14 @@ import './index.scss'
 import { Loading } from '@/components/Loading'
 
 @connect(s => s.user)
+@withDetail({
+  track: {
+    event: 'house_list',
+    eventType: 'house',
+    propertyName: '查看房源列表',
+    data: '{}',
+  }
+})
 export default class HouseList extends Component {
   config = {
     navigationBarTitleText: '房源',
@@ -63,6 +71,7 @@ export default class HouseList extends Component {
       this.initPageData()
     })
   }
+  
 
   componentWillReceiveProps() {
     this.reportClientFn()
@@ -107,6 +116,7 @@ export default class HouseList extends Component {
       this.getInfo(id)
       this.anotherInfo(id)
     }
+    this._$_dataReady()
   }
 
   getInfo(id) {

src/onlineSelling/pages/live/index.js

@@ -21,6 +21,15 @@ import './index.scss'
 const bgImg = "https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
 
 @connect(s => s.user)
+@withDetail({
+  track: {
+    event: 'detail',
+    eventType: 'activity',
+    targetType: 'live',
+    propertyName: '查看直播详情页',
+    data: '{}',
+  }
+})
 export default class livePage extends Component {
   config = {
     navigationBarTitleText: '直播活动详情',
@@ -89,6 +98,7 @@ export default class livePage extends Component {
     } else {
       this.anotherInfo(id)
     }
+    this._$_dataReady()
   }
 
 
@@ -138,7 +148,7 @@ export default class livePage extends Component {
     if (liveAppAppId && liveAppPath) {
       const id = this.$router.params.id || this.state.liveDetail.liveActivityId
       addLiveNum(id).then(res => { })
-   
+
       Taro.navigateToMiniProgram({
         appId: liveAppAppId,
         path: liveAppPath,

src/pages/project/floor/index.js

@@ -72,7 +72,7 @@ export default class Index extends Component {
           </View>
           <View className='item'>
             <Text className='txt left-txt'>物业类型</Text>
-            <Text className='txt right-txt'>{projectDetail.serviceCompany || '暂无'}</Text>
+            <Text className='txt right-txt'>{projectDetail.propertyType || '暂无'}</Text>
           </View>
           <View className='item'>
             <Text className='txt left-txt'>物业费</Text>