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

config/prod.js

@@ -9,7 +9,7 @@ module.exports = {
     WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    Version:'V3.5.5_2020-01-03'
+    Version:'V3.5.6_2020-01-08'
   },
   weapp: {},
   h5: {}

src/app.js

@@ -29,7 +29,7 @@ import {
 import { UPDATE_PRELOAD } from '@/constants/common'
 import ready from '@/utils/ready'
 import login from '@/utils/login'
-import store  from './store'
+import store from './store'
 import socket from '@/utils/im'
 
 // const store = configStore()
@@ -45,8 +45,6 @@ class App extends Component {
     pages: [
       'pages/project/index',
       'pages/project/h5Page',
-      // 'pages/person/customerAnalysis/followUpCustomer/index',
-      // 'pages/person/customerAnalysis/transactionCustomer/index',
       'pages/person/customerAnalysis/myCustomer',
       'pages/project/detail/map',
       'pages/person/myShare/accessRecord',
@@ -110,7 +108,7 @@ class App extends Component {
 
       'pages/checkin/index',
       'pages/checkin/checkinsuccess/index',
-     
+
 
     ],
     window: {
@@ -167,6 +165,20 @@ class App extends Component {
   }
 
   componentDidShow() {
+    // wx.setNavigationBarColor({
+    //   frontColor: '#ffffff',
+    //   backgroundColor: '#ff0000',
+    //   animation: {
+    //     duration: 400,
+    //     timingFunc: 'easeIn'
+    //   }
+    // })
+    // wx.setTabBarStyle({
+    //   color: '#FF0000',
+    //   selectedColor: '#00FF00',
+    //   backgroundColor: '#0000FF',
+    //   borderStyle: 'white'
+    // })
     // 埋点
     const t = setTimeout(() => {
       trackUserSource(this.$router.params).then(res => this.updateTrack = res)
@@ -225,20 +237,20 @@ class App extends Component {
     //     payload: res,
     //   })
     // })
-    // wx.setBackgroundFetchToken()
-    // wx.getBackgroundFetchData({
-    //   fetchType: 'pre',
-    //   success: (res) => {
-    //     console.log('[preload]: ', res)
-    //     store.dispatch({
-    //       type: UPDATE_PRELOAD,
-    //       payload: res.fetchedData,
-    //     })
-    //   }
-    // })
+    wx.setBackgroundFetchToken()
+    wx.getBackgroundFetchData({
+      fetchType: 'pre',
+      success: (res) => {
+        console.log('[preload]: ', res)
+        // store.dispatch({
+        //   type: UPDATE_PRELOAD,
+        //   payload: res.fetchedData,
+        // })
+      }
+    })
   }
 
-  initData () {
+  initData() {
     // console.info('app componentDidShow')
     console.info('router1', this.$router)
     console.info('ready status1', ready)
@@ -323,7 +335,7 @@ class App extends Component {
 
         resolve(router)
       }
-      
+
     })
   }
 

src/components/achieveAvatar/index.js

@@ -34,7 +34,6 @@ export default class Index extends Component {
         // 用户信息保存至服务器
         dispatchUpdateUserInfo(payload).then(res => {
           console.log('更新信息')
-          // this.toPage(true)
           this.props.onSuccess();
         })
       },
@@ -46,27 +45,9 @@ export default class Index extends Component {
           icon: 'none'
         })
         return
-        // this.toPage(false)
       }
     })
   }
-  toPage(succed) {
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const { query, path } = router
-
-    if (!succed && path === 'pages/signin/index') {
-      return
-    }
-    if (path === 'pages/project/index' || path === 'pages/shop/index' || path === 'pages/person/index') {
-      Taro.switchTab({
-        url: '/' + path
-      })
-      return
-    }
-    Taro.reLaunch({
-      url: `/${path}?${query.params}`
-    })
-  }
 
   renderMaskBanner() {
     return (

src/components/achievePhone/index.js

@@ -1,7 +1,7 @@
 import Taro, { Component } from '@tarojs/taro'
 import getUserPhone from '@/utils/getUserPhone'
 import './index.scss'
-
+import { rule as ruleToast } from '@/utils/ruleToast'
 const grantIcon = require('@/assets/helpgroup/shouquan.png')
 const logoImg = require('@/assets/index/logo.png')
 const bgImg = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
@@ -31,9 +31,13 @@ export default class Index extends Component {
 
         return
       } else {
-        if (typeof this.props.onSuccess === 'function') {
-          this.props.onSuccess(phoneNumber);
-        }
+        ruleToast('signup-agent')
+        setTimeout(() => {
+          if (typeof this.props.onSuccess === 'function') {
+            this.props.onSuccess(phoneNumber);
+          }
+        }, 1000)
+
       }
     })
   }

src/components/authorize/index.js

@@ -4,6 +4,7 @@ import * as actions from '@/actions/user'
 import './index.scss'
 import getUserPhone from '@/utils/getUserPhone'
 import { queryUserInfo, doUserSignin } from '@/services/user'
+import { rule as ruleToast } from '@/utils/ruleToast'
 
 @connect(state => state.user, { ...actions })
 export default class Index extends Component {
@@ -26,17 +27,21 @@ export default class Index extends Component {
         })
         return
       } else {
-        this.props.dispatchUpdateUserInfoNew(this.state.user.id)
-        console.log(this.props.from,"this.props.from")
-        if (this.props.from) {
-          Taro.reLaunch({
-            url: this.props.from
-          })
-        } else {
-          Taro.reLaunch({
-            url: '/pages/person/index'
-          })
-        }
+        ruleToast('signup-agent')
+        setTimeout(() => {
+          this.props.dispatchUpdateUserInfoNew(this.state.user.id)
+          console.log(this.props.from, "this.props.from")
+          if (this.props.from) {
+            Taro.reLaunch({
+              url: this.props.from
+            })
+          } else {
+            Taro.reLaunch({
+              url: '/pages/person/index'
+            })
+          }
+        }, 1000)
+
       }
     })
   }

src/pages/activity/detail/assemble.js

