接口对接

src/constants/api.js

@@ -167,3 +167,6 @@ export const API_GROUP_JOIN = resolvePath('taShareChildRecord')
 export const API_MY_CUSTOMER = resolvePath('inventory/customer/statistics')
 export const API_CUSTOMER_LIST = resolvePath('inventory/customer/statistics')
 export const API_CUSTOMER_DETAIL = resolvePath('inventory/customer')
+export const API_VISIT_RECORD = resolvePath('taPersonVisitRecord')
+export const API_ACTIVITY_LIST_CUSTOMER = resolvePath('customer/activity/list')
+export const API_FOLLOW_LIST = resolvePath('taCustomerFollowUpRecord')

src/pages/person/customerAnalysis/analysis.js

@@ -1,8 +1,8 @@
 import Taro, { Component } from '@tarojs/taro';
 import Authorize from '@components/authorize'
 import { View } from "@tarojs/components";
-import MoveChart from '../../More/More.js'
-import LineChart from '../../components/LineChart'
+// import MoveChart from '../../More/More'
+// import LineChart from '../../components/LineChart'
 import './index.scss'
 import { AtTabs, AtTabsPane, AtProgress } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
@@ -44,6 +44,7 @@ export default class analysis extends Taro.Component {
         <AtTabs className="tab-bar" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >
             <View>
+              {/* <MoveChart/> */}
               {/* <View className="sex-box">
                 <View className="sex">性别</View>
                 <AtProgress percent={25} strokeWidth={6} color='#FF4949' />

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

@@ -27,10 +27,9 @@ export default class Item extends Component {
           <View className="left">
             <View className="title">{data.title}</View>
             {data.startDate &&
-              <View className={data.activityStatus == 0 ? "status signed " : data.activityStatus == 1 ? "status nostart" : data.activityStatus == 2 ? "status fail" : "status"}>{data.activityStatus == 0 ? "立即参与" : data.activityStatus == 1 ? "未开始" : data.activityStatus == 2 ? "已结束" : "已参与"}</View>
+              <View className={data.jionStatus == '已签到' ? "status signed " : data.jionStatus == '成功已核销' ? "status primary" : data.jionStatus == '失败' ? "status fail" : "status"}>{data.jionStatus || ''}</View>
             }
           </View>
-
           {data.startDate &&
             <View className="time">参与时间：{`${dayjs(data.startDate).format('YYYY年MM月DD日 HH:mm:ss')}`}</View>
           }

src/pages/person/customerAnalysis/item/index.scss

@@ -46,7 +46,7 @@
     .title {
       font-size: 28px;
       color: #333;
-      width: 500px;
+      width: 460px;
       @include text-ellipsis;
     }
     .time {
@@ -69,7 +69,7 @@
     .signed{
       color: #F6B61D;
     }
-		.nostart {
+		.primary {
       color:$primary-color;
     }
     .fail{

src/pages/person/customerAnalysis/myCustomer.js

@@ -2,11 +2,11 @@ import Taro, { Component } from '@tarojs/taro';
 import { AtTabs, AtTabsPane } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
 import { savePoint, updatePoint } from '@services/common'
-import { getCustomerDetail } from '@services/person'
+import { getCustomerDetail, getVisitRecord, getActivityList, getFollowRecord } from '@services/person'
 import { connect } from '@tarojs/redux'
 import './index.scss'
 import ActivityItem from './item'
-import { getActNewList } from '@services/activity'
+import dayjs from 'dayjs'
 const iconImg = require('@assets/person/icon.png')
 
 @connect(({ user, city }) => ({ user, city }))
@@ -19,7 +19,7 @@ export default class myCustomer extends Taro.Component {
   state = {
     current: 0,
     recordId: undefined, // 埋点ID
-    list: [],
+    activityList: [],
     followVisible: false,
     baseVisible: false,
     message: '', //跟进内容
@@ -27,6 +27,7 @@ export default class myCustomer extends Taro.Component {
     selectorChecked: '',
     selector: ['美国', '中国', '巴西', '日本'],
     customerDetail: {},
+    followRecord: []
 
   }
 
@@ -37,6 +38,45 @@ export default class myCustomer extends Taro.Component {
   }
 
   handleClick(value) {
+    if (value == 1) {
+      const { customerId } = this.$router.params
+      const payload = {
+        pageNumber: '0',
+        pageSize: '10',
+        customerId,
+      }
+      getVisitRecord(payload).then(res => {
+        // this.setState({
+        //   customerDetail: res || {}
+        // })
+      })
+    } else if (value == 2) {
+      const { customerId } = this.$router.params
+      const payload = {
+        pageNumber: '0',
+        pageSize: '10',
+        customerId,
+      }
+      getActivityList(payload).then(res => {
+        this.setState({
+          activityList: res.records || []
+        })
+      })
+    } else if (value == 3) {
+      const { customerId } = this.$router.params
+      const payload = {
+        pageNumber: '0',
+        pageSize: '10',
+        customerId,
+      }
+      getFollowRecord(payload).then(res => {
+        console.log(res.records,"res")
+        this.setState({
+          followRecord: res.records 
+        }, console.log(this.state.followRecord, "followRecord")
+        )
+      })
+    }
     this.setState({
       current: value
     }, )
@@ -53,13 +93,14 @@ export default class myCustomer extends Taro.Component {
         customerDetail: res || {}
       })
     })
-    getActNewList().then(res => {
-      this.setState({
-        list: res.records || []
-      })
-    })
   }
   handleItemClick(item) {
+    // if (item.status == 0) {
+    //   Taro.showToast({
+    //     title: '当前活动已失效',
+    //     icon: 'none'
+    //   })
+    // } else {
     switch (item.type) {
       case 'help':
         Taro.navigateTo({
@@ -77,6 +118,7 @@ export default class myCustomer extends Taro.Component {
         })
         return
     }
+    // }
   }
   addFollow() {
     this.setState({
@@ -176,9 +218,7 @@ export default class myCustomer extends Taro.Component {
                 </Picker>
               </View>
               <View className="right-icon"></View>
-
             </View>
-
           </View>
           <View className="con-item">
             <View style="font-size:14px;color:#666">
@@ -215,7 +255,7 @@ export default class myCustomer extends Taro.Component {
   render() {
 
     const tabList = [{ title: '基本信息' }, { title: '访问记录' }, { title: '活动信息' }, { title: '跟进记录' }]
-    const { customerDetail, list, followVisible, baseVisible } = this.state
+    const { customerDetail, activityList, followRecord, followVisible, baseVisible } = this.state
     return (
       <View>
         {followVisible && this.renderFollowBox()}
@@ -237,7 +277,7 @@ export default class myCustomer extends Taro.Component {
         <AtTabs className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >
             <View className="tab-pane1 pane">
-              <View className="status">{customerDetail.status==1?'报备':customerDetail.status==2?'到访':customerDetail.status==3?'认筹':'签约'}</View>
+              <View className="status">{customerDetail.status == 1 ? '报备' : customerDetail.status == 2 ? '到访' : customerDetail.status == 3 ? '认筹' : '签约'}</View>
               <View className="base-item">意向项目：<View className="con">{customerDetail.intention || '暂无'}</View></View>
               <View className="base-item">物业类型：<View className="con">{customerDetail.realtyManageType || '暂无'}</View></View>
               <View className="base-item">项目类型：<View className="con">{customerDetail.demandType || '暂无'}</View></View>
@@ -260,8 +300,8 @@ export default class myCustomer extends Taro.Component {
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={2}>
             <View className="tab-pane3 pane">
-              {list.length > 0 &&
-                list.map(item => (
+              {activityList.length > 0 &&
+                activityList.map(item => (
                   <ActivityItem
                     data={item}
                     key={item.id}
@@ -273,10 +313,13 @@ export default class myCustomer extends Taro.Component {
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={3}>
             <View style="padding:10px 20px 120px 20px">
-              <View style=" display: flex;justify-content: space-between;align-items: center;color: #333;font-size: 16px;">
-                <View style=" display: flex;align-items: center;"><View style="width:8px;height:8px;margin-right:10px;display:inline-block;background:rgba(246,182,29,1);border-radius: 50%;"></View>编辑客户信息</View>
-                <View classNam="time" style=" font-size: 13px;color: #999;">2019年11月11日 12:24:59</View>
-              </View>
+              {/* {followRecord.map(item => {
+                <View style=" display: flex;justify-content: space-between;align-items: center;color: #333;font-size: 16px;"> */}
+                  {/* <View style=" display: flex;align-items: center;"><View style="width:8px;height:8px;margin-right:10px;display:inline-block;background:rgba(246,182,29,1);border-radius: 50%;"></View>{item.recordType}</View>
+                    <View classNam="time" style=" font-size: 13px;color: #999;">{dayjs(item.createDate).format('YYYY-MM-DD') || ''}</View> */}
+                {/* </View>
+              })
+              } */}
               <View className="btn" onClick={this.addFollow}>添加跟进</View>
             </View>
 

src/services/person.js

@@ -3,6 +3,9 @@ import {
   API_MY_CUSTOMER,
   API_CUSTOMER_LIST,
   API_CUSTOMER_DETAIL,
+  API_VISIT_RECORD,
+  API_ACTIVITY_LIST_CUSTOMER,
+  API_FOLLOW_LIST
 } from '@constants/api'
 
 
@@ -22,6 +25,21 @@ export const  queryCustomerList = (type, payload) => fetch({ url: `${API_CUSTOME
  * @param {*} customerId  
  */
 export const  getCustomerDetail = (customerId, payload) => fetch({ url: `${API_CUSTOMER_DETAIL}/${customerId}`, payload })
+/**
+ * 获取访问记录
+ * @param {*} payload  
+ */
+export const  getVisitRecord = ( payload) => fetch({ url: API_VISIT_RECORD, payload })
+/**
+ * 获取活动信息
+ * @param {*} payload  
+ */
+export const  getActivityList = ( payload) => fetch({ url: API_ACTIVITY_LIST_CUSTOMER, payload })
+/**
+ * 获取跟进记录
+ * @param {*} payload  
+ */
+export const  getFollowRecord = ( payload) => fetch({ url: API_FOLLOW_LIST, payload })