visitrecord

config/dev.js

@@ -5,12 +5,12 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST:  '"https://dev.jinchengjiaye.com"',//测试
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // HOST:  '"https://dev.jinchengjiaye.com"',//测试
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.2.52:8080"',
-    // WSS_HOST: '"ws://192.168.2.52:8080"',
+    HOST: '"http://192.168.2.52:8080"',
+    WSS_HOST: '"ws://192.168.2.52:8080"',
   },
   weapp: {},
   h5: {}

src/constants/api.js

@@ -181,3 +181,5 @@ export const API_SEX_INFO = resolvePath('genderStatistic')
 export const API_ECHERTS_DAILY = resolvePath('customerStatisticDaily')
 export const API_ECHERTS_MONTH = resolvePath('customerStatisticMonthly')
 export const API_BUILDING_TYPE = resolvePath('getByBuildingIdSelectBuildingProjectType')
+export const API_CONSULTANT_VISIT_RECORD = resolvePath('visitRecord')
+export const API_MORE_ACTIVITY = resolvePath('visitRecord/activity')

src/pages/activity/activity.js

@@ -23,7 +23,7 @@ export default class active extends Component {
     current: 0,
     recordId: undefined, // 埋点ID
   }
-  
+
   componentWillMount() {
     // App.zhuge.track('查看活动列表页面')
     savePoint({
@@ -38,18 +38,23 @@ export default class active extends Component {
       console.log('活动列表')
     })
   }
-  componentDidShow(){
-    if(this.$router.params.projectIndex){
-         this.setState({
-          current: 1
-        })
-      }
+  componentWillMount() {
+    if (this.$router.params.projectIndex) {
+      this.setState({
+        current: 1
+      })
+    }
+    else {
+      this.setState({
+        current: 0
+      })
+    }
   }
 
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
- 
+
   }
 
   handleClick(value) {

src/pages/card/list/index.js

@@ -60,6 +60,8 @@ export default class Index extends Component {
   }
 
   handleChatClick(item, e) {
+    console.log(item,"item")
+    console.log(e,"eeeeeeeeeeeeeeeeeeeeeeeeeee")
     e && e.stopPropagation()
     const { userInfo: { person: { personId, nickname, name } } } = this.props
     

src/pages/person/accessRecord.js

@@ -1,6 +1,12 @@
 import Taro, { Component } from '@tarojs/taro';
+import ListView from '@components/ListView'
+import { connect } from '@tarojs/redux'
 import './index.scss'
+import { getConsulantVisitRecord, getMoreVisitRecord } from '@services/person'
+import { savePoint, updatePoint } from '@services/common'
+import dayjs from 'dayjs';
 
+@connect(state => state.user)
 export default class Person extends Component {
   config = {
     navigationBarTitleText: '访问记录'
@@ -8,64 +14,167 @@ export default class Person extends Component {
 
   state = {
     popVisible: false,
+    recordId: undefined, // 埋点ID
+    recordList: [],
+    hasMore: true,
+    isEmpty: false,
+    pageIndex: 1,
+    moreRecord: []
   }
 
-  componentDidShow() {
-    // Taro.showLoading()
+  componentWillMount() {
+
+    savePoint({
+      event: 'list',
+      eventType: 'activity',
+      propertyName: '访问记录',
+      data: '{}'
+    }).then(res => {
+      this.setState({
+        recordId: res.recordId
+      })
+      console.log('访问记录')
+    })
+  }
+  componentWillUnmount() {
+    const { recordId } = this.state
+    recordId && updatePoint(recordId)
   }
+
   handleMaskClose() {
     this.setState({
       popVisible: false,
     })
   }
-  activityList(){
+  componentDidShow() {
+    Taro.showLoading()
+    this.loadList(1)
+
+  }
+  loadList(pageNumber) {
+    console.log(this.props, "this.props")
+    const { userInfo: { person } } = this.props
+    const payload = {
+      userId: person.userId,
+      pageNumber,
+      pageSize: 5
+    }
+    getConsulantVisitRecord(payload).then(res => {
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.recordList.concat(_list)
+      this.setState({
+        recordList: newList,
+        isEmpty: total == 0 || !res,
+        hasMore: current < pages,
+        pageIndex: current >= pages ? pages : current
+      })
+      Taro.hideLoading()
+    })
+  }
+  onScrollToLower = async (fn) => {
+    const { pageIndex } = this.state;
+    this.loadList(pageIndex + 1)
+    fn && fn();
+  }
+  onPullDownRefresh = (rest) => {
+    // debugger
+    if (this.refreshing) return
+    this.refreshing = true
+    this.loadList(1)
+    rest && rest()
+    this.refreshing = false
+  }
+
+
+  showActivityList(item) {
+    Taro.showLoading()
     this.setState({
       popVisible: true,
     })
+
+    const { userInfo: { person } } = this.props
+    const payload = {
+      userId: person.userId,
+      personId: item.personId,
+    }
+    getMoreVisitRecord(payload).then(res => {
+      Taro.hideLoading()
+      this.setState({
+        moreRecord: res.records || []
+      })
+
+    }).catch(err => {
+      console.log(err, "获取更多访问记录err")
+      Taro.hideLoading()
+    })
+  }
+  handleChatClick(item, e) {
+    e.stopPropagation()
+    const { userInfo: { person: { personId, nickname, name } } } = this.props
+    Taro.navigateTo({
+      url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.personId}&receiverName=${encodeURIComponent(item.userName)}`
+    })
   }
   renderPop() {
+    const { moreRecord } = this.state
     return (
       <View className="pop-box">
-
-
         <View className="content">
           <Icon className="iconfont close icon-buoumaotubiao20" onClick={this.handleMaskClose}></Icon>
-          <View className="activity-item">
-            <View className="name">
-              活动名称展示处活动名称展示处活动名么的事借款部分手机电脑热风
-            </View>
-            <View className="time">
-              2019-12-06 12:23:54
-            </View>
+          <View className="scroll-con">
+            {
+              moreRecord.map(item => (
+                <View className="activity-item">
+                  <View className="name">{item.activityName || '　'}</View>
+                  <View className="time">{`${dayjs(item.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</View>
+                </View>
+              ))
+            }
           </View>
         </View>
       </View>
     )
   }
-
   render() {
-    const {popVisible} = this.state
+    const { popVisible, isEmpty, hasMore, recordList } = this.state
     return (
       <Block>
-        {popVisible&&this.renderPop()}
-        <View className='access-page'>
-          <View className='item'>
-            <View className="tag">我的客户</View>
-            <Image className="touxiang" src={require('@assets/default-avatar.png')}></Image>
-            <View className="info-top">
-              <View className="name">曹建芳</View>
-              <View style="display: flex;align-items: center;"><Image className="goutong-icon" src={require('@assets/person/zixun.png')}></Image><Text className="goutong">在线沟通</Text></View>
-            </View>
-            <View className="activity-name" onClick={this.activityList}>
-              活动名称展示处活动名称展示处活动名么的事借款部分手机电脑热风
-            </View>
-            <Text className="right-icon"></Text>
-            <View className="activity-time">
-              2019-12-06 12:23:54
-            </View>
+        {popVisible && this.renderPop()}
+
+        <ListView
+          className="wrap"
+          needInit
+          isEmpty={isEmpty}
+          emptyText="暂无访问记录~"
+          hasMore={hasMore}
+          onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
+          onScrollToLower={fn => this.onScrollToLower(fn)}
+        >
+          <View className='access-page'>
+
+            {
+              recordList.map(item => (
+                <View className='item' key={item + 'more'}>
+                  {item.myCustomer == 1 && <View className="tag">我的客户</View>}
+                  <Image className="touxiang" src={require('@assets/default-avatar.png')}></Image>
+                  <View className="info-top">
+                    <View className="name">{item.userName || '　'}</View>
+                    <View style="display: flex;align-items: center;" onClick={this.handleChatClick.bind(this, item)}><Image className="goutong-icon" src={require('@assets/person/zixun.png')}></Image><Text className="goutong">在线沟通</Text></View>
+                  </View>
+                  <View className="activity-name" onClick={this.showActivityList.bind(this, item)}>
+                    {item.activityName || '　'}
+                  </View>
+                  <Text className="right-icon"></Text>
+                  <View className="activity-time">
+                    {`${dayjs(item.createDate).format('YYYY-MM-DD HH:mm:ss')}`}
+                  </View>
+                </View>
+              ))
+            }
           </View>
-        </View>
-      </Block>
+        </ListView>
+      </Block >
     )
   }
 }

src/pages/person/index.scss

@@ -338,6 +338,7 @@
     border-radius: 12px;
     padding: 30px;
     position: relative;
+    margin-bottom: 20px;
     .tag{
       position: absolute;
       left: 26px;
@@ -432,22 +433,30 @@
       background-color: #fff;
       border-radius: 12px;
       padding: 20px 20px;
-      .activity-item{
-        padding: 16px 30px;
-        border-bottom: 2px solid rgba(0,0,0,0.08);
-        .name{
-          font-size: 32px;
-          color: #353535;
-          width: 600px;
-          @include text-ellipsis;
-        }
-        .time{
-          font-size: 26px;
-          color:rgba(0,0,0,0.33);
-          text-align: right;
-          margin-top: 20px;
+      
+      .scroll-con{
+        height: 500px;
+        width: 100%;
+        overflow-y: scroll;
+        .activity-item{
+          padding: 16px 30px;
+          border-bottom: 2px solid rgba(0,0,0,0.08);
+          .name{
+            font-size: 32px;
+            color: #353535;
+            width: 600px;
+            @include text-ellipsis;
+          }
+          .time{
+            font-size: 26px;
+            color:rgba(0,0,0,0.33);
+            text-align: right;
+            margin-top: 20px;
+          }
         }
+
       }
+    
     }
     .close{
       font-size: 48px;

src/pages/project/h5Page.js

@@ -6,6 +6,8 @@ import './index.scss'
 import { getHFiveDetail } from '@services/user'
 import ready from '@utils/ready'
 import { reportClient } from '@services/report'
+import { ROLE_CODE } from '@constants/user'
+import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
 const bgImg = require('@assets/helpgroup/bg.png')
 
 @connect(state => state.user, { ...actions })
@@ -18,9 +20,72 @@ export default class Index extends Component {
     webViewVisible: false,
     pageInfo: {}
   }
+
+
+
+  // 埋点
+  success() {
+    const { userInfo: { person } } = this.props
+    const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
+    const firstShare = this.$router.params.firstShare || ""
+    savePoint({
+      event: 'detail',
+      eventType: 'h5',
+      propertyName: 'h5活动',
+      consultantId: consultant,
+      sharePersonId: this.$router.params.sharePersonId,
+      data: '{"firstShare":"' + firstShare + '"}'
+    }).then(res => {
+      this.setState({
+        recordId: res.recordId
+      })
+      console.log('访问记录')
+    })
+  }
+  onShareAppMessage = () => {
+    const { pageInfo } = this.state
+    const currentPage = this.currentPageAndParams().join('?')
+    return {
+      title: pageInfo.shareTitle,
+      path: currentPage,
+      imageUrl: pageInfo.shareImg
+    }
+  }
+  getQRCode() {
+    const [page, scene] = this.currentPageAndParams()
+    const payload = { page, scene }
+    return new Promise((resolve) => {
+      getMiniQrcode(payload).then(qrCode => {
+        this.setState({ qrCode }, resolve)
+      })
+    })
+  }
+
+
+  currentPageAndParams() {
+    const { userInfo: { person } } = this.props
+    const consultant = person.personType == ROLE_CODE['CONSULTANT'] ? person.userId : ""
+    const firstShare = this.$router.params.firstShare || person.personId
+
+    let queryParams = [
+      `sharePersonId=${person.personId}`,
+      `consultant=${consultant}`,
+      `firstShare=${firstShare}`,
+      `id=${this.$router.params.id}`
+    ]
+
+
+    const res = [
+      'pages/project/h5Page',
+      queryParams.join('&'),
+    ]
+
+    return res
+  }
   componentWillMount() {
 
     ready.queue(() => {
+      // h5id 、第一个分享人ID、置业顾问ID、分享人ID 
       getHFiveDetail(this.$router.params.id).then(res => {
         this.setState({
           pageInfo: res
@@ -30,6 +95,7 @@ export default class Index extends Component {
       if (person.avatarurl) {
         // 头像手机号都有
         if (person.phone) {
+          this.success()
           this.setState({
             avatarVisible: false,
             phoneVisible: false,
@@ -84,15 +150,7 @@ export default class Index extends Component {
       }
     })
   }
-  // onShareAppMessage = () => {
-  //   const {pageInfo } = this.state
-  //   // const { agent: { nickname, personId, agentCode } } = this.state
-  //   return {
-  //     // title: `${nickname}邀请你成为经纪人`,
-  //     path: `/pages/project/h5Page?id=${personId}&from=share&recommender=${personId}&agentCode=${agentCode}`,//分享地址
-  //     imageUrl: pageInfo.shareImg
-  //   }
-  // }
+
   getPhoneNumber(e) {
     getUserPhone(e, (phoneNumber) => {
       if (!phoneNumber) {
@@ -102,6 +160,7 @@ export default class Index extends Component {
         })
       } else {
         console.log('授权手机成功')
+        this.success()
         this.setState({
           phoneVisible: false,
           webViewVisible: true,
@@ -122,31 +181,19 @@ export default class Index extends Component {
       buildingId,
       phone: realPhone
     }
-    const { cardInfo, userInfo: { person } } = this.props
     if (person.personId != cardInfo.id) {
       reportClient(payload).then(res => {
-        this.hideModal()
         console.log('恭喜您绑定成功')
-        // this.setState({ bound: true })
-        // if (res !== 'bound') {
-        //   Taro.showToast({
-        //     title: '恭喜您绑定成功'
-        //   })
-        // }
       }).catch(err => {
         console.error(err)
         this.setState({ bound: true })
-
-        // Taro.showToast({
-        //   title: err.message || err,
-        //   icon: 'none'
-        // })
       })
     }
   }
 
   renderMaskBanner() {
     const { avatarVisible, phoneVisible, pageInfo } = this.state
+
     return (
       <View>
         <Image src={pageInfo.middleImg || bgImg} mode='widthFix' className='bg_img'></Image>
@@ -162,17 +209,23 @@ export default class Index extends Component {
           {phoneVisible &&
             <Button className="phone-btn" open-type="getPhoneNumber" lang="zh_CN" onGetphonenumber={this.getPhoneNumber}>点击授权查看详情</Button>
           }
-
         </View>
       </View>
     )
   }
   render() {
-    const { pageInfo, webViewVisible } = this.state
+    const { pageInfo, webViewVisible, qrCode } = this.state
+    const { userInfo: { person } } = this.props
+    const webUrlParams = [
+      `personId=${person.personId}`,
+      `h5id=${this.$router.params.id}`,
+      `qrCode=${qrCode}`,
+    ].join('&')
+
     return (
       <Block>
         {this.renderMaskBanner()}
-        {webViewVisible && <WebView src={pageInfo.h5Address + '?personid=xxx&h5id=xxx&xxxx'} />}
+        {webViewVisible && <WebView src={`${pageInfo.h5Address}?${encodeURIComponent(webUrlParams)}`} />}
       </Block>
     )
   }

src/pages/project/index.js

@@ -543,6 +543,12 @@ export default class Index extends Component {
     this.props.onChange && this.props.onChange(current)
   }
 
+  handleNoticeClick = (item) => {
+    Taro.navigateTo({
+      url: '/pages/news/detail/index?id=' + item.newsId
+    })
+  }
+
   render() {
     const { curCity } = this.props
     const { newsList, achieve } = this.state
@@ -607,7 +613,7 @@ export default class Index extends Component {
                 newsList.length &&
                 <View style="background-color:#fff">
                   <View className="notice-box">
-                    <View style="  display: flex;align-items: center;">
+                    <View style="display: flex;align-items: center;">
                       <Image className="notice-icon" src={require('@assets/notice.png')}></Image>
                       <Swiper
                         className='notice-swiper'
@@ -621,7 +627,7 @@ export default class Index extends Component {
                           newsList.map((list, inx) => {
                             return (
                               <SwiperItem key={`img-${inx}`}>
-                                <View className="notice-text">
+                                <View className="notice-text" onClick={this.handleNoticeClick.bind(this,list)}>
                                   {list.newsName}
                                 </View>
                               </SwiperItem>
@@ -630,9 +636,11 @@ export default class Index extends Component {
                         }
                       </Swiper>
                     </View>
-                    <View className="notice-more" onClick={this.toNewsList}>
-                      更多 <Text className="iconfont icon-more"></Text>
-                    </View>
+                    {newsList.length > 1 &&
+                      <View className="notice-more" onClick={this.toNewsList}>
+                        更多 <Text className="iconfont icon-more"></Text>
+                      </View>
+                    }
                   </View>
                 </View>
               }

src/services/person.js

@@ -10,6 +10,8 @@ import {
   API_ECHERTS_DAILY,
   API_ECHERTS_MONTH,
   API_BUILDING_TYPE,
+  API_CONSULTANT_VISIT_RECORD,
+  API_MORE_ACTIVITY
 } from '@constants/api'
 
 
@@ -70,11 +72,23 @@ export const getActivityList = (payload) => fetch({ url: API_ACTIVITY_LIST_CUSTO
  * @param {*} payload  
  */
 export const getFollowRecord = (payload) => fetch({ url: API_FOLLOW_LIST, payload })
+
 /**
  * 添加跟进记录
  * @param {*} payload  
  */
 export const addFollowRecord = (payload) => fetch({ url: API_FOLLOW_LIST, payload, method: 'POST' })
+/**
+ * 获取访问记录
+ * @param {*} payload  
+ */
+export const getConsulantVisitRecord = (payload) => fetch({ url: API_CONSULTANT_VISIT_RECORD, payload })
+/**
+ * 获取访问记录
+ * @param {*} payload  
+ */
+export const getMoreVisitRecord = (payload) => fetch({ url: API_MORE_ACTIVITY, payload })
+