mix

src/pages/activity/activity.js

@@ -21,6 +21,27 @@ export default class active extends Component {
 
   state = {
     current: 0,
+    recordId: undefined, // 埋点ID
+  }
+  
+  componentWillMount() {
+    // App.zhuge.track('查看活动列表页面')
+    savePoint({
+      event: 'list',
+      eventType: 'activity',
+      propertyName: '活动列表',
+      data: '{}'
+    }).then(res => {
+      this.setState({
+        recordId: res.recordId
+      })
+      console.log('活动列表')
+    })
+  }
+
+  componentWillUnmount() {
+    const { recordId } = this.state
+    recordId && updatePoint(recordId)
   }
 
   handleClick(value) {

src/pages/activity/detail/assemble.js

@@ -63,6 +63,7 @@ export default class Detail extends Component {
     posterVisible: false, // 海报分享
     grantPhoneVisible: false, // 授权电话
     grantAvatarVisible: false, // 授权头像
+    pointRecordId: undefined, // 埋点ID
   }
 
   componentWillMount() {
@@ -76,6 +77,7 @@ export default class Detail extends Component {
 
   componentWillUnmount() {
     this.clearTicker()
+    this.state.pointRecordId && updatePoint(pointRecordId)
   }
 
   // 初始化页面数据
@@ -218,7 +220,9 @@ export default class Detail extends Component {
         buildingId: res.taShareActivity.buildingId,
         targetId: id,
         data: '{"recordId":"' + recordId + '"}'
-      }).then(() => { })
+      }).then((res) => {
+        this.setState({ pointRecordId: res.recordId })
+      })
     })
   }
 

src/pages/activity/detail/assistance.js

@@ -62,6 +62,7 @@ export default class Detail extends Component {
     grantPhoneVisible: false, // 授权电话
     grantAvatarVisible: false, // 授权头像
     handleHelpBtn: true, // 立即助力好友
+    pointRecordId: undefined, // 埋点ID
   }
 
   componentWillMount() {
@@ -75,6 +76,7 @@ export default class Detail extends Component {
 
   componentWillUnmount() {
     this.clearTicker()
+    this.state.pointRecordId && updatePoint(pointRecordId)
   }
 
   // 初始化页面数据
@@ -220,7 +222,9 @@ export default class Detail extends Component {
         buildingId: res.helpActivity.buildingId,
         targetId: id,
         data: '{"initiateId":"' + initiateId + '"}'
-      }).then(() => { })
+      }).then((res) => {
+        this.setState({ pointRecordId: res.recordId })
+      })
     })
   }
 

src/pages/activity/index.js