@@ -91,14 +91,6 @@ export default class Detail extends Component {
     this.stopTicker()
     this.state.pointRecordId && updatePoint(this.state.pointRecordId)
 
-    const router = Taro.getStorageSync('router') || { query: {} }
-    Taro.setStorageSync('router', {
-      ...router,
-      query: {
-        ...router.query,
-        consultant: undefined,
-      }
-    })
   }
 
   componentDidShow() {
@@ -116,9 +108,8 @@ export default class Detail extends Component {
   // 初始化页面数据
   initPageData = () => {
     if (!this.state.detail.groupActivityId) {
-      const router = Taro.getStorageSync('router') || { query: {} }
-      let id = this.$router.params.id || router.query.id
-      let recordId = this.$router.params.recordId || router.query.recordId
+      let id = this.$router.params.id
+      let recordId = this.$router.params.recordId
 
       if (this.$router.params.scene) {
         getQrCodeParams(this.$router.params.scene).then(res => {
@@ -213,6 +204,15 @@ export default class Detail extends Component {
       posterVisible: !posterVisible,
       actionSheetVisible: showActionSheet,
     })
+    savePoint({
+      event: 'poster',
+      eventType: 'activity',
+      targetType:'group',
+      propertyName: '生成拼团活动详情海报',
+      data: '{}'
+    }).then(res => {
+      console.log('生成拼团活动详情海报')
+    })
   }
 
   compActState = (startDate, endDate) => {
@@ -268,10 +268,9 @@ export default class Detail extends Component {
     const { userInfo } = this.props
 
     Taro.showLoading()
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant || qrcodeParams.consultant
-    const consultantId = this.$router.params.consultantId || router.query.consultantId || qrcodeParams.consultantId || ""
-    const recommender = this.$router.params.recommender || router.query.recommender || qrcodeParams.recommender || ""
+    const consultant = this.$router.params.consultant || qrcodeParams.consultant
+    const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
+    const recommender = this.$router.params.recommender || qrcodeParams.recommender || ""
     getGroupDetail(id, recordId).then(res => {
       this.stopTicker()
 
@@ -308,7 +307,8 @@ export default class Detail extends Component {
 
       savePoint({
         event: 'detail',
-        eventType: 'group',
+        eventType: 'activity',
+        targetType:'group',
         propertyName: '拼团详情',
         buildingId: res.taShareActivity.buildingId,
         consultantId: consultantId,
@@ -334,8 +334,7 @@ export default class Detail extends Component {
 
   // 报备客户
   reportClientFn() {
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant || ""
+    const consultant = this.$router.params.consultant || ""
     const { userInfo: { person } } = this.props
 
     if (!this.state.reportedCustomer) {
@@ -379,7 +378,8 @@ export default class Detail extends Component {
 
     savePoint({
       event: 'share',
-      eventType: 'group',
+      eventType: 'activity',
+      targetType:'group',
       propertyName: '拼团详情分享',
       consultantId: consultantId,
       sharePersonId: personId,
@@ -444,7 +444,16 @@ export default class Detail extends Component {
                     recordId: res.taShareRecord.recordId,
                     groupState: res.taShareRecord.status,
                   })
-
+                  savePoint({
+                    event: 'enlist',
+                    eventType: 'activity',
+                    targetType:'group',
+                    propertyName: '拼团活动报名',
+                    data: '{}'
+
+                  }).then(res => {
+                    console.log('拼团活动报名 ')
+                  })
                   Taro.showToast({
                     title: '参团成功',
                     icon: 'success'
@@ -509,7 +518,16 @@ export default class Detail extends Component {
                     isStarter: true,
                     groupState: res.taShareRecord.status,
                   }, () => { that.cb && that.cb() })
-
+                  savePoint({
+                    event: 'enlist',
+                    eventType: 'activity',
+                    targetType:'group',
+                    propertyName: '拼团活动报名',
+                    data: '{}'
+
+                  }).then(res => {
+                    console.log('拼团活动报名 ')
+                  })
                 }).catch(err => {
                   console.log(err, '11111111111111')
                   Taro.showToast({

src/pages/activity/detail/assistance.js

@@ -93,14 +93,7 @@ export default class Detail extends Component {
     this.stopTicker()
     this.state.pointRecordId && updatePoint(this.state.pointRecordId)
 
-    const router = Taro.getStorageSync('router') || { query: {} }
-    Taro.setStorageSync('router', {
-      ...router,
-      query: {
-        ...router.query,
-        consultant: undefined,
-      }
-    })
+
   }
 
   componentDidShow() {
@@ -118,9 +111,8 @@ export default class Detail extends Component {
   // 初始化页面数据
   initPageData = () => {
     if (!this.state.detail.helpActivityId) {
-      const router = Taro.getStorageSync('router') || { query: {} }
-      let id = this.$router.params.id || router.query.id
-      let initiateId = this.$router.params.initiateId || router.query.initiateId
+      let id = this.$router.params.id
+      let initiateId = this.$router.params.initiateId
 
       if (this.$router.params.scene) {
         getQrCodeParams(this.$router.params.scene).then(res => {
@@ -215,6 +207,15 @@ export default class Detail extends Component {
       posterVisible: !posterVisible,
       actionSheetVisible: showActionSheet,
     })
+    savePoint({
+      event: 'poster',
+      eventType: 'activity',
+      targetType:'help',
+      propertyName: '生成助力活动详情海报',
+      data: '{}'
+    }).then(res => {
+      console.log('生成助力活动详情海报')
+    })
   }
 
   compActState = (startDate, endDate) => {
@@ -269,12 +270,10 @@ export default class Detail extends Component {
   loadDetail() {
     let { id, initiateId, ltTicker, qrcodeParams } = this.state
     const { userInfo } = this.props
-
     Taro.showLoading()
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant || qrcodeParams.consultant
-    const consultantId = this.$router.params.consultantId || router.query.consultantId || qrcodeParams.consultantId || ""
-    const recommender = this.$router.params.recommender || router.query.recommender || qrcodeParams.recommender || ""
+    const consultant = this.$router.params.consultant || qrcodeParams.consultant
+    const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
+    const recommender = this.$router.params.recommender || qrcodeParams.recommender || ""
     getHelpDetail(id, initiateId).then(res => {
       this.stopTicker()
 
@@ -312,7 +311,8 @@ export default class Detail extends Component {
 
       savePoint({
         event: 'detail',
-        eventType: 'help',
+        eventType: 'activity',
+        targetType:'help',
         propertyName: '助力详情',
         buildingId: res.helpActivity.buildingId,
         consultantId: consultantId,
@@ -338,8 +338,8 @@ export default class Detail extends Component {
 
   // 报备客户
   reportClientFn() {
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant || ""
+
+    const consultant = this.$router.params.consultant || ""
     const { userInfo: { person } } = this.props
 
     if (!this.state.reportedCustomer) {
@@ -385,7 +385,8 @@ export default class Detail extends Component {
 
     savePoint({
       event: 'share',
-      eventType: 'help',
+      eventType: 'activity',
+      targetType:'help',
       propertyName: '助力详情分享',
       consultantId: consultantId,
       sharePersonId: personId,
@@ -498,6 +499,15 @@ export default class Detail extends Component {
             isStarter: true,
             helpState: res.helpInitiateRecord.status === undefined ? HelpInProcess : res.helpInitiateRecord.status,
           }, resolve)
+          savePoint({
+            event: 'enlist',
+            eventType: 'activity',
+            targetType:'help',
+            propertyName: '助力活动报名',
+            data: '{}'
+          }).then(res => {
+            console.log('助力活动报名 ')
+          })
         }).catch(err => {
           console.log('err:', err)
           Taro.showToast({

src/pages/activity/detail/index.js

@@ -13,6 +13,7 @@ import { getQrCodeParams } from '@/utils/qrcode'
 import { getCardDetail } from '@/services/card'
 import { ROLE_CODE } from '@/constants/user'
 import Consultant from '@/components/consultant'
+import { rule as ruleToast } from '@/utils/ruleToast'
 import {
   addActivityShareNum,
   signupActivity,
@@ -56,8 +57,7 @@ export default class Detail extends Component {
 
   componentWillMount() {
     ready.queue(() => {
-      const router = Taro.getStorageSync('router') || { query: {} }
-      const id = this.$router.params.id || router.query.id
+      const id = this.$router.params.id
       if (this.$router.params.scene) {
         getQrCodeParams(this.$router.params.scene).then(res => {
           this.setState({ id: res.id, qrcodeParams: res }, () => {
@@ -80,14 +80,6 @@ export default class Detail extends Component {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
 
-    const router = Taro.getStorageSync('router') || { query: {} }
-    Taro.setStorageSync('router', {
-      ...router,
-      query: {
-        ...router.query,
-        consultant: undefined,
-      }
-    })
   }
 
   componentWillReceiveProps() {
@@ -97,10 +89,9 @@ export default class Detail extends Component {
   loadDetail() {
     const { id, qrcodeParams } = this.state
     Taro.showLoading()
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant || qrcodeParams.consultant
-    const consultantId = this.$router.params.consultantId || router.query.consultantId || qrcodeParams.consultantId || ""
-    const recommender = this.$router.params.recommender || router.query.recommender || qrcodeParams.recommender || ""
+    const consultant = this.$router.params.consultant || qrcodeParams.consultant
+    const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
+    const recommender = this.$router.params.recommender || qrcodeParams.recommender || ""
 
     queryActivityDetail(id).then(res => {
       Taro.hideLoading()
@@ -109,6 +100,7 @@ export default class Detail extends Component {
       savePoint({
         event: 'detail',
         eventType: 'activity',
+        targetType: 'dynamic',
         propertyName: '活动详情',
         buildingId: res.buildingId,
         targetId: res.dynamicId,
@@ -156,8 +148,7 @@ export default class Detail extends Component {
 
   // 报备客户
   reportClientFn() {
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant || ""
+    const consultant = this.$router.params.consultant || ""
     const { userInfo: { person } } = this.props
 
     if (!this.state.reportedCustomer) {
@@ -178,6 +169,7 @@ export default class Detail extends Component {
     savePoint({
       event: 'share',
       eventType: 'activity',
+      targetType: 'dynamic',
       propertyName: '活动详情分享',
       consultantId: consultantId,
       sharePersonId: personId,
@@ -243,6 +235,7 @@ export default class Detail extends Component {
     savePoint({
       event: 'save',
       eventType: 'activity',
+      targetType: 'dynamic',
       propertyName: '活动详情收藏',
       data: '{}'
     }).then(res => {
@@ -253,7 +246,10 @@ export default class Detail extends Component {
   handleGetPhone(e) {
     getUserPhone(e, (phoneNumber) => {
       if (phoneNumber) {
-        this.handleSignup()
+        ruleToast('signup-agent')
+        setTimeout(() => {
+          this.handleSignup()
+        }, 1000)
       } else {
         Taro.showToast({
           title: '报名失败',
@@ -319,6 +315,7 @@ export default class Detail extends Component {
     savePoint({
       event: 'poster',
       eventType: 'activity',
+      targetType: 'dynamic',
       propertyName: '生成活动详情海报',
       data: '{}'
     }).then(res => {
@@ -385,6 +382,7 @@ export default class Detail extends Component {
     savePoint({
       event: 'enlist',
       eventType: 'activity',
+      targetType: 'dynamic',
       propertyName: '活动详情报名',
       data: '{}'
     }).then(res => {
@@ -399,11 +397,10 @@ export default class Detail extends Component {
   }
 
   render() {
-    const router = Taro.getStorageSync('router') || { query: {} }
     const { detail, loaded, isSaved, isSign, posterVisible, posterData, posterShow, consultData, consultShow } = this.state
     const { userInfo = {} } = this.props
     const { person: { phone, personId, nickname, name, tel } = {} } = userInfo
-    const consultant = this.$router.params.consultant || router.query.consultant || ""
+    const consultant = this.$router.params.consultant || ""
 
     return (
       <Block>

src/pages/agent/become/index.js

@@ -1,6 +1,6 @@
 import Taro, { Component } from '@tarojs/taro'
 import './index.scss'
-
+import { rule as ruleToast } from '@/utils/ruleToast'
 import { registerAgent } from '@/services/agent'
 import { connect } from '@tarojs/redux'
 import * as actions from '@/actions/user'
@@ -21,12 +21,12 @@ export default class Index extends Component {
     isChannel: false,
     user: {}
   }
-  componentDidMount () {
+  componentDidMount() {
     this.loadUserInfo()
 
 
   }
-  putMessage () {
+  putMessage() {
     const { recommendAgentCode, channelCode } = this.state
     const payload = {
       recommendAgentCode: recommendAgentCode,
@@ -67,7 +67,7 @@ export default class Index extends Component {
 
   //   })
   // }
-  bindInfo (e) {
+  bindInfo(e) {
     console.log(e.currentTarget.dataset.id)
     switch (e.currentTarget.dataset.id) {
       case 'recommendAgentCode':
@@ -84,10 +84,14 @@ export default class Index extends Component {
         break;
     }
   }
-  getPhoneNumber (e) {
+  getPhoneNumber(e) {
     getUserPhone(e, (phoneNumber) => {
       if (phoneNumber) {
-        this.putMessage()
+        ruleToast('signup-agent')
+        setTimeout(() => {
+          this.putMessage()
+        }, 1000)
+
       } else {
         Taro.showToast({
           title: '授权电话失败',
@@ -96,15 +100,14 @@ export default class Index extends Component {
       }
     })
   }
-  loadUserInfo () {
+  loadUserInfo() {
     queryUserInfo().then(user => {
       this.setState({
         user,
         phone: user.phone
       }, () => {
         if (user.personType == ROLE_CODE['DRIFT'] || user.personType == ROLE_CODE['CUSTOMER']) {
-          const router = Taro.getStorageSync('router') || { query: {} }
-          const code = this.$router.params.agentCode || router.query.agentCode || ''
+          const code = this.$router.params.agentCode || ''
           this.setState({
             recommendAgentCode: code
           }, () => {
@@ -118,7 +121,7 @@ export default class Index extends Component {
       })
     })
   }
-  render () {
+  render() {
     const { isChannel, recommendAgentCode } = this.state
     const { userInfo: { person: { phone } } } = this.props
     return (

src/pages/agent/recommend/index.js

@@ -4,7 +4,7 @@ import { recommendClient, getTypeData } from '@/services/client'
 import { getItemList } from '@/services/item'
 import { getCardList } from '@/services/card'
 import { savePoint, updatePoint } from '@/services/common'
-
+import { rule as ruleToast } from '@/utils/ruleToast'
 import Authorize from '@/components/authorize'
 
 import { connect } from '@tarojs/redux'
@@ -165,7 +165,6 @@ export default class Index extends Component {
     })
   }
   BindInfo(e) {
-    console.log(e, "8888888888")
     console.log(e.currentTarget.dataset.id)
     switch (e.currentTarget.dataset.id) {
       case 'name':
@@ -278,12 +277,21 @@ export default class Index extends Component {
     }
     recommendClient(param).then(res => {
       // if (res) {
-      Taro.showToast({
-        title: '提交成功'
-      })
+      ruleToast('recommend-customer')
+      if (this.state.reType == 'projectDeatil') {
+        savePoint({
+          event: 'recommend',
+          eventType: 'building',
+          propertyName: '推荐客户',
+          data: '{}'
+        }).then(res => {
+          console.log('推荐客户')
+        })
+      }
+
       setTimeout(() => {
-        Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
-      }, 700)
+        Taro.navigateTo({ url: '/pages/agent/client/index' })
+      }, 1000)
       this.clearInputEvent()
       // }
     })

src/pages/card/fans/index.js

@@ -38,30 +38,14 @@ export default class Index extends Component {
       savePoint({
         event: 'fans',
         eventType: 'card',
-        propertyName: '粉丝访问记录',
+        propertyName: '粉丝访问记录列表',
         data: '{}'
       }).then(res => {
         this.setState({
           recordId: res.recordId
         })
-        console.log('粉丝访问记录')
+        console.log('粉丝访问记录列表')
       })
-
-    } else {
-      // 埋点
-      savePoint({
-        event: 'person',
-        eventType: 'building',
-        propertyName: '项目详情围观人数',
-        data: '{}'
-      }).then(res => {
-        this.setState({
-          recordId: res.recordId
-        })
-        console.log('项目详情围观人数')
-      })
-    }
-    if (type === "card") {
       queryCardFansList(id, payload).then(res => {
         const { records } = res
 
@@ -74,7 +58,20 @@ export default class Index extends Component {
         Taro.hideLoading()
         console.log(err, '我的主页')
       })
+
     } else {
+      // 埋点
+      savePoint({
+        event: 'person',
+        eventType: 'building',
+        propertyName: '查看围观列表',
+        data: '{}'
+      }).then(res => {
+        this.setState({
+          recordId: res.recordId
+        })
+        console.log('查看围观列表')
+      })
       queryItemFansList(id, payload).then(res => {
         const { records } = res
         this.setState({
@@ -87,6 +84,7 @@ export default class Index extends Component {
         console.log(err, '我的主页')
       })
     }
+
     // return type === "card" ? queryCardFansList(id, payload) : queryItemFansList(id, payload)
   }
   componentWillUnmount() {

src/pages/card/index.js

@@ -60,8 +60,8 @@ export default class Index extends Component {
     })
   }
   initPageData() {
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const id = this.$router.params.id || router.query.id
+
+    const id = this.$router.params.id
 
     if (!id) {
       getQrCodeParams(this.$router.params.scene).then(res => {
@@ -141,11 +141,11 @@ export default class Index extends Component {
   }
 
   getLocation = () => {
-    const { cardInfo: { address, company,coordinate } } = this.props
+    const { cardInfo: { address, company, coordinate } } = this.props
     const coord = coordinate.split(',')
     const latitude = parseFloat(coord[0])
     const longitude = parseFloat(coord[1])
-    
+
     Taro.getLocation({ //返回可以用于Taro.openLocation的经纬度，官方提示bug: iOS 6.3.30 type 参数不生效，只会返回 wgs84 类型的坐标信息  
       success: function (res) {
         Taro.openLocation({

src/pages/card/list/index.js

@@ -24,8 +24,8 @@ export default class Index extends Component {
   componentWillMount() {
     savePoint({
       event: 'consultants',
-      eventType: 'card',
-      propertyName: '置业顾问列表',
+      eventType: 'building',
+      propertyName: '查看置业顾问列表',
       data: '{}'
     }).then(res => {
       this.setState({

src/pages/checkin/index.js

@@ -1,7 +1,8 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
+import { getQrCodeParams } from '@/utils/qrcode'
 import { AtDivider, AtList, AtListItem, AtGrid, AtButton } from 'taro-ui'
-
+import { rule as ruleToast } from '@/utils/ruleToast'
 // import achievePhone from '@/components/achievePhone'
 import { checkinDetails, checkinActive } from '@/services/checkin'
 import {
@@ -19,17 +20,17 @@ export default class checkin extends Component {
     data: {},
   }
 
-  componentWillMount () {
+  componentDidShow() {
+  // componentWillMount() {
     ready.queue(() => {
-      const router = Taro.getStorageSync('router') || { query: {} }
 
-      const { id = router.query.id, type = router.query.type || '' } = parseQueryString(router.query.params)
-     
+      const id = this.$router.params.id
+      const type = this.$router.params.type || ''
+
       if (!id) {
         getQrCodeParams(this.$router.params.scene).then(res => {
           this.setState({ id: res.id, type: res.type }, () => {
-            this.setState({ id, type })
-            this.getcheckinDetails(id, type)
+            this.getcheckinDetails(this.state.id, this.state.type)
           })
         }).catch(err => {
           Taro.showToast({
@@ -63,22 +64,9 @@ export default class checkin extends Component {
 
     })
 
-
-
   }
-  // const router = Taro.getStorageSync('router') || { query: {} }
-
 
-
-  // const { id = router.query.id , type = router.query.type || '' } = parseQueryString(router.query.params)
-  // console.log(id, 'id-----')
-  // this.setState({ id, type })
-  componentDidShow () {
-    // const { id, type } = this.state
-    // this.getcheckinDetails(id, type)
-  }
-  // dynamicId
-  getcheckinDetails (id, type) {
+  getcheckinDetails(id, type) {
     Taro.showLoading()
 
     checkinDetails(id, type).then(res => {
@@ -90,16 +78,18 @@ export default class checkin extends Component {
     })
   }
 
-  checkinActive () {
+  checkinActive() {
     const enlistId = this.state.data.enlist.enlistId
     Taro.showLoading()
     checkinActive(enlistId).then(res => {
       Taro.hideLoading()
+      ruleToast('activity_checkin')
 
-      // TODO: 需要依据 type 跳转
-      Taro.navigateTo({
-        url: '/pages/checkin/checkinsuccess/index?addPoints=' + res.addPoints,
-      })
+      setTimeout(() => {
+        Taro.navigateTo({
+          url: '/pages/checkin/checkinsuccess/index?addPoints=' + res.addPoints,
+        })
+      }, 700)
 
     }).catch((err) => {
       Taro.showToast({
@@ -113,15 +103,13 @@ export default class checkin extends Component {
 
   toactivity = (id) => {
     Taro.navigateTo({
-      url: '/pages/activity/detail/index',
-      query: { id }
+      url: '/pages/activity/detail/index?id=' + id,
     })
   }
 
-  render () {
+  render() {
     const { dynamic = {}, enlist = {}, person = {} } = this.state.data || {}
     const { activityStatus } = dynamic || {}
-    // console.log(enlist, 'enlist')
     return (
       <View className="checkin" style="width:100vw;height:100vh;" >
 
@@ -170,7 +158,7 @@ export default class checkin extends Component {
         </View>
           }
 
-          {activityStatus===0 &&
+          {activityStatus === 0 &&
             <View>
               <View>
                 <Image className="img1" src={require('@/assets/checkin/noentry.png')} ></Image>

src/pages/news/detail/index.js

@@ -24,10 +24,8 @@ import {
   cancelFavorNews
 } from '@/services/news'
 import { connect } from '@tarojs/redux'
-import { withUtils } from '@/utils/page'
 
 @connect(state => state.user)
-// @withUtils()
 export default class NewsDetail extends Component {
   config = {
     navigationBarTitleText: '资讯详情'
@@ -51,8 +49,6 @@ export default class NewsDetail extends Component {
   componentWillMount(options) {
     console.info('=====news ========>', this)
     ready.queue(() => {
-      const router = Taro.getStorageSync('router') || { query: {} }
-      console.info('news-1:', router)
       console.info('news-2:', this.$router)
 
       const { person = {} } = this.props.userInfo || {}
@@ -62,7 +58,7 @@ export default class NewsDetail extends Component {
         return
       }
 
-      const newsId = this.$router.params.id || router.query.id
+      const newsId = this.$router.params.id
 
       if (this.$router.params.scene) {
         getQrCodeParams(this.$router.params.scene).then(res => {
@@ -103,21 +99,11 @@ export default class NewsDetail extends Component {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
 
-    const router = Taro.getStorageSync('router') || { query: {} }
-    Taro.setStorageSync('router', {
-      ...router,
-      query: {
-        ...router.query,
-        consultant: undefined,
-      }
-    })
   }
 
   // 报备客户
   reportClientFn() {
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const consultantId = this.$router.params.consultantId || router.query.consultantId || ""
+    const consultant = this.$router.params.consultant || ""
     const { userInfo: { person } } = this.props
 
     if (!this.state.reportedCustomer) {
@@ -150,7 +136,7 @@ export default class NewsDetail extends Component {
     }
     savePoint({
       event: 'save',
-      eventType: 'activity',
+      eventType: 'news',
       propertyName: '资讯详情收藏',
       data: '{}'
     }).then(res => {
@@ -222,10 +208,9 @@ export default class NewsDetail extends Component {
 
   loadDetail() {
     const { newsId, qrcodeParams } = this.state
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant || qrcodeParams.consultant
-    const consultantId = this.$router.params.consultantId || router.query.consultantId || qrcodeParams.consultantId || ""
-    const recommender = this.$router.params.recommender || router.query.recommender || qrcodeParams.recommender || ""
+    const consultant = this.$router.params.consultant || qrcodeParams.consultant
+    const consultantId = this.$router.params.consultantId || qrcodeParams.consultantId || ""
+    const recommender = this.$router.params.recommender || qrcodeParams.recommender || ""
     Taro.showLoading()
     queryNewsDetail(newsId).then(res => {
       Taro.hideLoading()

src/pages/person/authorize/index.js

@@ -3,19 +3,19 @@ import { connect } from '@tarojs/redux'
 import * as actions from '@/actions/user'
 import './index.scss'
 import getUserPhone from '@/utils/getUserPhone'
-
+import { rule as ruleToast } from '@/utils/ruleToast'
 @connect(state => state.user, { ...actions })
 export default class Index extends Component {
   config = {
     navigationBarTitleText: '个人中心'
   }
   state = {
-  	person:''
+    person: ''
   }
   componentWillMount() {
-    const {userInfo:{person}} = this.props
+    const { userInfo: { person } } = this.props
     this.setState({
-    	person:person
+      person: person
     })
   }
 
@@ -28,26 +28,29 @@ export default class Index extends Component {
         })
         return
       }
-      Taro.reLaunch({
-        url: `/pages/project/index`
-      })
+      ruleToast('signup-agent')
+      setTimeout(() => {
+        Taro.reLaunch({
+          url: `/pages/project/index`
+        })
+      }, 1000)
     })
   }
-  
+
   handleLogin() {
     Taro.navigateTo({
       url: `/pages/person/login/index`
     })
   }
-  
+
   render() {
-  	const {person}=this.state
+    const { person } = this.state
 
     return (
       <View className='auth-page'>
-        <Image className="avatar_img" src={person.avatarurl}/>
+        <Image className="avatar_img" src={person.avatarurl} />
         <View className="user_name">{person.nickname}</View>
-        <Button  className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
+        <Button className='auth-btn' open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>微信授权一键登录</Button>
         {/* <View className='adver-btn' onClick={this.handleLogin}><Text>我是置业顾问,立即登录~</Text></View> */}
       </View>
     )

src/pages/person/customerAnalysis/followUpCustomer/index.js

@@ -15,7 +15,7 @@ const phoneImg = require('@/assets/person/dianhua.png')
 const communicateImg = require('@/assets/person/communicate.png')
 
 @connect(({ user, city }) => ({ user, city }))
-export default class transactionCustomer extends Taro.Component {
+export default class followUpCustomer extends Taro.Component {
 
   config = {
     navigationBarTitleText: '跟进客户'

src/pages/person/feedback/index.js

@@ -1,7 +1,7 @@
 import Taro, { Component } from '@tarojs/taro'
 import { isChineseMobilePhoneNumber, isEmail } from '@/utils/tools'
 import './index.scss'
-
+import { savePoint, } from '@/services/common'
 import { submitFeedBack } from '@/services/feedBack'
 export default class FeedBack extends Component {
   state = {
@@ -49,7 +49,14 @@ export default class FeedBack extends Component {
           icon: 'success',
           duration: 2000
         })
-
+        savePoint({
+          event: 'feedback',
+          eventType: 'center',
+          propertyName: '提交反馈',
+          data: '{}'
+        }).then(res => {
+          console.log('提交反馈')
+        })
         setTimeout(() => {
           Taro.navigateBack({ delta: 1 })
         }, 1000)

src/pages/person/index.js

@@ -1,6 +1,5 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
-
 import { ROLE_CODE } from '@/constants/user'
 import { queryUserInfo, doUserSignin } from '@/services/user'
 import { connect } from '@tarojs/redux'
@@ -9,9 +8,11 @@ import { getCodeMessage, putRegisterConsultant } from '@/services/getCode'
 import * as actions from '@/actions/user'
 import Authorize from '@/components/authorize'
 import { transferImage } from '@/utils/tools'
+import { savePoint, } from '@/services/common'
 import { menus } from './menus'
 import login from '@/utils/login'
 export const version = Version
+import { rule as ruleToast } from '@/utils/ruleToast'
 
 @connect(({ user, city }) => ({ user, city }), { ...actions })
 
@@ -58,8 +59,14 @@ export default class Person extends Component {
     }
 
     doUserSignin({ id }).then(res => {
-      Taro.showToast({
-        title: '签到成功'
+      ruleToast('checkin')
+      savePoint({
+        event: 'signin',
+        eventType: 'center',
+        propertyName: '签到',
+        data: '{}'
+      }).then(res => {
+        console.log('签到')
       })
       // this.setState({
       //   user: {
@@ -67,7 +74,9 @@ export default class Person extends Component {
       //   }
       // })
 
-      this.loadUserInfo()
+      setTimeout(() => {
+        this.loadUserInfo()
+      }, 500)
 
       // App.zhuge.track('签到成功')
     })

src/pages/person/profile/detail/index.js

@@ -1,15 +1,13 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import { AtImagePicker } from 'taro-ui'
-import dayjs from 'dayjs'
-
 import { getProfileDetail, editDocumentVerify } from '@/services/user'
-
 import { uploadFiles } from '@/utils/request'
 import { transferImage } from '@/utils/tools'
-
 import "taro-ui/dist/style/components/image-picker.scss";
 import "taro-ui/dist/style/components/icon.scss";
+import { savePoint, } from '@/services/common'
+import { rule as ruleToast } from '@/utils/ruleToast'
 const add = require('@/assets/add.png')
 const closeImg = require('@/assets/close.png')
 
@@ -109,7 +107,15 @@ export default class Profile extends Component {
           imgList: res.imgList || [],
           documentTitle: res.documentTitle,
         })
-        Taro.showToast({ icon: 'none', title: '提交成功' });
+        ruleToast('document_verify')
+        savePoint({
+          event: 'material',
+          eventType: 'center',
+          propertyName: '提交资料',
+          data: '{}'
+        }).then(res => {
+          console.log('提交资料')
+        })
 
       }).catch((err) => {
         Taro.showToast({ icon: 'none', title: err.errMsg || '提交失败' });
@@ -190,7 +196,7 @@ export default class Profile extends Component {
           {
             detail.verifyStatus != 2 &&
             <View>
-              <View className="detail-title" >{detail.documentTitle || '资料审核'}</View>
+              <View className="detail-title" >{detail.documentTitle}</View>
               {
                 detail.verifyStatus == 1 && <View className="commit-text" >审核通过</View>
               }

src/pages/person/profile/index.js

@@ -4,7 +4,8 @@ import dayjs from 'dayjs'
 import { getDocumentVerify, commitDocumentVerify, getVerifyList } from '@/services/user'
 import { uploadFiles } from '@/utils/request'
 import { transferImage } from '@/utils/tools'
-
+import { savePoint, } from '@/services/common'
+import { rule as ruleToast } from '@/utils/ruleToast'
 const profileBg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/index/profile.png'
 const add = require('@/assets/add.png')
 const closeImg = require('@/assets/close.png')
@@ -25,7 +26,7 @@ export default class Profile extends Component {
 
   }
 
-  componentWillMount() {
+  componentDidShow() {
     this.getProfile()
   }
 
@@ -35,19 +36,19 @@ export default class Profile extends Component {
       this.setState({
         verfyList: res || []
       },
-      //  () => {
-      //   if (this.state.verfyList.length == 0) {
-      //     this.setState({
-      //       showWhich: true
-      //     })
-      //   } else {
-      //     this.setState({
-      //       showWhich: false
-      //     })
-      //   }
+        //  () => {
+        //   if (this.state.verfyList.length == 0) {
+        //     this.setState({
+        //       showWhich: true
+        //     })
+        //   } else {
+        //     this.setState({
+        //       showWhich: false
+        //     })
+        //   }
 
-      // }
-    )
+        // }
+      )
       Taro.hideLoading()
     }).catch((err) => {
       Taro.hideLoading()
@@ -143,8 +144,19 @@ export default class Profile extends Component {
           imgList: [],
           descVisible: false,
         })
-        Taro.showToast({ icon: 'none', title: '提交成功' });
-        this.getProfile()
+        ruleToast('document_verify')
+
+        setTimeout(() => {
+          savePoint({
+            event: 'material',
+            eventType: 'center',
+            propertyName: '提交资料',
+            data: '{}'
+          }).then(res => {
+            console.log('提交资料')
+          })
+          this.getProfile()
+        }, 1000)
 
       }).catch((err) => {
         Taro.showToast({ icon: 'none', title: err.errMsg || '提交失败' });
@@ -217,7 +229,7 @@ export default class Profile extends Component {
               </View>
             </View>
           }
-          {(verfyList.length||descVisible) &&
+          {(verfyList.length || descVisible) &&
             <View>
 
               {descVisible &&

src/pages/policy/detail/index.js

@@ -26,9 +26,7 @@ export default class PolicyDetail extends Component {
 
   componentWillMount() {
     ready.queue(() => {
-      const router = Taro.getStorageSync('router') || { query: {} }
-      const policyId = this.$router.params.id || router.query.id
-
+      const policyId = this.$router.params.id 
       this.setState({ policyId }, () => {
         this.loadDetail()
       })

src/pages/policy/index.js

@@ -5,9 +5,18 @@ import './index.scss'
 import { savePoint, updatePoint } from '@/services/common'
 import { queryPolicyList } from '@/services/policy'
 import { connect } from '@tarojs/redux'
+import { withDetail } from '@/utils/page'
 let pageIndex = 1
 
 @connect(state => state.city)
+@withDetail({
+  track: {
+    event: 'policy',
+    eventType: 'main',
+    propertyName: '查看购房百科',
+    data: '{}',
+  }
+})
 export default class Index extends Component {
 
   config = {
@@ -19,7 +28,7 @@ export default class Index extends Component {
     hasMore: true,
     isEmpty: false,
     recordId: null,
-    pageIndex:1
+    pageIndex: 1
   }
 
 
@@ -41,20 +50,21 @@ export default class Index extends Component {
       list,
       isEmpty: total == 0,
       hasMore: list.length >= total ? false : true,
-      pageIndex:1
+      pageIndex: 1
     })
+    this._$_dataReady()
     rest && rest()
   }
 
   onScrollToLower = async (fn) => {
     const { list } = this.state;
     pageIndex++
-    const { records, total } = await this.loadList(this.state.pageIndex+1);
+    const { records, total } = await this.loadList(this.state.pageIndex + 1);
     const policyList = list.concat(records)
     this.setState({
       list: policyList,
       hasMore: policyList.length >= total ? false : true,
-      pageIndex:this.state.pageIndex+1
+      pageIndex: this.state.pageIndex + 1
     });
     fn && fn();
   }

src/pages/project/album/index.js

@@ -40,7 +40,7 @@ export default class Index extends Component {
     savePoint({
       event: 'album',
       eventType: 'building',
-      propertyName: '相册信息',
+      propertyName: '查看相册',
       data: '{}'
     }).then(res => {
       this.setState({

src/pages/project/detail/index.js

@@ -87,10 +87,6 @@ export default class Index extends Component {
     console.log('-------trac2222----->', this)
     ready.queue(() => {
       // // 分享场景需要先授权手机, 再授权头像
-      // const options = wx.getLaunchOptionsSync()
-      // console.log('-------options----->', options)
-      // if (sceneInShare(options.scene)) {
-      const router = Taro.getStorageSync('router') || { query: {} }
       const { person = {} } = this.props.userInfo || {}
       console.log('-------person----->', person)
       if ((person.tel || person.phone) && (person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
@@ -98,12 +94,12 @@ export default class Index extends Component {
         return
       }
 
-      const id = this.$router.params.id || router.query.id
+      const id = this.$router.params.id
 
       // 没有找到 id , 再重新找一次
       if (this.$router.params.scene) {
         getQrCodeParams(this.$router.params.scene).then(res => {
-          console.log(res,"扫码参数")
+          console.log(res, "扫码参数")
           this.setState({
             qrcodeParams: res
           })
@@ -124,14 +120,6 @@ export default class Index extends Component {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
 
-    const router = Taro.getStorageSync('router') || { query: {} }
-    Taro.setStorageSync('router', {
-      ...router,
-      query: {
-        ...router.query,
-        consultant: undefined,
-      }
-    })
   }
 
   componentWillReceiveProps() {
@@ -140,8 +128,7 @@ export default class Index extends Component {
 
   // 报备客户
   reportClientFn() {
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant || ""
+    const consultant = this.$router.params.consultant || ""
     const { userInfo: { person } } = this.props
 
     if (!this.state.reportedCustomer) {
@@ -220,10 +207,9 @@ export default class Index extends Component {
       addItemUv(id)
       const { qrcodeParams } = this.state
       // 埋点
-      const router = Taro.getStorageSync('router') || { query: {} }
-      const consultant = this.$router.params.consultant || router.query.consultant || qrcodeParams.consultant
-      // const consultantId = this.$router.params.consultantId || router.query.consultantId || qrcodeParams.consultantId || ""
-      // const recommender = this.$router.params.recommender || router.query.recommender || qrcodeParams.recommender || ""
+      const consultant = this.$router.params.consultant || qrcodeParams.consultant
+      // const consultantId = this.$router.params.consultantId ||  qrcodeParams.consultantId || ""
+      // const recommender = this.$router.params.recommender || qrcodeParams.recommender || ""
       // savePoint({
       //   event: 'detail',
       //   eventType: 'building',
@@ -240,7 +226,6 @@ export default class Index extends Component {
       //   console.log('项目详情')
       // })
 
-      console.log('-------consultant--------->', this.$router.params, router.query)
 
       if (consultant) {
         getCardDetail(consultant).then(res => {
@@ -255,7 +240,7 @@ export default class Index extends Component {
     })
   }
 
-  _$_track () {
+  _$_track() {
     const sceneParams = this._$_scene || {}
     const id = this.$router.params.id || sceneParams.id
     const consultantId = this.$router.params.consultantId || sceneParams.consultantId
@@ -499,17 +484,25 @@ export default class Index extends Component {
           posterData
         })
       })
+
     } else {
       this.setState({
         posterStatus: !!flag
       })
     }
+    savePoint({
+      event: 'poster',
+      eventType: 'building',
+      propertyName: '生成项目详情海报',
+      data: '{}'
+    }).then(res => {
+      console.log('生成项目详情海报')
+    })
   }
 
   callPhone = () => {
     console.log(this.props, "this.props")
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant
+    const consultant = this.$router.params.consultant
     if (consultant) {
       this.handleTelClick(this.state.consultData)
     } else {
@@ -518,6 +511,14 @@ export default class Index extends Component {
         Taro.makePhoneCall({
           phoneNumber: tel
         })
+        savePoint({
+          event: 'phone',
+          eventType: 'building',
+          propertyName: '拨打电话',
+          data: '{}'
+        }).then(res => {
+          console.log('拨打电话')
+        })
       } else {
         Taro.showToast({
           title: '暂无联系电话',
@@ -532,6 +533,14 @@ export default class Index extends Component {
     Taro.makePhoneCall({
       phoneNumber: item.phone || item.tel
     })
+    savePoint({
+      event: 'phone',
+      eventType: 'building',
+      propertyName: '拨打电话',
+      data: '{}'
+    }).then(res => {
+      console.log('拨打电话')
+    })
   }
 
   handleChatClick(item, e) {
@@ -548,10 +557,17 @@ export default class Index extends Component {
 
       },
       complete() {
-        // App.zhuge.track('查看置业顾问列表')
         Taro.navigateTo({
           url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.id}&receiverName=${encodeURIComponent(item.userName || item.name)}`
         })
+        savePoint({
+          event: 'communicate',
+          eventType: 'building',
+          propertyName: '在线沟通',
+          data: '{}'
+        }).then(res => {
+          console.log('在线沟通')
+        })
       }
     })
 
@@ -570,8 +586,7 @@ export default class Index extends Component {
     })
   }
   ChatOnlineClick() {
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant
+    const consultant = this.$router.params.consultant
     if (consultant) {
       this.handleChatClick(this.state.consultData)
     } else {
@@ -640,6 +655,14 @@ export default class Index extends Component {
       current,
       urls
     })
+    savePoint({
+      event: 'apartment',
+      eventType: 'building',
+      propertyName: '查看户型',
+      data: '{}'
+    }).then(res => {
+      console.log('查看户型')
+    })
   }
 
   handleFavor() {
@@ -665,7 +688,7 @@ export default class Index extends Component {
     }
     savePoint({
       event: 'save',
-      eventType: 'project',
+      eventType: 'building',
       propertyName: '项目收藏',
       data: '{}'
     }).then(res => {
@@ -1316,11 +1339,6 @@ export default class Index extends Component {
                         <Text className="label">物业：</Text>
                         <Text>{projectDetail.serviceCompany || '暂无'}</Text>
                       </View>
-
-                      {/* <View className='row project__area'>
-                        <Text className="label">销售状态：</Text>
-                        <Text className="status">{projectDetail.marketStatus}</Text>
-                      </View> */}
                       <View className='row-info'>
                         <View className='row'>
                           <Text className="label">车位比率：</Text>{projectDetail.parkingRate || '暂无'}</View>
@@ -1339,10 +1357,6 @@ export default class Index extends Component {
                           <Text className="label">物业费：</Text>{projectDetail.serviceFee || '暂无'}</View>
                       </View>
 
-                      {/* <View className='row'>
-                        <Text className="label">装修标准：</Text>{projectDetail.decoration || '暂无'}
-                      </View> */}
-
                       {/* 围观人数 */}
                       <View className='watch__people__num'>
                         <View className='top__txt'>{projectDetail.pvNum || 0}人围观</View>

src/pages/project/detail/map.js

@@ -6,12 +6,21 @@ import 'dayjs/locale/zh-cn' // 按需加载
 import ready from '@/utils/ready'
 import { connect } from '@tarojs/redux'
 import { dispatchProjectDetail } from '@/actions/project'
-
+import { withDetail } from '@/utils/page'
 
 @connect(
     ({ user, project }) => ({ ...user, ...project }),
     { dispatchProjectDetail }
 )
+@withDetail({
+    track: {
+        event: 'peripheral',
+        eventType: 'building',
+        propertyName: '查看周边配套',
+        data: '{}',
+    }
+})
+
 export default class Index extends Component {
     config = {
         navigationBarTitleText: '更多周边设施',
@@ -23,8 +32,7 @@ export default class Index extends Component {
 
     componentWillMount() {
         ready.queue(() => {
-            const router = Taro.getStorageSync('router') || { query: {} }
-            const id = this.$router.params.id || router.query.id
+            const id = this.$router.params.id
             this.initPageData(id)
 
         })
@@ -63,6 +71,9 @@ export default class Index extends Component {
                     })
                 }
             })
+
+            this._$_dataReady()
+
             Taro.hideToast()
         })
     }

src/pages/project/floor/index.js

@@ -4,11 +4,19 @@ import { connect } from '@tarojs/redux'
 import { dispatchProjectDetail } from '@/actions/project'
 import dayjs from 'dayjs'
 import 'dayjs/locale/zh-cn' // 按需加载
-import ready from '@/utils/ready'
+import { withDetail } from '@/utils/page'
 @connect(
   ({ user, card, project }) => ({ ...user, ...card, ...project }),
   { dispatchProjectDetail }
 )
+@withDetail({
+  track: {
+    event: 'more',
+    eventType: 'building',
+    propertyName: '查看更多楼盘信息',
+    data: '{}',
+  }
+})
 export default class Index extends Component {
   config = {
     navigationBarTitleText: '楼盘信息'
@@ -17,7 +25,9 @@ export default class Index extends Component {
   state = {
     statusOpts: ['待定', '在建', '在售'],
   }
-
+  componentWillMount() {
+    this._$_dataReady()
+  }
 
   render() {
     const { projectDetail } = this.props

src/pages/project/h5Page.js

@@ -10,10 +10,11 @@ import { ROLE_CODE } from '@/constants/user'
 import { getQrCodeParams } from '@/utils/qrcode'
 import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
 import { isEmpty } from '@/utils/tools'
-
+import { rule as ruleToast } from '@/utils/ruleToast'
 const bgImg = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
 
 @connect(state => state.user, { ...actions })
+
 export default class Index extends Component {
 
   state = {
@@ -32,26 +33,17 @@ export default class Index extends Component {
     recordId && updatePoint(recordId)
   }
 
-  // componentDidHide() {
-  //   this.setState({ pageHide: true });
-  // }
-
-  // componentDidShow() {
-  //   this.setState({ pageHide: false });
-  // }
-
   // 埋点
   success() {
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const firstShare = this.$router.params.firstShare || router.query.firstShare || ""
-    const consultant = this.$router.params.consultant || router.query.consultant || ""
-    const sharePersonId = this.$router.params.sharePersonId || router.query.sharePersonId || ""
-    const h5Id = this.state.h5Id || this.$router.params.id || router.query.id
+    const firstShare = this.$router.params.firstShare || ""
+    const consultant = this.$router.params.consultant || ""
+    const sharePersonId = this.$router.params.sharePersonId || ""
+    const h5Id = this.state.h5Id || this.$router.params.id
 
     savePoint({
       event: 'detail',
       eventType: 'h5',
-      propertyName: 'h5活动',
+      propertyName: 'h5详情',
       consultantId: consultant,
       sharePersonId: sharePersonId,
       targetId: h5Id,
@@ -106,11 +98,9 @@ export default class Index extends Component {
   currentPageAndParams() {
     const { userInfo: { person } } = this.props
     const { h5Id } = this.state
-    const router = Taro.getStorageSync('router') || { query: {} }
 
-    // const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.personId : ""
     const consultantId = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
-    const firstShare = this.$router.params.firstShare || router.query.firstShare || person.personId
+    const firstShare = this.$router.params.firstShare || person.personId
 
     let queryParams = [
       `sharePersonId=${person.personId}`,
@@ -160,8 +150,7 @@ export default class Index extends Component {
         })
       }
 
-      const router = Taro.getStorageSync('router') || { query: {} }
-      const hFiveId = this.$router.params.id || router.query.id
+      const hFiveId = this.$router.params.id
 
       if (!isEmpty(hFiveId)) {
         this.loadH5Profile(hFiveId)
@@ -267,7 +256,7 @@ export default class Index extends Component {
 
   // 授权用户信息
   getUserInfo() {
-  
+
     const { dispatchUpdateUserInfo } = this.props
     const sessionKey = Taro.getStorageSync('sessionKey')
 
@@ -314,21 +303,22 @@ export default class Index extends Component {
           icon: 'none'
         })
       } else {
-        console.log('授权手机成功')
-        this.success()
-        this.reportClient()
-        this.setState({
-          phoneVisible: false,
-          webViewVisible: true,
-        })
+        ruleToast('signup-agent')
+        setTimeout(() => {
+          this.success()
+          this.reportClient()
+          this.setState({
+            phoneVisible: false,
+            webViewVisible: true,
+          })
+        }, 1000)
       }
     })
   }
 
   // 报备客户
   reportClient() {
-    const router = Taro.getStorageSync('router') || { query: {} }
-    const consultant = this.$router.params.consultant || router.query.consultant || ""
+    const consultant = this.$router.params.consultant || ""
     const { userInfo: { person: { phone, tel, personId, userId, personType } } } = this.props
     const isConsultant = personType == ROLE_CODE['CONSULTANT']
 
@@ -370,11 +360,11 @@ export default class Index extends Component {
     )
   }
   render() {
-    const router = Taro.getStorageSync('router') || { query: {} }
+
     const { pageInfo, webViewVisible, codeParams, pageHide, h5Id } = this.state
     const { userInfo: { person } } = this.props
     const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
-    const firstShare = this.$router.params.firstShare || router.query.firstShare || person.personId
+    const firstShare = this.$router.params.firstShare || person.personId
     const webUrlParams = [
       `personId=${person.personId}`,
       `h5id=${h5Id}`,

src/pages/project/index.js

@@ -230,7 +230,7 @@ export default class Index extends Component {
 
     const payload = {
       name: keywords,
-      pageSize: 999
+      pageSize: 10,
     }
     if (curCity.id) {
       payload.cityId = curCity.id

src/pages/project/list/filter/index.js

@@ -2,7 +2,7 @@ import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
 import { deepClone } from '@/utils/tools'
 import { queryItemTypeList } from '@/services/item'
-
+import { savePoint } from '@/services/common'
 import { connect } from '@tarojs/redux'
 @connect(state => ({ ...state.city }))
 export default class Index extends Component {
@@ -130,10 +130,11 @@ export default class Index extends Component {
         return ''
       }
 
-      // 类型
+      // 户型
       if (tabIndex === 0) {
-        let val = selectedList.map(index => curTabList[index])
-        return val.join(',')
+        // let val = selectedList.map(index => curTabList[index])
+        // return val.join(',')
+        return selectedList.join(',')
       }
 
       // 价格 面积
@@ -166,6 +167,7 @@ export default class Index extends Component {
       }
     })
     console.log(values)
+
     let params = {
       name: keywords,
       houseType: values[0],
@@ -176,6 +178,16 @@ export default class Index extends Component {
     console.log(params)
     this.props.onFilter(params, () => {
       this.hideFilter()
+
+      savePoint({
+        event: 'search',
+        eventType: 'mian',
+        propertyName: '搜索',
+        data: '{}'
+      }).then(res => {
+        console.log('搜索')
+      })
+
     })
 
   }

src/pages/project/map/index.js

@@ -1,16 +1,24 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
-
 import { connect } from '@tarojs/redux'
 import ListView from '@/components/ListView'
 import { dispatchProjectDetail } from '@/actions/project'
 import { getItemList } from '@/services/item'
 import ProjectItem from '../item'
 import { View, Image, Button } from '@tarojs/components';
+import { withDetail } from '@/utils/page'
 @connect(
   ({ user, card, project, city }) => ({ ...user, ...card, ...project, ...city }),
   { dispatchProjectDetail }
 )
+@withDetail({
+  track: {
+    event: 'map_house',
+    eventType: 'main',
+    propertyName: '地图看房',
+    data: '{}',
+  }
+})
 export default class Index extends Component {
   config = {
     navigationBarTitleText: '地图看房'
@@ -23,11 +31,11 @@ export default class Index extends Component {
     points: null,
     markers: [],
     isProject: 'none',
-    isShow:'none',
+    isShow: 'none',
     coordinate: null,
     buildingName: null,
     address: null,
-    navTop:'60%',
+    navTop: '60%',
   }
   componentWillMount() {
     const marker = [];
@@ -87,6 +95,7 @@ export default class Index extends Component {
         longitude: curCity.lng
       })
     }
+    this._$_dataReady()
     return getItemList(payload)
   }
   onViewDetail(item) {
@@ -104,11 +113,11 @@ export default class Index extends Component {
         _this.setState({
           projectDetail: val,
           isProject: 'block',
-          isShow:'block',
+          isShow: 'block',
           coordinate: val.coordinate,
           buildingName: val.buildingName,
           address: val.address,
-          navTop:'40%'
+          navTop: '40%'
         })
       }
     })
@@ -142,7 +151,7 @@ export default class Index extends Component {
   //   }
   // }
   render() {
-    const { markers, latitude, longitude, points, projectDetail, isProject,isShow,navTop } = this.state
+    const { markers, latitude, longitude, points, projectDetail, isProject, isShow, navTop } = this.state
     return (
       <View className='page'>
         <Map
@@ -161,13 +170,13 @@ export default class Index extends Component {
           <Text className="location-icon iconfont icon-daohangdizhi"></Text>
           <Text className="location-text">{curCity.id ? curCity.name : '正在定位'}</Text>
         </View>
-        <View className='btn-nav' style={{top:navTop}}>
-          <Button className='btn gotobtn'  onClick={this.openMap}  style={{ display: isShow }}>
-            <Image src={require('@/assets/qianw.png')} className='btn-img'  mode='widthFix'></Image>
+        <View className='btn-nav' style={{ top: navTop }}>
+          <Button className='btn gotobtn' onClick={this.openMap} style={{ display: isShow }}>
+            <Image src={require('@/assets/qianw.png')} className='btn-img' mode='widthFix'></Image>
             <Text>前往</Text>
           </Button>
-          <Button className='btn gotobtn' style={{ display: isShow }} open-type = 'share'>
-            <Image src={require('@/assets/zhuan.png')} className='btn-img'  mode='widthFix'></Image>
+          <Button className='btn gotobtn' style={{ display: isShow }} open-type='share'>
+            <Image src={require('@/assets/zhuan.png')} className='btn-img' mode='widthFix'></Image>
             <Text>转发</Text>
           </Button>
           <Button className='btn gotobtn' onClick={this.toHome} mode='widthFix'>

src/pages/report/login/index.js

@@ -2,6 +2,7 @@ import Taro, { Component } from '@tarojs/taro'
 import getUserPhone from '@/utils/getUserPhone'
 import { reportClient } from '@/services/report'
 import './index.scss'
+import { rule as ruleToast } from '@/utils/ruleToast'
 
 export default class Index extends Component {
   state = {
@@ -22,18 +23,21 @@ export default class Index extends Component {
     const { recommender, buildingId } = this.state
     getUserPhone(e, (phoneNumber) => {
       if (phoneNumber) {
-        const payload = {
-          realtyConsultant: recommender, //报备人 置业顾问
-          buildingId: buildingId,
-          phone: phoneNumber
-        }
-        reportClient(payload).then(res => {
-          Taro.redirectTo({
-            url: `/pages/card/index?id=${recommender}`
+        ruleToast('signup-agent')
+        
+        setTimeout(() => {
+          const payload = {
+            realtyConsultant: recommender, //报备人 置业顾问
+            buildingId: buildingId,
+            phone: phoneNumber
+          }
+          reportClient(payload).then(res => {
+            Taro.redirectTo({
+              url: `/pages/card/index?id=${recommender}`
+            })
           })
-        })
+        },1000)
 
-        
       } else {
         Taro.showToast({
           title: '授权失败，请重试',

src/pages/shop/detail/index.js

@@ -1,14 +1,22 @@
 import Taro, { Component } from '@tarojs/taro';
 import './index.scss'
-
 import { connect } from '@tarojs/redux'
 import * as actions from '@/actions/shop'
 import WxParse from '@/components/wxParse/wxParse'
-
 import { transferImage } from '@/utils/tools'
+import { withDetail } from '@/utils/page'
+import { savePoint, updatePoint } from '@/services/common'
 
 let hasClick = true
 @connect(state => state.shop, { ...actions })
+@withDetail({
+  track: {
+    event: 'detail',
+    eventType: 'mall',
+    propertyName: '查看商品详情',
+    data: '{}',
+  }
+})
 export default class Index extends Component {
   config = {
     navigationBarTitleText: '商品详情'
@@ -21,7 +29,7 @@ export default class Index extends Component {
     inventory: null
   }
 
-  componentWillMount () {
+  componentWillMount() {
     const { id, from } = this.$router.params
     this.setState({
       goodsId: id,
@@ -29,7 +37,7 @@ export default class Index extends Component {
     }, this.loadDetail)
   }
 
-  loadDetail () {
+  loadDetail() {
     const { goodsId } = this.state
     Taro.showLoading()
     this.props.dispatchGoodsDetail(goodsId).then(res => {
@@ -39,11 +47,12 @@ export default class Index extends Component {
       // })
 
       WxParse.wxParse('article', 'html', res.goodsDescription || '<p></p>', this.$scope, 0)
+      this._$_dataReady()
       Taro.hideLoading()
     })
   }
 
-  onExchange () {
+  onExchange() {
     const { goodsId } = this.state
     const { goodsDetail: { goodsName } } = this.props
     if (!hasClick) return
@@ -59,7 +68,14 @@ export default class Index extends Component {
       this.setState({
         inventory: res.inventory
       })
-
+      savePoint({
+        event: 'exchange',
+        eventType: 'mall',
+        propertyName: '兑换商品',
+        data: '{}'
+      }).then(res => {
+        console.log('兑换商品')
+      })
 
       // else{
       //   Taro.showToast({ title: '积分不足，请先获取积分' })
@@ -76,7 +92,7 @@ export default class Index extends Component {
     })
   }
 
-  render () {
+  render() {
     const { goodsDetail } = this.props
     const { inventory } = this.state
     return (

src/pages/shop/index.js

@@ -8,14 +8,14 @@ import { transferImage } from '@/utils/tools'
 import Banner from './banner'
 import ready from '@/utils/ready'
 import { ROLE_CODE } from '@/constants/user'
-import { queryBanners } from '@/services/common'
+import { queryBanners, savePoint } from '@/services/common'
 import { getGoodsBuilding, getGoodsList } from '@/services/item'
 import { connect } from '@tarojs/redux'
 import * as actions from '@/actions/shop'
 import { queryUserInfo, doUserSignin } from '@/services/user'
-
 // import getUserPhone from '@/utils/getUserPhone'
 import Authorize from '@/components/authorize'
+import { rule as ruleToast } from '@/utils/ruleToast'
 
 @connect(({ user, shop, city }) => ({ ...user, ...shop, ...city }), { ...actions })
 export default class Shop extends Component {
@@ -37,7 +37,9 @@ export default class Shop extends Component {
     goodsList: [],
     user: {},
     current: 0,
-    points: 0
+    points: 0,
+    cityId: (this.props.curCity || {}).id
+
   }
 
   componentDidShow() {
@@ -53,6 +55,16 @@ export default class Shop extends Component {
     Taro.hideLoading()
   }
 
+  componentWillReceiveProps(nextProps) {
+    if (this.state.cityId != nextProps.curCity.id) {
+      this.setState({
+        current: 0,
+        cityId: nextProps.curCity.id
+      })
+      console.log(nextProps.curCity.id, "nextPropsnextPropsnextPropsnextPropsnextPropsnextPropsnextProps")
+    }
+  }
+
   loadBannerList() {
     const payload = {
       showPosition: 'mall',
@@ -168,17 +180,22 @@ export default class Shop extends Component {
     }
 
     doUserSignin({ id }).then(res => {
-      Taro.showToast({
-        title: '签到成功'
+      ruleToast('checkin')
+      savePoint({
+        event: 'signin',
+        eventType: 'integral',
+        propertyName: '签到',
+        data: '{}'
+      }).then(res => {
+        console.log('签到')
       })
-      this.setState({
-
-        points: res.points
-
+      setTimeout(() => {
+        this.setState({
+          points: res.points
+        })
+        this.loadUserInfo()
       })
 
-      this.loadUserInfo()
-
       // App.zhuge.track('签到成功')
     })
   }

src/pages/shop/integralDetail/index.js

@@ -5,8 +5,17 @@ import EmptyPage from '@/components/empty-page'
 import { connect } from '@tarojs/redux'
 import * as actions from '@/actions/shop'
 import dayjs from 'dayjs'
+import { withDetail } from '@/utils/page'
 
 @connect(state => ({ ...state.shop, ...state.user }), { ...actions })
+@withDetail({
+  track: {
+    event: 'points_details',
+    eventType: 'integral',
+    propertyName: '查看积分明细',
+    data: '{}',
+  }
+})
 export default class Index extends Component {
 
   config = {
@@ -14,19 +23,19 @@ export default class Index extends Component {
   }
 
   state = {
-    choose:1,
-    recordAll:[],
-    record1:[],
-    record2:[],
-    records:[],
-    points:0
+    choose: 1,
+    recordAll: [],
+    record1: [],
+    record2: [],
+    records: [],
+    points: 0
   }
 
   componentWillMount() {
     const { points, from } = this.$router.params
     this.loadRecords()
     this.setState({
-      points:points
+      points: points
     })
   }
 
@@ -34,56 +43,57 @@ export default class Index extends Component {
     Taro.showLoading()
     this.props.dispatchPointsRecords().then(res => {
       this.checkChoose(res.records)
+      this._$_dataReady()
       Taro.hideLoading()
     })
   }
 
-  checkChoose(data){
-     const record1=[]
-     const record2=[]
-     data.forEach(function(val,index){
-       if(val.pointsAmount>0){
-         record1.push(val)
-       }else{
-          record2.push(val)
-       }
-     })
-     this.setState({
-       recordAll:data,
-       record1:record1,
-       record2:record2,
-       records:data
-     })
+  checkChoose(data) {
+    const record1 = []
+    const record2 = []
+    data.forEach(function (val, index) {
+      if (val.pointsAmount > 0) {
+        record1.push(val)
+      } else {
+        record2.push(val)
+      }
+    })
+    this.setState({
+      recordAll: data,
+      record1: record1,
+      record2: record2,
+      records: data
+    })
   }
 
   onViewDetail(item) {
-     this.setState({
-       choose:item,
-     })
-     if(item==1){
-       var records=this.state.recordAll
-       this.setState({
-         records:records
-       })
-     }
-     if(item==2){
-       var records=this.state.record1
-       this.setState({
-         records:records
-       })
-     }
-     if(item==3){
-       var records=this.state.record2
-       this.setState({
-         records:records
-       })
-     }
+    this.setState({
+      choose: item,
+    })
+    if (item == 1) {
+      var records = this.state.recordAll
+      this.setState({
+        records: records
+      })
+    }
+    if (item == 2) {
+      var records = this.state.record1
+      this.setState({
+        records: records
+      })
+    }
+    if (item == 3) {
+      var records = this.state.record2
+      this.setState({
+        records: records
+      })
+    }
     // Taro.navigateTo({
     //   url: `/pages/shop/detail/index?id=${item.targetId}&from=record`
     // })
   }
 
-  goRule(){
+  goRule() {
     Taro.navigateTo({
       url: `/pages/shop/rule/index`
     })
@@ -94,32 +104,32 @@ export default class Index extends Component {
     // const { pointsRecords: { records = [] } } = this.props,
 
     return (
-    <View>
-      <Image className="bg" src={require('@/assets/shop/bg.jpg')}/>
-      <View className='topBox'>
+      <View>
+        <Image className="bg" src={require('@/assets/shop/bg.jpg')} />
+        <View className='topBox'>
           <View className='jifen'>{points}</View>
           <View className='tip'>当前积分</View>
           <View onClick={this.goRule} className='ruleBtn'>
-              <Image className="lie" src={require('@/assets/shop/list.png')}/>
-              <View className='rule'>积分规则</View>
+            <Image className="lie" src={require('@/assets/shop/list.png')} />
+            <View className='rule'>积分规则</View>
           </View>
-      </View>
-      <View className='chooseBox'>
-         <Text onClick={this.onViewDetail.bind(this,1)} className={choose==1?'choose':''}>全部</Text>
-         <Text onClick={this.onViewDetail.bind(this,2)} className={choose==2?'choose':''}>积分收入</Text>
-         <Text onClick={this.onViewDetail.bind(this,3)} className={choose==3?'choose':''}>积分支出</Text>
-      </View>
-      <View className='line'></View>
-      <ScrollView
-        scrollY
-        scroll-with-animation
-        enable-back-to-top
-        className="list"
-        style={{
-          height: '65vh'
-        }}>
-        {
-          this.state.records.length === 0 ? '' : (
+        </View>
+        <View className='chooseBox'>
+          <Text onClick={this.onViewDetail.bind(this, 1)} className={choose == 1 ? 'choose' : ''}>全部</Text>
+          <Text onClick={this.onViewDetail.bind(this, 2)} className={choose == 2 ? 'choose' : ''}>积分收入</Text>
+          <Text onClick={this.onViewDetail.bind(this, 3)} className={choose == 3 ? 'choose' : ''}>积分支出</Text>
+        </View>
+        <View className='line'></View>
+        <ScrollView
+          scrollY
+          scroll-with-animation
+          enable-back-to-top
+          className="list"
+          style={{
+            height: '65vh'
+          }}>
+          {
+            this.state.records.length === 0 ? '' : (
               this.state.records.map(item => (
                 <View className="list-item" key={item.recId}>
                   <View className="top">
@@ -127,14 +137,14 @@ export default class Index extends Component {
                     <View className="title-time">{dayjs(item.createDate).format('YYYY-MM-DD HH:mm:ss')}</View>
                   </View>
                   <View className="bottom">
-                    <View className={item.pointsAmount>0?'coin1':'coin2'}>{item.pointsAmount>0?'+'+item.pointsAmount:item.pointsAmount}</View>
+                    <View className={item.pointsAmount > 0 ? 'coin1' : 'coin2'}>{item.pointsAmount > 0 ? '+' + item.pointsAmount : item.pointsAmount}</View>
                   </View>
                 </View>
               ))
-          )
-        }
+            )
+          }
 
-      </ScrollView>
+        </ScrollView>
       </View>
     );
   }

src/pages/shop/rule/index.js

@@ -7,10 +7,18 @@ import * as actions from '@/actions/shop'
 import { View } from '@tarojs/components';
 import { queryUserInfo, doUserSignin } from '@/services/user'
 import { ROLE_CODE } from '@/constants/user'
-
-const ruleBg = require('@/assets/rulebg.png')
+import { withDetail } from '@/utils/page'
+const ruleBg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/rulebg.png'
 
 @connect(state => ({ ...state.shop, ...state.user, ...state.city, }), { ...actions })
+@withDetail({
+  track: {
+    event: 'points_rule',
+    eventType: 'integral',
+    propertyName: '查看积分规则',
+    data: '{}',
+  }
+})
 export default class Shop extends Component {
   config = {
     navigationBarTitleText: '积分规则'
@@ -48,6 +56,7 @@ export default class Shop extends Component {
           pointRule: res.records || []
         })
       }
+      this._$_dataReady()
       Taro.hideLoading()
     })
   }
@@ -141,8 +150,8 @@ export default class Shop extends Component {
             pointRule.length === 0 ? '' : (
               pointRule.map(item => (
                 <View className='rule_item' key={item.ruleId}>
-                  <View className="item-name">{item.ruleName}<Text className="item-num">+{item.pointsAmount}</Text><Text className="jifen">积分</Text></View>
-                  <View className="item-rule">{item.remark}</View>
+                  <View className="item-name">{item.ruleName || "　"}<Text className="item-num">+{item.pointsAmount || 0}</Text><Text className="jifen">积分</Text></View>
+                  <View className="item-rule">{item.remark || "　"}</View>
                   <View className={(this.getBtnName(item.code) == '已签到' || this.getBtnName(item.code) == '已授权') ? 'yiqiandao' : "item-btn"} onClick={(this.getBtnName(item.code) == '已签到' || this.getBtnName(item.code) == '已授权') ? "" : this.handleItemClick.bind(this, item)}>{this.getBtnName(item.code)}</View>
                 </View>
               ))

src/pages/signin/index.js

@@ -4,6 +4,7 @@ import { dispatchSignin, dispatchSigninCheck } from '@/actions/activity'
 import { connect } from '@tarojs/redux'
 import './index.scss'
 import ready from '@/utils/ready'
+import { rule as ruleToast } from '@/utils/ruleToast'
 
 @connect(state => ({ ...state.user }), { dispatchSignin, dispatchSigninCheck })
 export default class Index extends Component {
@@ -42,27 +43,25 @@ export default class Index extends Component {
         })
         return
       }
+      ruleToast('signup-agent')
 
-      // App.zhuge.track('获取手机号', {
-      //   '手机号': phoneNumber
-      // })
-
-      this.props.dispatchSignin(1).then(res => {
-        // App.zhuge.track('签到成功', {
-        //   '活动主题': '悦见姑苏新营销之美'
-        // })
-        Taro.showToast({
-          title: '签到成功'
-        })
-        this.setState({
-          isSigned: true
-        })
-        setTimeout(() => {
-          Taro.switchTab({
-            url: `/pages/project/index`
+      setTimeout(() => {
+        this.props.dispatchSignin(1).then(res => {
+          Taro.showToast({
+            title: '签到成功'
           })
-        }, 3000)
-      })
+          this.setState({
+            isSigned: true
+          })
+          setTimeout(() => {
+            Taro.switchTab({
+              url: `/pages/project/index`
+            })
+          }, 2000)
+        })
+      }, 1000)
+
+
     })
   }
   render() {

src/pages/toolKit/calculateResult/index.js

@@ -1,7 +1,16 @@
-import Taro, {Component} from '@tarojs/taro';
-import {calcute} from '@/utils/calcute'
+import Taro, { Component } from '@tarojs/taro';
+import { calcute } from '@/utils/calcute'
 import ready from '@/utils/ready'
+import { withDetail } from '@/utils/page'
 import './index.scss'
+@withDetail({
+	track: {
+		event: 'calculator',
+		eventType: 'center',
+		propertyName: '计算房贷',
+		data: '{}',
+	}
+})
 
 export default class Index extends Component {
 	config = {
@@ -10,54 +19,55 @@ export default class Index extends Component {
 	state = {
 		current: 0,
 		choose: true,
-		lixi1:{},
-		lixi2:{},
-		shuju1:'',
-		shuju2:'',
-		allPay:0,
-		bili:0
+		lixi1: {},
+		lixi2: {},
+		shuju1: '',
+		shuju2: '',
+		allPay: 0,
+		bili: 0
 	}
 	componentDidMount() {
-      const shuju1=(Taro.getStorageSync('shuju1')).split(',')
-      const shuju2=(Taro.getStorageSync('shuju2')).split(',')
-      this.setState({
-				shuju1,
-				shuju2,
-      	allPay:Taro.getStorageSync('allPay'),
-      	bili:Taro.getStorageSync('bili')
-      })
-			 
-   		if(shuju1[0]>0&&shuju2[0]>0){
-   			var a=calcute.zuhe(1,shuju2[0],shuju1[0],shuju2[1],shuju1[1],shuju2[2],shuju1[2])
-   			var b=calcute.zuhe(2,shuju2[0],shuju1[0],shuju2[1],shuju1[1],shuju2[2],shuju1[2])
-   			this.setState({
-   				lixi1:a,
-   				lixi2:b
-   			})
-   			console.log(a)
-   			console.log(b)
-   		}else{
-			if(shuju1[0]>0){
-				var a=calcute.singleDk(1,shuju1[0],shuju1[1],shuju1[2])
-				var b=calcute.singleDk(2,shuju1[0],shuju1[1],shuju1[2])
+		const shuju1 = (Taro.getStorageSync('shuju1')).split(',')
+		const shuju2 = (Taro.getStorageSync('shuju2')).split(',')
+		this.setState({
+			shuju1,
+			shuju2,
+			allPay: Taro.getStorageSync('allPay'),
+			bili: Taro.getStorageSync('bili')
+		})
+
+		if (shuju1[0] > 0 && shuju2[0] > 0) {
+			var a = calcute.zuhe(1, shuju2[0], shuju1[0], shuju2[1], shuju1[1], shuju2[2], shuju1[2])
+			var b = calcute.zuhe(2, shuju2[0], shuju1[0], shuju2[1], shuju1[1], shuju2[2], shuju1[2])
+			this.setState({
+				lixi1: a,
+				lixi2: b
+			})
+			console.log(a)
+			console.log(b)
+		} else {
+			if (shuju1[0] > 0) {
+				var a = calcute.singleDk(1, shuju1[0], shuju1[1], shuju1[2])
+				var b = calcute.singleDk(2, shuju1[0], shuju1[1], shuju1[2])
 				this.setState({
-					lixi1:a,
-					lixi2:b
+					lixi1: a,
+					lixi2: b
 				})
-			}else{
-				var a=calcute.singleDk(1,shuju2[0],shuju2[1],shuju2[2])
-				var b=calcute.singleDk(2,shuju2[0],shuju2[1],shuju2[2])
+			} else {
+				var a = calcute.singleDk(1, shuju2[0], shuju2[1], shuju2[2])
+				var b = calcute.singleDk(2, shuju2[0], shuju2[1], shuju2[2])
 				this.setState({
-					lixi1:a,
-					lixi2:b
+					lixi1: a,
+					lixi2: b
 				})
 			}
-   			console.log(a+','+b)
-   		}
-  }
-	
+			console.log(a + ',' + b)
+		}
+		this._$_dataReady()
+	}
+
 	handleClick = (index) => (e) => {
-		if(index == 1) {
+		if (index == 1) {
 			this.setState({
 				choose: true
 			})
@@ -68,90 +78,90 @@ export default class Index extends Component {
 		}
 	}
 	render() {
-		return(
+		return (
 			<View className='page'>
-					<View className='btn_box'>
-							<View className='btn' onClick={this.handleClick(1)}>
-								<Text className={this.state.choose?'choose1':''}>等额本息</Text>
-								<Text className={this.state.choose?'choose1':''}>每月还款相同</Text>
+				<View className='btn_box'>
+					<View className='btn' onClick={this.handleClick(1)}>
+						<Text className={this.state.choose ? 'choose1' : ''}>等额本息</Text>
+						<Text className={this.state.choose ? 'choose1' : ''}>每月还款相同</Text>
+					</View>
+					<View className='btn' onClick={this.handleClick(2)}>
+						<Text className={this.state.choose ? '' : 'choose1'}>等额本金</Text>
+						<Text className={this.state.choose ? '' : 'choose1'}>还款逐月减少</Text>
+					</View>
+				</View>
+				<View className={this.state.choose ? 'content show' : 'content hide'}>
+					<Image className='bg' src={require('../../../assets/calculate/1.png')}></Image>
+					<View className='numberAll'>
+						<Text className='word1'>月供</Text>
+						<Text className='word2'>{parseInt(this.state.lixi1.yuegong)}<Text className='word2_1'>元</Text></Text>
+						<Text className='word3'>共支付利息{((this.state.lixi1.totalLixi) / 10000).toFixed(2)}万元</Text>
+						<View className='word4_box'>
+							<View className='word4_1'>
+								<Text className='word5'>房款总额</Text>
+								<Text className='word6'>{this.state.allPay}万元</Text>
 							</View>
-							<View className='btn' onClick={this.handleClick(2)}>
-								<Text className={this.state.choose?'':'choose1'}>等额本金</Text>
-								<Text className={this.state.choose?'':'choose1'}>还款逐月减少</Text>
+							<View className='word4_1'>
+								<Text className='word5'>{this.state.bili}</Text>
+								<Text className='word6'>{this.state.allPay * parseInt(this.state.bili) / 100}万元</Text>
 							</View>
-					</View>
-					<View className={this.state.choose?'content show':'content hide'}>
-						<Image className='bg' src={require('../../../assets/calculate/1.png')}></Image>
-						<View className='numberAll'>
-							<Text className='word1'>月供</Text>
-							<Text className='word2'>{parseInt(this.state.lixi1.yuegong)}<Text className='word2_1'>元</Text></Text>
-							<Text className='word3'>共支付利息{((this.state.lixi1.totalLixi)/10000).toFixed(2)}万元</Text>
-							<View className='word4_box'>
-									<View className='word4_1'>
-										<Text className='word5'>房款总额</Text>
-										<Text className='word6'>{this.state.allPay}万元</Text>
-									</View>
-									<View className='word4_1'>
-										<Text className='word5'>{this.state.bili}</Text>
-										<Text className='word6'>{this.state.allPay*parseInt(this.state.bili)/100}万元</Text>
-									</View>
-									<View className='word4_1'>
-										<Text className='word5'>贷款总额</Text>
-										<Text className='word6'>{this.state.allPay-this.state.allPay*parseInt(this.state.bili)/100}万元</Text>
-									</View>
+							<View className='word4_1'>
+								<Text className='word5'>贷款总额</Text>
+								<Text className='word6'>{this.state.allPay - this.state.allPay * parseInt(this.state.bili) / 100}万元</Text>
 							</View>
 						</View>
 					</View>
-					<View className={this.state.choose?'content hide':'content show'}>
-						<Image className='bg' src={require('../../../assets/calculate/2.png')}></Image>
-						<View className='numberAll'>
-							<Text className='word1'>月供</Text>
-							<Text className='word2'>{parseInt(this.state.lixi2.yuegong)}<Text className='word2_1'>元</Text></Text>
-							<Text className='word3'>共支付利息{((this.state.lixi2.totalLixi)/10000).toFixed(2)}万元,之后每月递减{(parseFloat(this.state.lixi2.yuegongdijian)).toFixed(2)}元</Text>
-							<View className='word4_box'>
-									<View className='word4_1'>
-										<Text className='word5'>房款总额</Text>
-										<Text className='word6'>{this.state.allPay}万元</Text>
-									</View>
-									<View className='word4_1'>
-										<Text className='word5'>{this.state.bili}</Text>
-										<Text className='word6'>{this.state.allPay*parseInt(this.state.bili)/100}万元</Text>
-									</View>
-									<View className='word4_1'>
-										<Text className='word5'>贷款总额</Text>
-										<Text className='word6'>{this.state.allPay-this.state.allPay*parseInt(this.state.bili)/100}万元</Text>
-									</View>
+				</View>
+				<View className={this.state.choose ? 'content hide' : 'content show'}>
+					<Image className='bg' src={require('../../../assets/calculate/2.png')}></Image>
+					<View className='numberAll'>
+						<Text className='word1'>月供</Text>
+						<Text className='word2'>{parseInt(this.state.lixi2.yuegong)}<Text className='word2_1'>元</Text></Text>
+						<Text className='word3'>共支付利息{((this.state.lixi2.totalLixi) / 10000).toFixed(2)}万元,之后每月递减{(parseFloat(this.state.lixi2.yuegongdijian)).toFixed(2)}元</Text>
+						<View className='word4_box'>
+							<View className='word4_1'>
+								<Text className='word5'>房款总额</Text>
+								<Text className='word6'>{this.state.allPay}万元</Text>
+							</View>
+							<View className='word4_1'>
+								<Text className='word5'>{this.state.bili}</Text>
+								<Text className='word6'>{this.state.allPay * parseInt(this.state.bili) / 100}万元</Text>
+							</View>
+							<View className='word4_1'>
+								<Text className='word5'>贷款总额</Text>
+								<Text className='word6'>{this.state.allPay - this.state.allPay * parseInt(this.state.bili) / 100}万元</Text>
 							</View>
 						</View>
 					</View>
-					<View className='list_box2'></View>
-					<View className='list_box1'>
-							<View><Text className='word1'>公积金贷款</Text><Text className='word1'>{this.state.shuju1[0]}万元</Text></View>
-							<View>
-							<Text className='word2'>
-									<Text className='word1'>贷款年限:</Text>
-									<Text className='word1'>{this.state.shuju1[1]}年</Text>
-							</Text>
-							<Text className='word2'>
-									<Text className='word1'>贷款年利率:</Text>
-									<Text className='word1'>{((this.state.shuju1[2])*100).toFixed(2)}%</Text>
-							</Text>
-							</View>
+				</View>
+				<View className='list_box2'></View>
+				<View className='list_box1'>
+					<View><Text className='word1'>公积金贷款</Text><Text className='word1'>{this.state.shuju1[0]}万元</Text></View>
+					<View>
+						<Text className='word2'>
+							<Text className='word1'>贷款年限:</Text>
+							<Text className='word1'>{this.state.shuju1[1]}年</Text>
+						</Text>
+						<Text className='word2'>
+							<Text className='word1'>贷款年利率:</Text>
+							<Text className='word1'>{((this.state.shuju1[2]) * 100).toFixed(2)}%</Text>
+						</Text>
 					</View>
-					<View className='list_box2'></View>
-					<View className={this.state.shuju2[0]>0?'list_box1 show':'list_box1 hide'}>
-							<View><Text className='word1'>商业贷款</Text><Text className='word1'>{this.state.shuju2[0]}万元</Text></View>
-							<View>
-							<Text className='word2'>
-									<Text className='word1'>贷款年限:</Text>
-									<Text className='word1'>{this.state.shuju2[1]}年</Text>
-							</Text>
-							<Text className='word2'>
-									<Text className='word1'>贷款年利率:</Text>
-									<Text className='word1'>{((this.state.shuju2[2])*100).toFixed(2)}%</Text>
-							</Text>
-							</View>
+				</View>
+				<View className='list_box2'></View>
+				<View className={this.state.shuju2[0] > 0 ? 'list_box1 show' : 'list_box1 hide'}>
+					<View><Text className='word1'>商业贷款</Text><Text className='word1'>{this.state.shuju2[0]}万元</Text></View>
+					<View>
+						<Text className='word2'>
+							<Text className='word1'>贷款年限:</Text>
+							<Text className='word1'>{this.state.shuju2[1]}年</Text>
+						</Text>
+						<Text className='word2'>
+							<Text className='word1'>贷款年利率:</Text>
+							<Text className='word1'>{((this.state.shuju2[2]) * 100).toFixed(2)}%</Text>
+						</Text>
 					</View>
+				</View>
 			</View>
 		);
 	}

src/pages/toolKit/index.js

@@ -25,7 +25,7 @@ export default class Index extends Component {
   componentWillMount() {
     savePoint({
       event: 'calculator',
-      eventType: 'main',
+      eventType: 'center',
       propertyName: '房贷计算器',
       data:'{}'
     }).then(res => {

src/services/user.js

@@ -8,7 +8,8 @@ import {
   API_QUERY_DOCUMENTVERIFY,
   API_QUERY_DOCUMENTVERIFY_list,
   API_QUERY_TADRAINGE,
-  API_TACUSTOMIMG
+  API_TACUSTOMIMG,
+  API_POINTS_RULE
 } from '@/constants/api'
 
 /**
@@ -73,4 +74,9 @@ export const getHFiveDetail = payload => fetch({ url:`${API_QUERY_TADRAINGE}/${p
  * @param {*} payload
  */
 export const getIndexShare = payload => fetch({ url:API_TACUSTOMIMG, payload  })
+/**
+ * 获取积分规则
+ * @param {*} payload
+ */
+export const getPointsRule = payload => fetch({ url:API_POINTS_RULE, payload  })
 

src/utils/page.js

@@ -8,7 +8,7 @@ function isFunction(fn) {
 }
 
 export function withDetail(opts = {}) {
-  return function (OrigComp) {  
+  return function (OrigComp) {
     class WrapperComponent extends OrigComp {
       // 数据详情加载
       // _$_dataReady 被透传到父组件,  父组件加载完数据之后需要调用 this._$_dataReady()
@@ -27,7 +27,7 @@ export function withDetail(opts = {}) {
 
         // 执行埋点
         this._$_dataLoadPromise.then(this._track.bind(this))
-  
+
         if (super.componentWillMount) {
           super.componentWillMount();
         }
@@ -57,7 +57,8 @@ export function withDetail(opts = {}) {
         }
       }
 
-      async _track () {
+      async _track() {
+    
         // 埋点
         let trackPayload = opts.track || {}
 
@@ -66,10 +67,10 @@ export function withDetail(opts = {}) {
             ...trackPayload,
             ...this._$_track(),
           }
-          const { recordId } = await savePoint(trackPayload)
-
-          this._$_trackOverFn = () => updatePoint(recordId)
         }
+        const { recordId } = await savePoint(trackPayload)
+
+        this._$_trackOverFn = () => updatePoint(recordId)
       }
     }
 

src/utils/ruleToast.js

@@ -0,0 +1,35 @@
+import Taro, { Component } from '@tarojs/taro'
+import { getPointsRule } from '@/services/user'
+
+/**
+ * 积分提示
+ * @param {*} code
+ */
+export function rule(code) {
+
+    return new Promise((resolve, reject) => {
+        getPointsRule().then(res => {
+            const rule = (res.records || []).filter(item => item.code == code)[0]
+            switch (code) {
+                case 'checkin':
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `签到成功，获取${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '签到成功！' })
+                // case 'share-poster':
+                //     return rule.pointsAmount > 0 ? Taro.showToast({ title: `签到成功，获取${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '签到成功！', icon: 'none' })
+                case 'recommend-customer':
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `后台审核通过后您将获得${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '提交成功' })
+                case 'signup-agent':
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `授权成功，获取${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '授权成功！' })
+                case 'document_verify':
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `后台审核通过后您将获得${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '提交成功！' })
+                case 'activity_checkin':
+                    return rule.pointsAmount > 0 ? Taro.showToast({ title: `签到成功，获取${rule.pointsAmount}积分`, icon: 'none' }) : Taro.showToast({ title: '签到成功！' })
+                default:
+                    return
+            }
+        }).catch(err => {
+            console.error(err)
+            reject(err.message || err)
+        })
+    })
+
+}

src/utils/track.js

@@ -4,13 +4,13 @@ import { savePoint, updatePoint } from '@/services/common'
 const pathEventTypeMap = {
   // '' : 'agent',  // 暂时不需要
   // '' : 'info',  // 暂时不需要
-  'pages/activity/detail/index' : { type: 'activity', desc: '活动' },
-  'pages/activity/detail/assistance' : { type: 'activity', desc: '活动' },
-  'pages/activity/detail/assemble' : { type: 'activity', desc: '活动' },
-  'pages/project/detail/index' : { type: 'building', desc: '项目' },
-  'pages/card/index' : { type: 'card', desc: '名片' },
-  'pages/project/index' : { type: 'main', desc: '首页' },
-  'pages/news/detail/index' : { type: 'news', desc: '资讯' },
+  'pages/activity/detail/index': { type: 'activity', desc: '活动' },
+  'pages/activity/detail/assistance': { type: 'activity', desc: '活动' },
+  'pages/activity/detail/assemble': { type: 'activity', desc: '活动' },
+  'pages/project/detail/index': { type: 'building', desc: '项目' },
+  'pages/card/index': { type: 'card', desc: '名片' },
+  'pages/project/index': { type: 'main', desc: '首页' },
+  'pages/news/detail/index': { type: 'news', desc: '资讯' },
   'pages/project/h5Page': { type: 'h5', desc: 'H5' },
 }
 
@@ -21,7 +21,7 @@ const pathEventTypeMap = {
 export async function trackUserSource(router) {
   const { path, query, scene } = router || {}
 
-  const pageInfo = pathEventTypeMap['path'] || { type: '', desc: '其他' }
+  const pageInfo = pathEventTypeMap[path] || { type: '', desc: '其他' }
 
   const trackPayload = {
     event: 'start',
@@ -32,14 +32,21 @@ export async function trackUserSource(router) {
     sceneId: scene,
     sharePersonId: (query || {}).recommender,
   }
+  console.log(trackPayload, "trackPayloadtrackPayloadtrackPayload")
+  console.log(trackPayload.sceneId, "sceneIdsceneIdsceneIdsceneIdsceneId")
+  console.log(trackPayload.eventType, "eventTypeeventTypeeventTypeeventTypeeventType")
 
   try {
+    const sceneList = [1005, 1006, 1053, 1042, 1007, 1008, 1011, 1012, 1013, 1045, 1046, 1047, 1048, 1058, 1067, 1000]
+    if (sceneList.indexOf(trackPayload.sceneId) != -1) {
 
-    const { recordId } = await savePoint(trackPayload)
-    return function () { updatePoint(recordId); }
+      const { recordId } = await savePoint(trackPayload)
+      return function () { updatePoint(recordId); }
+
+    }
 
   } catch (e) {
     console.error('进入小程序埋点出错:', e);
-    return function(){}
+    return function () { }
   }
 }