@@ -44,7 +44,7 @@ export default class Index extends Component {
   
   componentWillUnmount() {
     const { recordId } = this.state
-    updatePoint(recordId)
+    recordId && updatePoint(recordId)
   }
 
   loadList(pageNumber) {

src/pages/checkin/index.js

@@ -71,9 +71,7 @@ export default class checkin extends Component {
   }
 
   render () {
-    const { data, style } = this.props
-
-
+    const { data = { person: {}, dynamic: {} }, style } = this.props
 
     return (
       <View className="checkin" style="width:100vw;height:100vh;" >
@@ -81,13 +79,13 @@ export default class checkin extends Component {
         {/* <checkinsuccess></checkinsuccess> */}
         {/* <achievePhone></achievePhone> */}
         <View>
-          <Image className="img" src={this.state.data.dynamic.imgUrl}  ></Image>
+          <Image className="img" src={data.dynamic.imgUrl}  ></Image>
         </View>
         <View style="margin-bottom:20px"  >
-          <View className="text1"> <Text>{this.state.data.dynamic.title}</Text></View>
+          <View className="text1"> <Text>{data.dynamic.title}</Text></View>
         </View >
 
-        {this.state.data.enlist != null && <View>
+        {data.enlist != null && <View>
           <View style="text-align: center;">
             <Text className="line">- - - - - - - - - </Text>
             <Text className="text2">活动报名信息</Text>
@@ -97,24 +95,22 @@ export default class checkin extends Component {
           <View className="text3">
             <View className='at-row'>
               <View className='at-col at-col-3'>用户名：</View>
-              <View className='at-col at-col-9'>{this.state.data.person.name || this.state.data.person.nickname}</View>
+              <View className='at-col at-col-9'>{data.person.name || data.person.nickname}</View>
             </View>
             <View className='at-row'>
               <View className='at-col at-col-3'>手机号：</View>
-              <View className='at-col at-col-9'>{this.state.data.person.tel || this.state.data.person.phone}</View>
+              <View className='at-col at-col-9'>{data.person.tel || data.person.phone}</View>
             </View>
             <View className='at-row'>
               <View className='at-col at-col-3'>参与人数：</View>
-              <View className='at-col at-col-9'>{this.state.data.enlist.attendNum}</View>
+              <View className='at-col at-col-9'>{(data.enlist || {}).attendNum}</View>
             </View>
           </View>
 
-
-
-          {!this.state.data.person.status && <Image className="checkinImg" src={require('@assets/checkin/checkin.png')} onClick={this.checkinActive}   ></Image>}
-          {this.state.data.person.status && <Image className="checkinImg" src={require('@assets/checkin/checkined.png')}></Image>}
+          {!data.person.status && <Image className="checkinImg" src={require('@assets/checkin/checkin.png')} onClick={this.checkinActive}   ></Image>}
+          {data.person.status && <Image className="checkinImg" src={require('@assets/checkin/checkined.png')}></Image>}
         </View>}
-        {this.state.data.enlist == null && <View className="unregistered">
+        {data.enlist == null && <View className="unregistered">
           <View>
             <Image className="img1" src={require('@assets/checkin/noentry.png')} ></Image>
           </View>

src/pages/person/index.js

@@ -97,18 +97,14 @@ export default class Person extends Component {
       case ROLE_CODE['CONSULTANT']:
         this.setState({ consultant: true })
         return '置业顾问'
-        break;
       case ROLE_CODE['ESTATE_AGENT']:
         this.setState({ isAgent: true })
         return '独立经纪人'
-        break;
       case ROLE_CODE['CHANNEL_AGENT']:
         this.setState({ isAgent: true })
         return '渠道经纪人'
-        break;
       default:
         return '普通用户'
-        break;
     }
   }
 

src/pages/project/detail/index.js

@@ -279,7 +279,7 @@ export default class Index extends Component {
     getUserPhone(e, (phoneNumber) => {
       const { userInfo: { person: { personId, nickname, name } } } = this.props
       Taro.navigateTo({
-        url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.id}&receiverName=${encodeURIComponent(item.name)}`
+        url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.id}&receiverName=${encodeURIComponent(item.userName)}`
       })
     })
   }

src/pages/project/index.js

@@ -7,7 +7,7 @@ import ActivityItem from '../activity/item'
 
 import ready from '@utils/ready'
 
-import { queryBanners, savePoint } from '@services/common'
+import { queryBanners, savePoint, updatePoint } from '@services/common'
 import { queryNewsList, queryHelpGroup } from '@services/news'
 import { queryActivityList } from '@services/activity'
 import { dispatchCitySelected } from '@actions/city'
@@ -66,6 +66,7 @@ export default class Index extends Component {
       })
     })
   }
+
   componentDidShow() {
     if (this.props.curCity.id) {
       ready.queue(() => {
@@ -74,6 +75,11 @@ export default class Index extends Component {
     }
   }
 
+  componentWillUnmount() {
+    const { recordId } = this.state
+    recordId && updatePoint(recordId)
+  }
+
   getLocation() {
     const { cityList } = this.props
     Taro.getLocation().then(location => {

src/pages/shop/index.js

@@ -12,7 +12,7 @@ import { queryBanners } 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 { queryUserInfo, doUserSignin } from '@services/user'
 
 // import getUserPhone from '@utils/getUserPhone'
 import Authorize from '@components/authorize'
@@ -32,10 +32,10 @@ export default class Shop extends Component {
       'https://estateagents.oss-cn-shanghai.aliyuncs.com/images/banner/4.jpg',
       'https://estateagents.oss-cn-shanghai.aliyuncs.com/images/banner/5.jpg'
     ],
-    user: {},
     cityName: '',
     goodsBuilding: [],
     goodsList: [],
+    user: {},
   }
 
   componentDidShow() {
@@ -46,7 +46,7 @@ export default class Shop extends Component {
       this.loadGoodsBuilding()
 
       //    this.loadCity()
-      // this.loadUserInfo()
+      this.loadUserInfo()
     })
     Taro.hideLoading()
   }
@@ -169,7 +169,14 @@ export default class Shop extends Component {
       // App.zhuge.track('签到成功')
     })
   }
-
+  
+  loadUserInfo() {
+    // debugger
+    queryUserInfo().then(user => {
+      // debugger
+      this.setState({ user })
+    })
+  }
 
   renderLogin() {
     return <Authorize></Authorize>
@@ -248,9 +255,9 @@ export default class Shop extends Component {
   }
 
   renderDetail() {
-    // const { user } = this.state
+    const { user } = this.state
     const { userInfo: { person }, curCity } = this.props
-    const { bannerList } = this.state
+    const { bannerList = [] } = this.state
     return (
       <View className="page">
         {/* <Search placeholder="请输入要搜索的商品名称" onSearch={this.onSearch} /> */}
@@ -267,7 +274,11 @@ export default class Shop extends Component {
               <Image className="bg" src={require('@assets/shop/background.jpg')} ></Image>
               <Image className="user__left__headimg" src={person.avatarurl} />
               <View className='user__left__name'>{person.nickname}</View>
-              <View className="qiandao__btn" onClick={this.doSign}>签到</View>
+              {
+                user.havaSigned ?
+                (<View className="qiandao__btn">已签到</View>) :
+                (<View className="qiandao__btn" onClick={this.doSign}>签到</View>)
+              }
               <View className='message'>
                 <View className='message__left'>
                   <View className='user__jifen'>