zls

src/app.scss

@@ -39,4 +39,23 @@
     transform: translateY(0);
     opacity: 1;
   }
+}
+.at-progress{
+  display: flex;
+  align-items: center;
+  margin-top:20px;
+  .at-progress__outer{
+    width: 480px;
+    background-color: #f5f5f5;
+    border-radius:8px;
+    height: 12px;
+    margin-right: 20px;
+    .at-progress__outer-inner-background{
+      border-radius:8px;
+    }
+    .at-progress__content{
+      font-size: 32px;
+      color: #666;
+    }
+  }
 }

src/components/AddChart.js

@@ -1,166 +0,0 @@
-import Taro, { Component } from "@tarojs/taro";
-import * as echarts from "./ec-canvas/echarts";
-function setChartData(chart, data) {
-  let option = {
-    tooltip: {
-      trigger: "axis",
-      axisPointer: {
-        type: "shadow",
-        textStyle: {
-          color: "#fff"
-        }
-      },
-    },
-    grid: {
-        "borderWidth": 0,
-        "top": 110,
-        "bottom": 95,
-        textStyle: {
-            color: "#fff"
-        }
-    },
-    dataZoom: [
-      {
-        type: 'slider',
-        start: 0,
-        show: false,
-        end: 60,
-      },
-      {
-        type: 'inside',
-        start: 0,
-        end: 60,
-        filterMode: 'filter',
-      },
-    ],
-    xAxis: [{
-        type: "category",
-        axisLine: {
-          lineStyle: {
-            color: '#90979c'
-          }
-        },
-        splitLine: {
-          show: false
-        },
-        axisTick: {
-          show: false
-        },
-        splitArea: {
-          show: false
-        },
-        axisLabel: {
-          interval: 0,
-        },
-        data: [1,2,3,4,5,6,7,8,9,10,11,12],
-    }],
-    yAxis: [{
-      type: "value",
-      splitLine: {
-        show: false
-      },
-      axisLine: {
-        lineStyle: {
-          color: '#90979c'
-        }
-      },
-      axisTick: {
-          show: false
-      },
-      axisLabel: {
-          interval: 0,
-      },
-      splitArea: {
-          show: false
-      },
-    }],
-    series: [
-      {
-        name: "女",
-        type: "bar",
-        stack: "总量",
-        barWidth: 10,
-        label: {
-          normal: {
-            show: false,
-            position: 'top',
-            color: '#000'
-          }
-        },
-        itemStyle: {
-          normal: {
-            barBorderRadius: 20,
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-              offset: 0,
-              color: '#00cefc'
-            }, {
-              offset: 1,
-              color: '#00cefc'
-            }]),
-          }
-        },
-        data: data.barData,
-      },
-      {
-        name: "男",
-        type: "line",
-        stack: "总量",
-        symbolSize: 10,
-        symbol:'circle',
-        itemStyle: {
-          normal: {
-            color: "green",
-            barBorderRadius: 0,
-            label: {
-              show: false,
-              position: "bottom",
-            }
-          }
-        },
-        data: data.lineData
-      },
-    ]
-  }
-  chart.setOption(option);
-}
-
-export default class AddChart extends Component {
-  config = {
-    usingComponents: {
-      "ec-canvas": "./ec-canvas/ec-canvas"
-    }
-  };
-
-  constructor(props) {
-    super(props);
-  }
-
-  state = {
-    ec: {
-      lazyLoad: true
-    }
-  };
-
-  refresh(data) {
-    this.Chart.init((canvas, width, height) => {
-      const chart = echarts.init(canvas, null, {
-        width: width,
-        height: height
-      });
-      setChartData(chart, data);
-      return chart;
-    });
-  }
-
-  refChart = node => (this.Chart = node);
-
-  render() {
-    return (
-      <ec-canvas
-        ref={this.refChart}
-        canvas-id="mychart-area"
-        ec={this.state.ec}
-      />
-    );
-  }
-}

src/components/BackHomeBtn/index.js

@@ -8,73 +8,14 @@ export default class Index extends Component {
   static defaultProps = {
     style: {}
   }
-  state ={
-    buttonTop: 0,
-    buttonLeft: 0,
-    windowHeight: '',
-    windowWidth: ''
-  }
-  componentDidShow(){
-    Taro.getSystemInfo({
-      success: function (res) {
-        console.log(res,"9999999999999")
-        realWindowWidth = res.windowWidth
-        realWindowHeight = res.windowHeight
-      }
-    })
-  
-  }
-
   handleClick() {
     Taro.switchTab({
       url: `/pages/project/index`
     })
   }
-  buttonStart=(e)=> {
-    console.log(e,"eeeeeeeeeeeee")
-    startPoint = e.touches[0]
-  }
-  buttonMove=(e)=> {
-    console.log(e,"888888888888888")
-    var endPoint = e.touches[e.touches.length - 1]
-    var translateX = endPoint.clientX - startPoint.clientX
-    var translateY = endPoint.clientY - startPoint.clientY
-    startPoint = endPoint
-    var buttonTop = this.state.buttonTop + translateY
-    var buttonLeft = this.state.buttonLeft + translateX
-    //判断是移动否超出屏幕
-    if (buttonLeft+50 >= this.state.windowWidth){
-      buttonLeft = this.state.windowWidth-50;
-    }
-    if (buttonLeft<=0){
-      buttonLeft=0;
-    }
-    if (buttonTop<=0){
-      buttonTop=0
-    }
-    if (buttonTop + 50 >= this.state.windowHeight){
-      buttonTop = this.state.windowHeight-50;
-    }
-    this.setState({
-      buttonTop: buttonTop,
-      buttonLeft: buttonLeft
-    })
-  }
-  buttonEnd=(e)=> {
-
-  }
-
   render() {
     return (
-      // <View className="back-home" style={this.props.style} onClick={this.handleClick}  >
-      //   <Image src={require('@assets/homeicon.png')} className='home-img'></Image>
-      //   <Text className="text">首页</Text>
-      // </View>
-      <View className="back-home"
-       style={this.props.style} 
-       style='top:{this.state.buttonTop}px;left:{this.state.buttonLeft}px'
-       onClick={this.handleClick} ontouchmove={this.buttonMove} ontouchstart={this.buttonStart} ontouchend={this.buttonEnd} >
-        {/* <Text className="iconfont icon-shouyeshouye"></Text> */}
+      <View className="back-home" style={this.props.style} onClick={this.handleClick}  >
         <Image src={require('@assets/homeicon.png')} className='home-img'></Image>
         <Text className="text">首页</Text>
       </View>

src/components/LineChart.js

@@ -1,74 +0,0 @@
-import Taro, { Component } from "@tarojs/taro";
-import * as echarts from "./ec-canvas/echarts";
-
-function setChartData(chart, data) {
-  let option = {
-    color: ['#3398DB'],
-    xAxis : [
-      {
-        type: 'category',
-        data: [],
-        axisTick: {
-          alignWithLabel: true
-        }
-      }
-    ],
-    yAxis : [
-      {
-        type : 'value'
-      }
-    ],
-    series : []
-  };
-  if (data && data.dimensions && data.measures) {
-    option.xAxis[0].data = data.dimensions.data
-    option.series = data.measures.map(item => {
-      return {
-        ...item,
-        type:'line',
-      }
-    })
-  }
-  chart.setOption(option);
-}
-
-export default class LineChart extends Component {
-  config = {
-    usingComponents: {
-      "ec-canvas": "./ec-canvas/ec-canvas"
-    }
-  };
-
-  constructor(props) {
-    super(props);
-  }
-
-  state = {
-    ec: {
-      lazyLoad: true
-    }
-  };
-
-  refresh(data) {
-    this.Chart.init((canvas, width, height) => {
-      const chart = echarts.init(canvas, null, {
-        width: width,
-        height: height
-      });
-      setChartData(chart, data);
-      return chart;
-    });
-  }
-
-  refChart = node => (this.Chart = node);
-
-  render() {
-    return (
-      <ec-canvas
-        ref={this.refChart}
-        canvas-id="mychart-area"
-        ec={this.state.ec}
-      />
-    );
-  }
-}

src/components/MoveChart.js

@@ -1,90 +0,0 @@
-import Taro, { Component } from "@tarojs/taro";
-import * as echarts from "./ec-canvas/echarts";
-
-function setChartData(chart, data) {
-  let option = {
-    tooltip: {
-    },
-    color: ['#3398DB'],
-    xAxis : [
-      {
-        type: 'category',
-        data: [],
-        axisTick: {
-          alignWithLabel: true
-        }
-      }
-    ],
-    dataZoom: [
-      {
-        type: 'slider',
-        start: 0,
-        show: false,
-        end: 50,
-      },
-      {
-        type: 'inside',
-        start: 0,
-        end: 50,
-        filterMode: 'filter',
-      },
-    ],
-    yAxis : [
-      {
-        type : 'value'
-      }
-    ],
-    series : []
-  };
-  if (data && data.dimensions && data.measures) {
-    option.xAxis[0].data = data.dimensions.data
-    option.series = data.measures.map(item => {
-      return {
-        ...item,
-        type:'bar',
-      }
-    })
-  }
-  chart.setOption(option);
-}
-
-export default class MoveChart extends Component {
-  config = {
-    usingComponents: {
-      "ec-canvas": "./ec-canvas/ec-canvas"
-    }
-  };
-
-  constructor(props) {
-    super(props);
-  }
-
-  state = {
-    ec: {
-      lazyLoad: true
-    }
-  };
-
-  refresh(data) {
-    this.Chart.init((canvas, width, height) => {
-      const chart = echarts.init(canvas, null, {
-        width: width,
-        height: height
-      });
-      setChartData(chart, data);
-      return chart;
-    });
-  }
-
-  refChart = node => (this.Chart = node);
-
-  render() {
-    return (
-      <ec-canvas
-        ref={this.refChart}
-        canvas-id="mychart-area"
-        ec={this.state.ec}
-      />
-    );
-  }
-}

src/components/charts/Line.js

@@ -0,0 +1,94 @@
+import Taro, { Component } from '@tarojs/taro'
+import echarts from '../ec-canvas/echarts'
+import './style.scss'
+
+function initChart(callback, options) {
+  return function (canvas, width, height) {
+    const chart = echarts.init(canvas, null, {
+      width: width,
+      height: height
+    });
+    canvas.setChart(chart);
+    chart.setOption(options);
+    callback && callback(chart);
+    return chart;
+  }
+}
+
+/**
+ * 传入 source 的格式为 [{ name: xxx, value: xxx }, {}]
+ */
+export default class LineChart extends Component {
+  config = {
+    usingComponents: {
+      "ec-canvas": "../ec-canvas/ec-canvas"
+    }
+  }
+
+  // this.echart
+  echart = null
+  ecComponent = null
+
+  state = {
+    ec: { lazyLoad: true },
+  }
+
+  // 禁止 props 变更时渲染
+  shouldComponentUpdate(nextProps) {
+    if (nextProps.source && nextProps.source.length) {
+      this.refreshChart(this.props.source)
+    }
+
+    return false
+  }
+
+  handleEcComponent (ref) {
+    this.ecComponent = ref
+  }
+
+  handleChart(chart) {
+    this.echart = chart
+  }
+
+  createOptions(source = []) {
+    const defaultOpt = {
+      color: ['#BB9C79', '#666666'],
+      xAxis: { type: 'category' },
+      yAxis: { type: 'value' },
+      series: [],
+    }
+
+    return {
+      ...defaultOpt,
+      dataset: { source },
+      series: [{
+        type: 'line',
+        areaStyle: {},
+        dimensions: ['name', 'value'],
+      }],
+    }
+  }
+
+  refreshChart(source) {    
+    const options = this.createOptions(source)
+
+    if (!this.echart) {
+      if (this.ecComponent) {
+        const initFunc = initChart(this.handleChart.bind(this), options)
+        this.ecComponent.init(initFunc)
+      } else {
+        console.warn('echart componet not ready')
+      }
+    } else {
+      this.echart.setOption(options)
+    }
+  }
+
+  render() {
+    return (
+      <View className="map-container">
+        <ec-canvas ref={this.handleEcComponent} ec={this.state.ec}></ec-canvas>
+      </View>
+    )
+  }
+}

src/components/charts/style.scss

@@ -0,0 +1,19 @@
+.map-container {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 1vw;
+  right: 0;
+  width:98vw;
+  height:600px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+
+  ec-canvas {
+    width: 100%;
+    height: 100%;
+  }
+}

src/components/ec-canvas/ec-canvas.js

@@ -82,41 +82,44 @@ Component({
     touchStart(e) {
       if (this.chart && e.touches.length > 0) {
         var touch = e.touches[0];
-        this.chart._zr.handler.dispatch('mousedown', {
+        var handler = this.chart.getZr().handler;
+        handler.dispatch('mousedown', {
           zrX: touch.x,
           zrY: touch.y
         });
-        this.chart._zr.handler.dispatch('mousemove', {
+        handler.dispatch('mousemove', {
           zrX: touch.x,
           zrY: touch.y
         });
-        this.chart._zr.handler.proxy.processGesture(wrapTouch(e), 'start');
+        handler.processGesture(wrapTouch(e), 'start');
       }
     },
 
     touchMove(e) {
       if (this.chart && e.touches.length > 0) {
         var touch = e.touches[0];
-        this.chart._zr.handler.dispatch('mousemove', {
+        var handler = this.chart.getZr().handler;
+        handler.dispatch('mousemove', {
           zrX: touch.x,
           zrY: touch.y
         });
-        this.chart._zr.handler.proxy.processGesture(wrapTouch(e), 'change');
+        handler.processGesture(wrapTouch(e), 'change');
       }
     },
 
     touchEnd(e) {
       if (this.chart) {
         const touch = e.changedTouches ? e.changedTouches[0] : {};
-        this.chart._zr.handler.dispatch('mouseup', {
+        var handler = this.chart.getZr().handler;
+        handler.dispatch('mouseup', {
           zrX: touch.x,
           zrY: touch.y
         });
-        this.chart._zr.handler.dispatch('click', {
+        handler.dispatch('click', {
           zrX: touch.x,
           zrY: touch.y
         });
-        this.chart._zr.handler.proxy.processGesture(wrapTouch(e), 'end');
+        handler.processGesture(wrapTouch(e), 'end');
       }
     }
   }

src/components/ec-canvas/wx-canvas.js

@@ -87,7 +87,7 @@ export default class WxCanvas {
     eventNames.forEach(name => {
       this.event[name.wxName] = e => {
         const touch = e.touches[0];
-        this.chart._zr.handler.dispatch(name.ecName, {
+        this.chart.getZr().handler.dispatch(name.ecName, {
           zrX: name.wxName === 'tap' ? touch.clientX : touch.x,
           zrY: name.wxName === 'tap' ? touch.clientY : touch.y
         });

src/components/formIdCollector/index.js

@@ -15,6 +15,10 @@ import { postFormId } from '@services/card'
  * ```
  */
 export default class Index extends Component {
+  static options = {
+    addGlobalClass: true,
+  };
+  
   static defaultProps = {
     count: 7,
     disabled: false,
@@ -26,55 +30,28 @@ export default class Index extends Component {
   }
 
   handleCollect = e => {
-    let { formIds } = this.state
-    const { onCollect, count } = this.props
-    formIds.push(e.detail.formId)
-    if (formIds.length === count) {
-      onCollect(formIds.slice())
-
-      // 发送到服务器
-      postFormId({ formids: formIds })
-      formIds = []
-    }
-    this.setState({
-      formIds
-    })
+    // 发送到服务器
+    postFormId({ formids: [e.detail.formId] })
   }
 
   render() {
-    const { count, disabled } = this.props
-    const finalCount = Math.min(count, 7)
+    const { disabled } = this.props
 
-    return (disabled || finalCount === 0) ? this.props.children : (
+    return disabled ? this.props.children : (
       <Block>
-        <Label for='button_6'>
-          <Label for='button_5'>
-            <Label for='button_4'>
-              <Label for='button_3'>
-                <Label for='button_2'>
-                  <Label for='button_1'>
-                    <Label for='button_0'>
-                      {this.props.children}
-                    </Label>
-                  </Label>
-                </Label>
-              </Label>
-            </Label>
-          </Label>
+        <Label for='button_0'>
+          {this.props.children}
         </Label>
-        {[1,2,3,4].map(i => (
-          <Form
-            key={i}
-            className='m-form-id-collector_form'
-            reportSubmit={true}
-            onSubmit={this.handleCollect}>
-            <Button
-              id={`button_${i}`}
-              formType='submit'
-            />
-          </Form>
-        ))}
+        <Form
+          className='m-form-id-collector_form'
+          reportSubmit={true}
+          onSubmit={this.handleCollect}>
+          <Button
+            id={`button_0`}
+            formType='submit'
+          />
+        </Form>
       </Block>
     )
   }
-}
+}

src/constants/api.js

@@ -174,3 +174,4 @@ 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')
+export const API_SEX_INFO = resolvePath('genderStatistic')

src/pages/Line/Line.js

@@ -1,30 +0,0 @@
-import Taro, { Component } from "@tarojs/taro";
-import { View } from "@tarojs/components";
-import LineChart from '../../components/LineChart'
-import "./index.scss";
-
-export default class Line extends Component {
-  config = {
-    navigationBarTitleText: "折线图示例"
-  };
-  componentDidMount() {
-    const chartData = {
-      dimensions: {
-        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-      },
-      measures: [{
-        data: [10, 52, 200, 334, 390, 330, 220]
-      }]
-    }
-    this.lineChart.refresh(chartData);
-  }
-  refLineChart = (node) => this.lineChart = node
-
-  render() {
-    return (
-      <View className="line-chart">
-        <LineChart ref={this.refLineChart} />
-      </View>
-    );
-  }
-}

src/pages/Line/index.scss

@@ -1,4 +0,0 @@
-.line-chart {
-  width: 100%;
-  height: 100vh;
-}

src/pages/More/More.js

@@ -1,40 +0,0 @@
-import Taro, { Component } from "@tarojs/taro";
-import { View } from "@tarojs/components";
-import MoveChart from '../../components/MoveChart'
-import LineChart from '../../components/LineChart'
-import "./index.scss";
-
-
-export default class More extends Component {
-  config = {
-    navigationBarTitleText: "可移动图表示例"
-  };
-  componentDidMount() {
-    const chartData = {
-      dimensions: {
-        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun','Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-      },
-      measures: [{
-        data: [10, 52, 200, 334, 390, 330, 220, 334, 390, 330, 220, 10, 52, 200,]
-      }]
-    }
-    this.moveChart.refresh(chartData);
-    this.lineChart.refresh(chartData);
-  }
-  refMoveChart = (node) => this.moveChart = node
-
-  refLineChart = (node) => this.lineChart = node
-
-  render() {
-    return (
-      <View className='container'>
-        <View className="move-chart">
-          <MoveChart ref={this.refMoveChart} />
-        </View>
-        <View className="move-chart">
-          <LineChart ref={this.refLineChart} />
-        </View>
-      </View>
-    );
-  }
-}

src/pages/More/index.scss

@@ -1,7 +0,0 @@
-.text {
-  text-align: center;
-}
-.move-chart {
-  width: 100%;
-  height: 50vh;
-}

src/pages/activity/activity.js

@@ -1,5 +1,6 @@
 import Taro, { Component } from '@tarojs/taro';
 import Authorize from '@components/authorize'
+import FormIdCollector from '@components/formIdCollector'
 import './index.scss'
 import { AtTabs, AtTabsPane } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
@@ -61,9 +62,9 @@ export default class active extends Component {
       <View style="height:100vh">
         <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >
-            <View >
+            <FormIdCollector>
               <Activity ></Activity >
-            </View>
+            </FormIdCollector>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={1}>
             <View >

src/pages/activity/detail/assemble.js

@@ -4,6 +4,7 @@ import Notice from '@components/Notice'
 import BackHomeBtn from '@components/BackHomeBtn'
 import AchievePhone from '@components/achievePhone'
 import Poster from '@components/Poster'
+import FormIdCollector from '@components/formIdCollector'
 import dayjs from 'dayjs'
 // import WxParse from '@components/wxParse/wxParse'
 // import getUserPhone from '@utils/getUserPhone'
@@ -617,16 +618,20 @@ export default class Detail extends Component {
                 <View className="btn-fixed">
                   {
                     actState === ActBeforeStart &&
-                    (<Button className="nostart-btn" style="margin: auto">未开始</Button>)
+                    (<View className="nostart-btn"><FormIdCollector><Button className="nostart-btn" style="margin: auto">未开始</Button></FormIdCollector></View>)
                   }
                   {
                     isStarter && actState === ActInProcess && groupState === GroupInProcess &&
-                    (<Button className="assistance-btn" style="margin: auto" onClick={this.groupBuyInvite}>邀请好友拼团</Button>)
+                    (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" style="margin: auto" onClick={this.groupBuyInvite}>邀请好友拼团</Button></FormIdCollector></View>)
                   }
                   {
                     !isStarter && actState === ActInProcess && groupState != GroupInProcess &&
 
-                    <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
+                    <View className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"}>
+                      <FormIdCollector>
+                        <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
+                      </FormIdCollector>
+                    </View>
                   }
                   {
                     !isStarter && actState === ActInProcess && groupState === GroupInProcess &&
@@ -634,9 +639,13 @@ export default class Detail extends Component {
                     <View className="btn-box" style="margin: auto; padding: 0;">
                       {
                         (groupState === GroupInProcess && !isJoin) &&
-                        (<Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button>)
+                        (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button></FormIdCollector></View>)
                       }                      
-                      <Button className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
+                      <View className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"}>
+                        <FormIdCollector>
+                          <Button className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
+                        </FormIdCollector>
+                      </View>
                     </View>
 
                   }

src/pages/activity/detail/assistance.js

@@ -4,6 +4,7 @@ import Notice from '@components/Notice'
 import BackHomeBtn from '@components/BackHomeBtn'
 import AchievePhone from '@components/achievePhone'
 import Poster from '@components/Poster'
+import FormIdCollector from '@components/formIdCollector'
 import dayjs from 'dayjs'
 // import WxParse from '@components/wxParse/wxParse'
 // import getUserPhone from '@utils/getUserPhone'
@@ -589,11 +590,11 @@ export default class Detail extends Component {
                 <View style="display:flex;justify-content: space-between;padding:0 15px">
                   {
                     actState === ActBeforeStart &&
-                    (<Button className="nostart-btn">未开始</Button>)
+                    (<View className="nostart-btn"><FormIdCollector><Button className="nostart-btn">未开始</Button></FormIdCollector></View>)
                   }
                   {
                     isStarter && actState === ActInProcess && helpState === HelpInProcess &&
-                    (<Button className="assistance-btn" onClick={this.askForHelp}>邀请好友助力</Button>)
+                    (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.askForHelp}>邀请好友助力</Button></FormIdCollector></View>)
                   }
                   {
                     !isStarter && actState === ActInProcess &&
@@ -603,9 +604,13 @@ export default class Detail extends Component {
 
                         {
                           (helpState === HelpInProcess && !isJoin) &&
-                          (<Button className="assistance-btn" onClick={this.handleHelp}>立即助力好友</Button>)
+                          (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.handleHelp}>立即助力好友</Button></FormIdCollector></View>)
                         }
-                        <Button className={(helpState === HelpInProcess && !isJoin) ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的助力</Button>
+                        <View className={(helpState === HelpInProcess && !isJoin) ? "set-btn" : "assistance-btn"}>
+                          <FormIdCollector>
+                            <Button className={(helpState === HelpInProcess && !isJoin) ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的助力</Button>
+                          </FormIdCollector>
+                        </View>
                       </View>
                     )
                   }

src/pages/person/customerAnalysis/analysis.js

@@ -1,14 +1,14 @@
 import Taro, { Component } from '@tarojs/taro';
 import Authorize from '@components/authorize'
 import { View } from "@tarojs/components";
-// 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"
 import "taro-ui/dist/style/components/progress.scss";
 import { savePoint, updatePoint } from '@services/common'
+import { querySexInfo } from '@services/person'
 import { connect } from '@tarojs/redux'
+import LineChart from "../../../components/charts/Line";
 
 
 @connect(({ user, city }) => ({ user, city }))
@@ -21,6 +21,16 @@ export default class analysis extends Taro.Component {
   state = {
     current: 0,
     recordId: undefined, // 埋点ID
+    sexInfo: [],
+    chartInfo: [
+      { name: '周一', value: '26' },
+      { name: '周二', value: '84' },
+      { name: '周三', value: '107' },
+      { name: '周四', value: '93' },
+      { name: '周五', value: '127' },
+      { name: '周六', value: '64' },
+      { name: '周日', value: '94' },
+    ]
   }
 
   componentWillUnmount() {
@@ -29,33 +39,100 @@ export default class analysis extends Taro.Component {
   }
 
   handleClick(value) {
+    if (value == '0') {
+      querySexInfo('new').then(res => {
+        this.setState({
+          sexInfo: res || []
+        })
+      })
+    } else if (value == '1') {
+      querySexInfo('follow').then(res => {
+        this.setState({
+          sexInfo: res || []
+        })
+      })
+    } else {
+      querySexInfo('visite ').then(res => {
+        this.setState({
+          sexInfo: res || []
+        })
+      })
+    }
+
     this.setState({
       current: value
-    }, )
+    })
+
   }
 
+  componentDidMount() {
+    querySexInfo('new').then(res => {
+      this.setState({
+        sexInfo: res || []
+      })
+    })
+    const chartData = [
+      { value: 335, name: '直接访问' },
+      { value: 310, name: '邮件营销' },
+      { value: 234, name: '联盟广告' },
+      { value: 135, name: '视频广告' },
+      { value: 1548, name: '搜索引擎' }
+    ];
+
+  }
 
   render() {
 
     const tabList = [{ title: '新增客户' }, { title: '跟进客户' }, { title: '到访客户' }]
+    const { sexInfo, chartInfo } = this.state
 
     return (
       <View>
         <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' />
-              </View> */}
+              <View style="width:90vw;height:600rpx">
+                <LineChart source={chartInfo} />
+              </View>
+
+              <View style="height:20rpx;background:#f5f5f5;"> </View>
+              <View style="padding: 40rpx;">
+                <View style="font-size: 36rpx;color: #666;margin-bottom:20rpx;">性别</View>
+                {
+                  sexInfo.map((item, index) => (
+                    <View key={index + 'sex3'} style="display: flex;align-items: center;"><View style="font-size: 32rpx;color: #666;min-width:80rpx">{item.genderType == 1 ? '男' : item.genderType == 2 ? '女' : '未知'}</View><AtProgress percent={(item.percentage * 100).toFixed(2)} strokeWidth={6} color={item.genderType == 1 ? '#BB9C79' : item.genderType == 2 ? '#F6B61D' : '#A2A2A2'} /></View>
+                  ))
+                }
+              </View>
             </View>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={1}>
-            <View style='padding: 100px 50px;background-color: #FAFBFC;text-align: center;'>标签页二的内容</View>
+            <View>
+              <LineChart />
+              <View style="height:20rpx;background:#f5f5f5;"> </View>
+              <View style="padding: 40rpx;">
+                <View style="font-size: 36rpx;color: #666;margin-bottom:20rpx;">性别</View>
+                {
+                  sexInfo.map((item, index) => (
+                    <View key={index + 'sex3'} style="display: flex;align-items: center;"><View style="font-size: 32rpx;color: #666;min-width:80rpx">{item.genderType == 1 ? '男' : item.genderType == 2 ? '女' : '未知'}</View><AtProgress percent={(item.percentage * 100).toFixed(2)} strokeWidth={6} color={item.genderType == 1 ? '#BB9C79' : item.genderType == 2 ? '#F6B61D' : '#A2A2A2'} /></View>
+                  ))
+                }
+              </View>
+            </View>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={2}>
-            <View style='padding: 100px 50px;background-color: #FAFBFC;text-align: center;'>标签页三的内容</View>
+            <View>
+              <LineChart />
+              <View style="height:20rpx;background:#f5f5f5;"> </View>
+              <View style="padding: 40rpx;">
+                <View style="font-size: 36rpx;color: #666;margin-bottom:20rpx;">性别</View>
+                {
+                  sexInfo.map((item, index) => (
+                    <View key={index + 'sex3'} style="display: flex;align-items: center;"><View style="font-size: 32rpx;color: #666;min-width:80rpx">{item.genderType == 1 ? '男' : item.genderType == 2 ? '女' : '未知'}</View><AtProgress percent={(item.percentage * 100).toFixed(2)} strokeWidth={6} color={item.genderType == 1 ? '#BB9C79' : item.genderType == 2 ? '#F6B61D' : '#A2A2A2'} /></View>
+                  ))
+                }
+              </View>
+            </View>
           </AtTabsPane>
         </AtTabs>
       </View>

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

@@ -1,10 +1,11 @@
 import Taro, { Component } from '@tarojs/taro';
 import Authorize from '@components/authorize'
+import ListView from '@components/ListView'
 import './index.scss'
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
 import { View, Text, Picker } from '@tarojs/components';
-import { queryCustomerList } from '@services/person'
+import { queryCustomerList, addFollowRecord } from '@services/person'
 const iconImg = require('@assets/person/icon.png')
 
 @connect(({ user, city }) => ({ user, city }))
@@ -24,8 +25,11 @@ export default class transactionCustomer extends Taro.Component {
     statusIndex: -1,
     startArrivalDate: '',
     endArrivalDate: '',
-    startReportDate : '',
+    startReportDate: '',
     endReportDate: '',
+    hasMore: true,
+    isEmpty: false,
+    pageIndex: 1
   }
 
   componentWillUnmount() {
@@ -34,47 +38,68 @@ export default class transactionCustomer extends Taro.Component {
   }
   componentDidShow() {
     Taro.showLoading()
-    this.loadList()
+    this.loadList(1)
 
   }
-  loadList() {
+
+  loadList(pageNumber) {
     const payload = {
       type: 'follow',
-      pageNumber: 0,
-      pageSize: 9999
+      pageNumber,
+      pageSize: 10
     }
     queryCustomerList(payload.type, payload).then(res => {
-
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.customerList.concat(_list)
       this.setState({
-        customerList: res.records || []
+        customerList: newList,
+        isEmpty: total == 0,
+        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
+  }
+
 
   changeInput = e => {
     this.setState({
       inputValue: e.detail.value
     })
   }
+  // 查询
   searchBtn() {
-    // const playload = {
-    //   inputValue: this.state.inputValue
-    // }
+
     this.filterCustomerList();
-   
+
   }
-  filterCustomerList(){
+  // 筛查跟进客户
+  filterCustomerList() {
 
     const payload = {
       type: 'follow',
       pageNumber: 0,
       pageSize: 9999,
-      status:this.state.statusIndex!=0?this.state.statusIndex:'',
-      startArrivalDate:this.state.startArrivalDate,
+      name: this.state.inputValue,
+      status: (this.state.statusIndex == 0 || this.state.statusIndex == -1) ? '' : this.state.statusIndex,
+      startArrivalDate: this.state.startArrivalDate,
       endArrivalDate: this.state.endArrivalDate,
-      startReportDate : this.state.startReportDate,
+      startReportDate: this.state.startReportDate,
       endReportDate: this.state.endReportDate,
     }
     queryCustomerList(payload.type, payload).then(res => {
@@ -91,55 +116,80 @@ export default class transactionCustomer extends Taro.Component {
       screenVisible: false,
     })
   }
+  // 显示筛查弹框
   screenShow() {
     this.setState({
       screenVisible: true,
     })
   }
+  // 选择状态
   chooseStatus(item, inx) {
     this.setState({
       statusIndex: inx,
     })
-    console.log(item, inx, "eeeeeeeeeeee")
   }
+  // 到访开始时间
   onVisitDateChange = e => {
     this.setState({
       startArrivalDate: e.detail.value
     })
   }
+  // 到访结束时间
   onVisitDateChange2 = e => {
     this.setState({
       endArrivalDate: e.detail.value
     })
   }
+  // 报备开始时间
   onReportDateChange = e => {
     this.setState({
-      startReportDate : e.detail.value
+      startReportDate: e.detail.value
     })
   }
+  // 报备结束时间
   onReportDateChange2 = e => {
     this.setState({
       endReportDate: e.detail.value
     })
   }
- 
+  // 取消筛查
   cancelBtn() {
     this.setState({
       screenVisible: false,
       statusIndex: -1,
       startArrivalDate: '',
       endArrivalDate: '',
-      startReportDate : '',
+      startReportDate: '',
       endReportDate: '',
     })
   }
+  // 跳转我的客户详情
   toMyCustomer(customerId) {
     Taro.navigateTo({
-      url: `/pages/person/customerAnalysis/myCustomer?customerId=`+customerId
+      url: `/pages/person/customerAnalysis/myCustomer?customerId=` + customerId
     })
   }
+  // 拨打电话
+  handleTelClick(item, e) {
+    e.stopPropagation()
+    Taro.makePhoneCall({
+      phoneNumber: item.phone
+    })
+    const params = {
+      recordType: '拨打电话',
+      customerSex: item.sex,
+      customerId: item.customerId,
+    }
+    addFollowRecord(params).then(res => {
+
+    })
+    this.setState({
+      followVisible: false,
+    })
+  }
+
   renderScreenBox() {
-    const { statusList, statusIndex, startArrivalDate, endArrivalDate, startReportDate , endReportDate } = this.state
+    const { statusList, statusIndex, startArrivalDate, endArrivalDate, startReportDate, endReportDate } = this.state
     return (
       <View className="mask">
         <View className="content">
@@ -169,8 +219,8 @@ export default class transactionCustomer extends Taro.Component {
             报备时间：
               <Picker mode='date' onChange={this.onReportDateChange}>
               <View className='picker'>
-                {startReportDate }
-                {!startReportDate  && <Text className="placeholder">起始时间</Text>}
+                {startReportDate}
+                {!startReportDate && <Text className="placeholder">起始时间</Text>}
               </View>
             </Picker>-<Picker mode='date' onChange={this.onReportDateChange2}>
               <View className='picker'>
@@ -195,7 +245,7 @@ export default class transactionCustomer extends Taro.Component {
   }
 
   render() {
-    const { customerList, screenVisible } = this.state
+    const { customerList, screenVisible, isEmpty, hasMore } = this.state
 
     return (
       <View>
@@ -208,29 +258,44 @@ export default class transactionCustomer extends Taro.Component {
           <Button className="btn" onClick={this.searchBtn} >搜索</Button>
         </View>
         <View style="padding:10px">
-          {
-            !customerList.length &&
-            <View style="margin:50px auto;text-align:center;font-size:14px;color:#888">暂无跟进客户~</View>
-          }
-          {
-            customerList.length &&
-            customerList.map((item, index) => (
-              <View class="item" key={index + 'customerList'} onClick={this.toMyCustomer.bind(this,item.customerId)}>
-                <Image src={item.picture || require('@assets/default-avatar.png')} className='img'></Image>
-                <View className="name">
-                  {item.name}
-                  {
-                    item.sex == '1' && <View style={`margin-left:10px;background-image: url(${iconImg});background-size: 100%;background-position: 0px -20px;width: 18px;height: 18px;`}></View>
-                  }
-                  {
-                    item.sex == '2' && <View style={`margin-left:10px;background-image: url(${iconImg});background-size: 100%;background-position: 0px 0px;width: 18px;height: 18px;`}></View>
-                  }
-                </View>
-                <View className="phone">{item.phone}<View style={`background-image: url(${iconImg});background-size: 100%;background-position: 0px -44px;width: 22px;height: 22px;`}></View> </View>
-                <View className="status">报备</View>
-              </View>
-            ))
-          }
+          <ListView
+            className="wrap"
+            needInit
+            isEmpty={isEmpty}
+            emptyText="暂无跟进客户~"
+            hasMore={hasMore}
+            onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
+            onScrollToLower={fn => this.onScrollToLower(fn)}
+          >
+            <View className="list">
+              {
+                !customerList.length &&
+                <View></View>
+                // <View style="margin:50px auto;text-align:center;font-size:14px;color:#888">暂无跟进客户~</View>
+              }
+              {
+                customerList.length &&
+                customerList.map((item, index) => (
+                  <View class="item" key={index + 'customerList'} onClick={this.toMyCustomer.bind(this, item.customerId)}>
+                    <Image src={item.picture || require('@assets/default-avatar.png')} className='img'></Image>
+                    <View className="name">
+                      {item.name}
+                      {
+                        item.sex == '1' && <View style={`margin-left:20rpx;background-image: url(${iconImg});background-size: 100%;background-position: 0rpx -40rpx;width: 36rpx;height: 36rpx;`}></View>
+                      }
+                      {
+                        item.sex == '2' && <View style={`margin-left:20rpx;background-image: url(${iconImg});background-size: 100%;background-position: 0rpx 0px;width: 36rpx;height: 36rpx;`}></View>
+                      }
+                    </View>
+                    <View className="phone" onClick={this.handleTelClick.bind(this, item)}>{item.phone}<View style={`background-image: url(${iconImg});background-size: 100%;background-position: 0rpx -88rpx;width: 44rpx;height: 44rpx;margin-left:10rpx`}></View> </View>
+                    <View className="status">报备</View>
+                  </View>
+                ))
+              }
+            </View>
+          </ListView>
+
+
         </View>
       </View>
     )

src/pages/person/customerAnalysis/index.scss

@@ -6,8 +6,6 @@
   height:100vh;
 }
 
-
-
 .tab-box{
   .at-tabs__header{
     width: 86%;
@@ -84,6 +82,22 @@
     }
   }
 }
+.empty{
+  width:100%;
+  height:40vh;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  &__img{
+    width:300px;
+  }
+  &__text{
+    font-size:30px;
+    color: $text-color-light;
+    margin-top: 20px;
+  }
+}
 
 
 .user_con{
@@ -127,6 +141,8 @@
     position: absolute;
     bottom:76px;
     left:320px;
+    display: flex;
+    align-items: center;
   }
   }
   .my-tab{
@@ -185,22 +201,21 @@
 
     }
     .tab-pane2{
-      padding: 0 40px;
-      .date{
-        font-size: 26px;
-        color: #999;
-        margin-top: 30px;
-      }
+      padding: 10px 0;
       .record-item{
-        font-size: 30px;
-        margin-top: 20px;
-        color: #333;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
+        padding:0 30px;
+        background:rgba(255,255,255,1);
+        box-shadow:0px 1px 0px 0px rgba(0,0,0,0.08);
+        .title{
+          font-size: 30px;
+          color: #333;
+          margin-top: 20px;
+        }
         .time{
           font-size: 26px;
           color: #999;
+          text-align: right;
+          line-height: 46px;
         }
       }
     }
@@ -240,13 +255,13 @@
     background:rgba(0,0,0,0.22);
     .base-con{
       width: 94%;
-      height:610px;
+      height:740px;
       position: absolute;
       left: 3%;
       top: 50%;
       background-color: #fff;
       padding: 40px;
-      margin-top: -305px;
+      margin-top: -370px;
       border-radius:12px;
       .con-item{
         display: flex;
@@ -275,13 +290,21 @@
         align-items: center;
         justify-content: space-between;
         width:456px;
+        height:48px ;
+        line-height: 48px;
+        padding: 0 16px;
+        background-color: #f4f4f4;
+        .picker{
+          width: 400px;
+        }
       }
       .right-icon{
-        width:20px;
-        height:20px;
+        width:18px;
+        height:18px;
         border-top: 2px solid #999;
         border-right: 2px solid #999;
         transform:rotate(45deg);
+        float: right;
       }
       .bottom-btn{
         margin: 30px auto 0 auto;
@@ -360,10 +383,6 @@
           border-radius:12px;
           border:2px solid $primary-color;
         }
-      }
-      
+      } 
     }
-  
-  
-   
   }

src/pages/person/customerAnalysis/myCustomer.js

@@ -1,13 +1,15 @@
 import Taro, { Component } from '@tarojs/taro';
 import { AtTabs, AtTabsPane } from 'taro-ui'
+import ListView from '@components/ListView'
 import "taro-ui/dist/style/components/tabs.scss"
 import { savePoint, updatePoint } from '@services/common'
-import { getCustomerDetail, getVisitRecord, getActivityList, getFollowRecord } from '@services/person'
+import { getCustomerDetail, getVisitRecord, getActivityList, getFollowRecord, addFollowRecord, commitCustomerInfo } from '@services/person'
 import { connect } from '@tarojs/redux'
 import './index.scss'
 import ActivityItem from './item'
 import dayjs from 'dayjs'
 const iconImg = require('@assets/person/icon.png')
+import emptyImg from '@assets/empty.png'
 
 @connect(({ user, city }) => ({ user, city }))
 export default class myCustomer extends Taro.Component {
@@ -22,13 +24,23 @@ export default class myCustomer extends Taro.Component {
     activityList: [],
     followVisible: false,
     baseVisible: false,
-    message: '', //跟进内容
+    followValue: '', //跟进内容
     desc: '', //客户描述
-    selectorChecked: '',
-    selector: ['美国', '中国', '巴西', '日本'],
+    selector: ['高层', '别墅', '公寓'],
+    sexSelector: ['男', '女'],
     customerDetail: {},
-    followRecord: []
-
+    followRecord: [],
+    visitRecord: [],
+    baseInfo: {}, // 完善信息弹框数据
+    hasMore: true,
+    isEmpty: false,
+    pageIndex: 1,
+    hasMore2: true,
+    isEmpty2: false,
+    pageIndex2: 1,
+    hasMore3: true,
+    isEmpty3: false,
+    pageIndex3: 1,
   }
 
   componentWillUnmount() {
@@ -38,53 +50,130 @@ export default class myCustomer extends Taro.Component {
   }
 
   handleClick(value) {
+    this.setState({
+      current: value
+    })
     if (value == 1) {
-      const { customerId } = this.$router.params
-      const payload = {
-        pageNumber: '0',
-        pageSize: '10',
-        customerId,
-      }
-      getVisitRecord(payload).then(res => {
-        // this.setState({
-        //   customerDetail: res || {}
-        // })
-      })
+      this.queryVisitRecord(1);
     } 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 || []
-        })
-      })
+      this.queryActivityList(1);
     } 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.queryFollowRecord(1);
+    }
+  }
+  // 访问记录上拉加载下拉刷新
+  onScrollToLower = async (fn) => {
+    const { pageIndex } = this.state;
+    this.queryVisitRecord(pageIndex + 1)
+    fn && fn();
+  }
+  onPullDownRefresh = (rest) => {
+    // debugger
+    if (this.refreshing) return
+    this.refreshing = true
+    this.queryVisitRecord(1)
+    rest && rest()
+    this.refreshing = false
+  }
+  // 活动信息上拉加载下拉刷新
+  onScrollToLower2 = async (fn) => {
+    const { pageIndex2 } = this.state;
+    this.queryActivityList(pageIndex2 + 1)
+    fn && fn();
+  }
+  onPullDownRefresh2 = (rest) => {
+    // debugger
+    if (this.refreshing) return
+    this.refreshing = true
+    this.queryActivityList(1)
+    rest && rest()
+    this.refreshing = false
+  }
+  // 跟进记录上拉加载下拉刷新
+  onScrollToLower3 = async (fn) => {
+    const { pageIndex3 } = this.state;
+    this.queryFollowRecord(pageIndex3 + 1)
+    fn && fn();
+  }
+  onPullDownRefresh3 = (rest) => {
+    // debugger
+    if (this.refreshing) return
+    this.refreshing = true
+    this.queryFollowRecord(1)
+    rest && rest()
+    this.refreshing = false
+  }
+  // 获取访问记录
+  queryVisitRecord(pageNumber) {
+    const { customerId } = this.$router.params
+    const payload = {
+      pageNumber,
+      pageSize: '10',
+      customerId,
+    }
+    getVisitRecord(payload).then(res => {
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.visitRecord.concat(_list)
+      this.setState({
+        visitRecord: newList,
+        isEmpty: total == 0,
+        hasMore: current < pages,
+        pageIndex: current >= pages ? pages : current
+      })
+    })
+  }
+  // 获取活动信息
+  queryActivityList(pageNumber) {
+    const { customerId } = this.$router.params
+    const payload = {
+      pageNumber,
+      pageSize: '10',
+      customerId,
+    }
+    getActivityList(payload).then(res => {
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.activityList.concat(_list)
+      this.setState({
+        activityList: newList,
+        isEmpty2: total == 0,
+        hasMore2: current < pages,
+        pageIndex2: current >= pages ? pages : current
       })
+    })
+  }
+  // 获取跟进记录
+  queryFollowRecord(pageNumber) {
+    const { customerId } = this.$router.params
+    const payload = {
+      pageNumber,
+      pageSize: '10',
+      customerId,
     }
-    this.setState({
-      current: value
-    }, )
+    getFollowRecord(payload).then(res => {
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.followRecord.concat(_list)
+      this.setState({
+        followRecord: newList,
+        isEmpty3: total == 0,
+        hasMore3: current < pages,
+        pageIndex3: current >= pages ? pages : current
+      })
+    })
   }
-
   componentDidShow() {
-
     this.loadList()
+    // Taro.getSystemInfo({
+    //   success: function (res) {
+    //     console.log(res, "9999999999999")
+    //     this.setState({
+    //       tabHeight: res.screenHeight - 380 + 'px'
+    //     })
+    //   },
+    // })
+
   }
   loadList() {
     const { customerId } = this.$router.params
@@ -125,23 +214,44 @@ export default class myCustomer extends Taro.Component {
       followVisible: true,
     })
   }
-  saveBtn() {
+  followSaveBtn() {
+    const { customerId } = this.$router.params
+    const params = {
+      recordType: '添加跟进',
+      recordContent: this.state.followValue,
+      customerSex: this.state.customerDetail.sex,
+      customerId,
+    }
+    addFollowRecord(params).then(res => {
+      this.queryFollowRecord(1)
+      Taro.showToast({
+        title: '添加跟进成功',
+        icon: 'none'
+      })
+    }).catch(err => {
+      Taro.showToast({
+        title: '添加跟进失败',
+        icon: 'none'
+      })
+    })
     this.setState({
       followVisible: false,
+      followValue: '',
     })
   }
-  cancelBtn() {
+  followCancelBtn() {
     this.setState({
       followVisible: false,
+      followValue: '',
     })
   }
   onTextareaChange(e) {
     this.setState({
-      message: e.target.value
+      followValue: e.target.value
     })
   }
   renderFollowBox() {
-    const { message } = this.state
+    const { followValue } = this.state
     return (
       <View className="mask">
         <View className="content">
@@ -151,17 +261,17 @@ export default class myCustomer extends Taro.Component {
             </View>
             <Textarea
               className="textarea"
-              value={message}
+              value={followValue}
               onInput={this.onTextareaChange}
               maxLength={150}
               placeholder='不超过150字'
             />
           </View>
           <View className="bottom-btn">
-            <View className="save" onClick={this.saveBtn}>
+            <View className="save" onClick={this.followSaveBtn}>
               保存
             </View>
-            <View className="cancel" onClick={this.cancelBtn}>
+            <View className="cancel" onClick={this.followCancelBtn}>
               取消
           </View>
           </View>
@@ -172,38 +282,127 @@ export default class myCustomer extends Taro.Component {
   perfectInformation() {
     this.setState({
       baseVisible: true,
+      baseInfo: this.state.customerDetail,
     })
   }
+  // 保存
   baseSaveBtn() {
+    const { customerId } = this.$router.params
+    const { baseInfo } = this.state
+    commitCustomerInfo(customerId, baseInfo).then(res => {
+      this.setState({
+        customerDetail: res || {}
+      })
+    })
     this.setState({
       baseVisible: false,
     })
   }
+  // 取消
   baseCancelBtn() {
     this.setState({
       baseVisible: false,
     })
   }
-  onBaseTextareaChange(e) {
+  onNameChange(e) {
+    this.setState({
+      baseInfo: {
+        ...this.state.baseInfo,
+        name: e.target.value
+      }
+    })
+  }
+  onSexChange = e => {
+
+    let sex = e.detail.value == '0' ? '1' : e.detail.value == '1' ? '2' : ''
+    this.setState({
+      baseInfo: {
+        ...this.state.baseInfo,
+        sex,
+      }
+    })
+  }
+  onManageTypeChange(e) {
+    this.setState({
+      baseInfo: {
+        ...this.state.baseInfo,
+        realtyManageType: e.target.value
+      }
+    })
+  }
+  onPriceRangeChange(e) {
     this.setState({
-      desc: e.target.value
+      baseInfo: {
+        ...this.state.baseInfo,
+        priceRange: e.target.value
+      }
     })
   }
   onChange = e => {
     this.setState({
-      selectorChecked: this.state.selector[e.detail.value]
+      baseInfo: {
+        ...this.state.baseInfo,
+        demandType: this.state.selector[e.detail.value]
+      }
+    })
+  }
+  onBaseTextareaChange(e) {
+    this.setState({
+      baseInfo: {
+        ...this.state.baseInfo,
+        describe: e.target.value
+      }
+    })
+  }
+  // 拨打电话
+  handleTelClick(customer, e) {
+    e.stopPropagation()
+    Taro.makePhoneCall({
+      phoneNumber: customer.phone
+    })
+    const params = {
+      recordType: '拨打电话',
+      customerSex: customer.sex,
+      customerId: customer.customerId,
+    }
+    addFollowRecord(params).then(res => {
+      this.queryFollowRecord(1)
+    })
+    this.setState({
+      followVisible: false,
     })
   }
   renderBaseBox() {
-    const { desc, selector, selectorChecked } = this.state
+    const { baseInfo, desc, selector, sexSelector } = this.state
     return (
       <View className="mask">
         <View className="base-con">
+          <View className="con-item">
+            <View style="font-size:14px;color:#666">
+              姓名：
+            </View>
+            <Input className="input" value={baseInfo.name} onInput={this.onNameChange} placeholder='' />
+          </View>
+          <View className="con-item">
+            <View style="font-size:14px;color:#666">
+              性别：
+            </View>
+            <View className="con-picker" >
+              <View>
+                <Picker mode='selector' range={sexSelector} onChange={this.onSexChange}>
+                  <View className='picker'>
+                    {baseInfo.sex == '1' ? '男' : baseInfo.sex == '2' ? '女' : '　'}
+                  </View>
+                </Picker>
+              </View>
+              <View className="right-icon"></View>
+            </View>
+          </View>
           <View className="con-item">
             <View style="font-size:14px;color:#666">
               物业类型：
             </View>
-            <Input className="input" value={desc} onInput={this.onBaseTextareaChange} placeholder='' />
+            <Input className="input" value={baseInfo.realtyManageType} onInput={this.onManageTypeChange} placeholder='' />
           </View>
           <View className="con-item">
             <View style="font-size:14px;color:#666">
@@ -213,7 +412,7 @@ export default class myCustomer extends Taro.Component {
               <View>
                 <Picker mode='selector' range={selector} onChange={this.onChange}>
                   <View className='picker'>
-                    当前选择：{selectorChecked}
+                    {baseInfo.demandType || '　'}
                   </View>
                 </Picker>
               </View>
@@ -224,7 +423,7 @@ export default class myCustomer extends Taro.Component {
             <View style="font-size:14px;color:#666">
               价格区间：
             </View>
-            <Input className="input" value={desc} onInput={this.onBaseTextareaChange} placeholder='' />
+            <Input className="input" value={baseInfo.priceRange} onInput={this.onPriceRangeChange} placeholder='' />
           </View>
           <View style="display:flex;justify-content: space-between;">
             <View style="font-size:14px;color:#666">
@@ -232,10 +431,10 @@ export default class myCustomer extends Taro.Component {
             </View>
             <Textarea
               className="textarea"
-              value={desc}
+              value={baseInfo.describe}
               onInput={this.onBaseTextareaChange}
               maxLength={150}
-              placeholder='不超过150字'
+              placeholder=''
             />
           </View>
           <View className="bottom-btn">
@@ -255,7 +454,7 @@ export default class myCustomer extends Taro.Component {
   render() {
 
     const tabList = [{ title: '基本信息' }, { title: '访问记录' }, { title: '活动信息' }, { title: '跟进记录' }]
-    const { customerDetail, activityList, followRecord, followVisible, baseVisible } = this.state
+    const { customerDetail, visitRecord, activityList, followRecord, followVisible, baseVisible, isEmpty, hasMore, isEmpty2, hasMore2, isEmpty3, hasMore3 } = this.state
     return (
       <View>
         {followVisible && this.renderFollowBox()}
@@ -272,9 +471,9 @@ export default class myCustomer extends Taro.Component {
               customerDetail.sex == '2' && <View style={`margin-left:10px;background-image: url(${iconImg});background-size: 100%;background-position: 0px 0px;width: 18px;height: 18px;`}></View>
             }
           </View>
-          <View className='user__left__phone'>{customerDetail.phone}</View>
+          <View onClick={this.handleTelClick.bind(this, customerDetail)} className='user__left__phone'>{customerDetail.phone}<View style={`background-image: url(${iconImg});background-size: 100%;background-position: 0rpx -88rpx;width: 44rpx;height: 44rpx;margin-left:10rpx`}></View></View>
         </View>
-        <AtTabs className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
+        <AtTabs height="calc(100vh - 400rpx)" 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>
@@ -288,41 +487,104 @@ export default class myCustomer extends Taro.Component {
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={1}>
             <View className="tab-pane2 pane">
-              <View className="date">2019年11月11日</View>
-              <View className="record-item"><View >查看项目详情：银城悦见山</View><View className="time">12:30:00</View> </View>
-              <View className="record-item"><View >查看项目详情：银城悦见山</View><View className="time">12:30:00</View> </View>
-              <View className="record-item"><View >查看项目详情：银城悦见山</View><View className="time">12:30:00</View> </View>
-              <View className="date">2019年11月11日</View>
-              <View className="record-item"><View >查看项目详情：银城悦见山</View><View className="time">12:30:00</View> </View>
-              <View className="record-item"><View >查看项目详情：银城悦见山</View><View className="time">12:30:00</View> </View>
-              <View className="record-item"><View >查看项目详情：银城悦见山</View><View className="time">12:30:00</View> </View>
+              <ListView
+                className="wrap"
+                style="height:calc(100vh - 400rpx)"
+                needInit
+                isEmpty={isEmpty}
+                emptyText="暂无访问记录~"
+                hasMore={hasMore}
+                onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
+                onScrollToLower={fn => this.onScrollToLower(fn)}
+              >
+                <View className="list">
+                  {visitRecord.length && visitRecord.map((item, index) => (
+                    <View className="record-item" key={index + 'follow'}>
+                      <View className="title" >{item.activity}</View>
+                      <View className="time">{dayjs(item.visitTime).format('YYYY年MM月DD日 HH:mm:ss') || '　'}</View>
+                    </View>
+                  ))
+                  }
+                  {!visitRecord.length &&
+                    <View className="empty">
+                      {/* <Image className="empty__img" mode="widthFix" src={emptyImg}></Image>
+                  <View className="empty__text">暂无访问记录~</View> */}
+                    </View>
+                  }
+                </View>
+              </ListView>
             </View>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={2}>
             <View className="tab-pane3 pane">
-              {activityList.length > 0 &&
-                activityList.map(item => (
-                  <ActivityItem
-                    data={item}
-                    key={item.id}
-                    onClick={this.handleItemClick}>
-                  </ActivityItem>
-                ))
-              }
+              <ListView
+                className="wrap"
+                style="height:calc(100vh - 400rpx)"
+                needInit
+                isEmpty={isEmpty2}
+                emptyText="暂无活动信息~"
+                hasMore={hasMore2}
+                onPullDownRefresh={fn => this.onPullDownRefresh2(fn)}
+                onScrollToLower={fn => this.onScrollToLower2(fn)}
+              >
+                <View className="list">
+                  {!activityList.length &&
+                    <View className="empty">
+                      {/* <Image className="empty__img" mode="widthFix" src={emptyImg}></Image>
+                  <View className="empty__text">暂无活动信息~</View> */}
+                    </View>
+                  }
+                  {activityList.length &&
+                    activityList.map(item => (
+                      <ActivityItem
+                        data={item}
+                        key={item.id + 'activity'}
+                        onClick={this.handleItemClick}>
+                      </ActivityItem>
+                    ))
+                  }
+                </View>
+              </ListView>
             </View>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={3}>
-            <View style="padding:10px 20px 120px 20px">
-              {/* {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>
+            <View style="padding:10px 20px 20px 20px">
+              <ListView
+                className="wrap"
+                needInit
+                style="height:calc(100vh - 600rpx)"
+                isEmpty={isEmpty3}
+                emptyText="暂无跟进记录~"
+                hasMore={hasMore3}
+                onPullDownRefresh={fn => this.onPullDownRefresh3(fn)}
+                onScrollToLower={fn => this.onScrollToLower3(fn)} >
+                <View className="list">
+                  {followRecord.length && followRecord.map(item => (
+                    <View key={item.followUpRecordId + 'follow'}>
+                      <View style=" display:flex;justify-content: space-between;align-items: center;color: #333;font-size: 16px; margin-bottom:20rpx;">
+                        <View style=" display: flex;align-items: center;"><View style="width:8px;height:8px;margin-right:20rpx;display:inline-block;background:rgba(246,182,29,1);border-radius: 50%;"></View>{item.recordType}</View>
+                        <View classNam="time" style=" font-size: 26rpx;color: #999;">{dayjs(item.createDate).format('YYYY年MM月DD日 HH:mm:ss') || '　'}</View>
+                      </View>
+                      {
+                        item.recordContent &&
+                        <View style="font-size:28rpx;color:#666;padding-left:32rpx;margin-bottom:20rpx;">
+                          {item.recordContent}
+                        </View>
+                      }
 
+                    </View>
+                  ))
+                  }
+                  {!followRecord.length &&
+                    <View className="empty">
+                      {/* <Image className="empty__img" mode="widthFix" src={emptyImg}></Image>
+                  <View className="empty__text">暂无跟进记录~</View> */}
+                    </View>
+                  }
+                </View>
+              </ListView>
+              <View className="btn" style="margin:40rpx auto;" onClick={this.addFollow}>添加跟进</View>
+            </View>
           </AtTabsPane>
         </AtTabs>
       </View>

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

@@ -1,5 +1,6 @@
 import Taro, { Component } from '@tarojs/taro';
 import Authorize from '@components/authorize'
+import ListView from '@components/ListView'
 import './index.scss'
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
@@ -17,6 +18,9 @@ export default class transactionCustomer extends Taro.Component {
   state = {
     recordId: undefined, // 埋点ID
     customerList: [],
+    hasMore: true,
+    isEmpty: false,
+    pageIndex: 1
   }
 
   componentWillUnmount() {
@@ -25,51 +29,84 @@ export default class transactionCustomer extends Taro.Component {
   }
   componentDidShow() {
     Taro.showLoading()
-    this.loadList()
+    this.loadList(1)
 
   }
-  loadList() {
+  loadList(pageNumber) {
     const payload = {
       type: 'clinch',
-      pageNumber: 0,
+      pageNumber,
       pageSize: 9999
     }
     queryCustomerList(payload.type, payload).then(res => {
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.customerList.concat(_list)
       this.setState({
-        customerList: res.records || []
+        customerList: newList,
+        isEmpty: total == 0,
+        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
+  }
 
   render() {
-    const { customerList } = this.state
+    const { customerList, isEmpty, hasMore } = this.state
 
     return (
       <View style="padding:10px">
-        {
-          !customerList.length &&
-          <View style="margin:50px auto;text-align:center;font-size:14px;color:#888">暂无跟进客户~</View>
-        }
-        {
-          customerList.length &&
-          customerList.map(item => (
-            <View class="item">
-              <Image src={item.picture || require('@assets/default-avatar.png')} className='img'></Image>
-              <View className="name">
-                {item.name}
-                {
-                  item.sex == '1' && <View style={`margin-left:10px;background-image: url(${iconImg});background-size: 100%;background-position: 0px -20px;width: 18px;height: 18px;`}></View>
-                }
-                {
-                  item.sex == '2' && <View style={`margin-left:10px;background-image: url(${iconImg});background-size: 100%;background-position: 0px 0px;width: 18px;height: 18px;`}></View>
-                }
-              </View>
-              <View className="phone">{item.phone} </View>
-              <View style={`background-image: url(${iconImg});background-size: 100%;background-position: 0px -44px;width: 22px;height: 22px;`}></View>
-            </View>
-          ))
-        }
+        <ListView
+          className="wrap"
+          needInit
+          isEmpty={isEmpty}
+          emptyText="暂无成交客户~"
+          hasMore={hasMore}
+          onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
+          onScrollToLower={fn => this.onScrollToLower(fn)}
+        >
+          <View className="list">
+            {
+              !customerList.length &&
+              <View></View>
+              // <View style="margin:50px auto;text-align:center;font-size:14px;color:#888">暂无成交客户~</View>
+            }
+            {
+              customerList.length &&
+              customerList.map((item, index) => (
+                <View class="item" key={index + 'transaction'}>
+                  <Image src={item.picture || require('@assets/default-avatar.png')} className='img'></Image>
+                  <View className="name">
+                    {item.name}
+                    {
+                      item.sex == '1' && <View style={`margin-left:10px;background-image: url(${iconImg});background-size: 100%;background-position: 0px -20px;width: 18px;height: 18px;`}></View>
+                    }
+                    {
+                      item.sex == '2' && <View style={`margin-left:10px;background-image: url(${iconImg});background-size: 100%;background-position: 0px 0px;width: 18px;height: 18px;`}></View>
+                    }
+                  </View>
+                  <View className="phone">{item.phone} </View>
+                  <View style={`background-image: url(${iconImg});background-size: 100%;background-position: 0px -44px;width: 22px;height: 22px;`}></View>
+                </View>
+              ))
+            }
+          </View>
+        </ListView>
+
 
       </View>
     )

src/pages/project/detail/index.js

@@ -58,7 +58,7 @@ export default class Index extends Component {
     videoPlayShow: 'flex',
   }
 
-  componentWillMount () {
+  componentWillMount() {
     // const { id = '78c3dd489791dc1d29472fa344b08c45' } = this.$router.params
 
     ready.queue(() => {
@@ -92,12 +92,12 @@ export default class Index extends Component {
     })
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
 
-  loadHelpGroupList () {
+  loadHelpGroupList() {
     const { buildingId } = this.state
 
     queryHelpGroup({ buildingId: buildingId }).then(res => {
@@ -119,7 +119,7 @@ export default class Index extends Component {
     )
   }
 
-  loadDetail () {
+  loadDetail() {
     const { buildingId } = this.state
     const { dispatchProjectDetail } = this.props
     this.setState({
@@ -147,7 +147,7 @@ export default class Index extends Component {
     })
   }
 
-  loadActivityData () {
+  loadActivityData() {
     const { buildingId } = this.state
     const payload = { pageSize: 999, pageNumber: 1, buildingId }
     queryActivityList(payload).then(res => {
@@ -157,7 +157,7 @@ export default class Index extends Component {
     })
   }
 
-  loadNewsData () {
+  loadNewsData() {
     const { buildingId } = this.state
     const payload = { pageSize: 2, pageNumber: 1, buildingId }
     queryNewsList(payload).then(res => {
@@ -167,11 +167,11 @@ export default class Index extends Component {
     })
   }
 
-  navigateTo (url) {
+  navigateTo(url) {
     Taro.navigateTo({ url: url })
   }
   // 海报预览图
-  previewImage (arr) {
+  previewImage(arr) {
     // console.log('arr:' + arr)
     if (arr[0].length > 1) {
       Taro.previewImage({
@@ -198,7 +198,7 @@ export default class Index extends Component {
     })
   }
 
-  openMap () {
+  openMap() {
     const {
       buildingName,
       address,
@@ -225,12 +225,12 @@ export default class Index extends Component {
     })
   }
 
-  toViewAlbum () {
+  toViewAlbum() {
     const { buildingId } = this.state
     this.navigateTo(`/pages/project/album/index?id=${buildingId}`)
   }
 
-  onViewFans () {
+  onViewFans() {
     const { buildingId } = this.state
     this.navigateTo('/pages/card/fans/index?type=item&id=' + buildingId)
   }
@@ -259,7 +259,7 @@ export default class Index extends Component {
     }
   }
 
-  getPhoneNumber (e, item) {
+  getPhoneNumber(e, item) {
     getUserPhone(e, (phoneNumber) => {
       const { userInfo: { person: { personId, nickname, name } } } = this.props
       Taro.navigateTo({
@@ -268,7 +268,7 @@ export default class Index extends Component {
     })
   }
 
-  getPosterData () {
+  getPosterData() {
     return new Promise(resolve => {
       const { posterData } = this.state
       if (posterData.qrcode) {
@@ -339,14 +339,14 @@ export default class Index extends Component {
     })
   }
 
-  handleTelClick (item, e) {
+  handleTelClick(item, e) {
     e.stopPropagation()
     Taro.makePhoneCall({
       phoneNumber: item.phone
     })
   }
 
-  handleChatClick (item, e) {
+  handleChatClick(item, e) {
     e.stopPropagation()
     const { userInfo: { person: { personId, nickname, name } } } = this.props
     Taro.navigateTo({
@@ -354,24 +354,24 @@ export default class Index extends Component {
     })
   }
 
-  handleConsuItemClick (item) {
+  handleConsuItemClick(item) {
     Taro.navigateTo({
       url: `/pages/card/index?id=${item.id}`
     })
   }
 
-  handleMoreClick () {
+  handleMoreClick() {
     // App.zhuge.track('查看置业顾问列表')
     Taro.navigateTo({
       url: `/pages/card/list/index?buildingId=${this.state.buildingId}`
     })
   }
 
-  handleStopPropagation (e) {
+  handleStopPropagation(e) {
     e.stopPropagation()
   }
 
-  toRecomonedPage () {
+  toRecomonedPage() {
     const {
       userInfo: { person: { personType } }
     } = this.props
@@ -387,50 +387,50 @@ export default class Index extends Component {
     }
   }
 
-  toHome () {
+  toHome() {
     Taro.switchTab({
       url: `/pages/project/index`
     })
   }
 
-  HandleCircumTabClick (id) {
+  HandleCircumTabClick(id) {
     this.setState({
       curTab: id
     })
   }
 
-  handleNewsMoreClick () {
+  handleNewsMoreClick() {
     Taro.navigateTo({
       url: `/pages/news/index?buildingId=` + this.state.buildingId
     })
   }
 
-  handNewsItemClick (id) {
+  handNewsItemClick(id) {
     Taro.navigateTo({
       url: '/pages/news/detail/index?id=' + id
     })
   }
 
-  handleActivityMoreClick () {
+  handleActivityMoreClick() {
     Taro.navigateTo({
       url: `/pages/activity/index?buildingId=` + this.state.buildingId
     })
   }
 
-  handActivityItemClick (id) {
+  handActivityItemClick(id) {
     Taro.navigateTo({
       url: '/pages/activity/detail/index?id=' + id
     })
   }
 
-  handlePreviewHxImage (current, urls) {
+  handlePreviewHxImage(current, urls) {
     Taro.previewImage({
       current,
       urls
     })
   }
 
-  handleFavor () {
+  handleFavor() {
     const { buildingId, isSaved } = this.state
     if (isSaved) {
       cancelFavorProject(buildingId).then(res => {
@@ -460,18 +460,18 @@ export default class Index extends Component {
       console.log('活动项目收藏')
     })
   }
-  handleToolsClick () {
+  handleToolsClick() {
     Taro.navigateTo({
       url: `/pages/toolKit/index`
     })
   }
-  moreFloor () {
+  moreFloor() {
     Taro.navigateTo({
       url: `/pages/project/floor/index`
     })
   }
 
-  renderBottomMenu () {
+  renderBottomMenu() {
     const { userInfo: { person: { personType } } } = this.props
     const { posterShow } = this.state
     return (
@@ -506,14 +506,14 @@ export default class Index extends Component {
     )
   }
 
-  previewHouseImage (current, urls) {
+  previewHouseImage(current, urls) {
     Taro.previewImage({
       current,
       urls
     })
   }
 
-  renderBuildingProjectTypeList () {
+  renderBuildingProjectTypeList() {
     const { statusOpts } = this.state
     const { projectDetail: { buildingProjectType = [], status, marketStatus } } = this.props
     return (
@@ -538,7 +538,7 @@ export default class Index extends Component {
                         {/* <Icon className="iconfont icon-jinrongxianxingge-" onClick={this.handleToolsClick}></Icon> */}
                         <View className='row' style="margin-top:0">
                           <Text className='row-label'>项目类型：</Text>
-                          <Text className='row-txt black'>{item.buildingTypeName}</Text>
+                          <Text className='row-txt black'>{item.buildingTypeName || '　'}</Text>
                         </View>
                         <View className='row'>
                           <Text className='row-label'>项目参考价格：</Text>
@@ -548,10 +548,15 @@ export default class Index extends Component {
                         </View>
                         <View className='row'>
                           <Text className='row-label'>产权：</Text>
-                          <Text className='row-txt'>{item.rightsYear}年</Text>
+                          {item.rightsYear ?
+                            <Text className='row-txt'>{item.rightsYear}年</Text>
+                            :
+                            <Text className='row-txt'>暂无</Text>
+                          }
+
                           <View className='row-right'>
                             <Text className='row-label'>装修：</Text>
-                            <Text className='row-txt'>{item.decoration}</Text>
+                            <Text className='row-txt'>{item.decoration || '暂无'}</Text>
                           </View>
                         </View>
                       </View>
@@ -567,7 +572,7 @@ export default class Index extends Component {
   }
 
 
-  renderPhotoAlbum () {
+  renderPhotoAlbum() {
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'photo')
     const imgList = list.reduce((prev, cur) => {
@@ -617,7 +622,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  rendercircum () {
+  rendercircum() {
     const building = {
       ...this.props.projectDetail
     }
@@ -634,7 +639,7 @@ export default class Index extends Component {
     )
   }
 
-  renderConsuler () {
+  renderConsuler() {
     const { userInfo: { person: { phone } } } = this.props
     const { projectDetail: { consultants = [] } } = this.props
     return (
@@ -688,7 +693,7 @@ export default class Index extends Component {
     )
   }
 
-  renderStatement () {
+  renderStatement() {
     return (
       <View className='statement'>
         免责条款：以上价格仅供参考，具体一房一价的信息以售楼处展示为准。本网显示房屋位置、交通、医疗、教育、商业等配套信息，来源于第三方网络数据，不作为要约，仅供参考，双方具体权利义务应以法律规定及买卖合同约定为准。<br></br>本平台对项目周边文化教育的介绍旨在提供相关信息，并不意味着信息发布方对就学安排作出承诺。相关教育资源就学信息存在调整的可能，应以政府教育主管部门及办学颁布的政策规定为准。
@@ -697,7 +702,7 @@ export default class Index extends Component {
   }
 
 
-  renderHelp () {
+  renderHelp() {
     const { helpList } = this.state
     return (
       <Block>
@@ -718,17 +723,17 @@ export default class Index extends Component {
     )
   }
 
-  handleHelpClick (item) {
+  handleHelpClick(item) {
     Taro.navigateTo({
       url: '/pages/activity/detail/assistance?id=' + item.activityId
     })
   }
-  handleGroupClick (item) {
+  handleGroupClick(item) {
     Taro.navigateTo({
       url: '/pages/activity/detail/assemble?id=' + item.activityId
     })
   }
-  renderGroup () {
+  renderGroup() {
     const { groupList } = this.state
     return (
       <Block>
@@ -751,7 +756,7 @@ export default class Index extends Component {
     )
   }
 
-  renderHouseTypeList () {
+  renderHouseTypeList() {
     const { statusOpts } = this.state
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'apart')
@@ -868,7 +873,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  renderNews () {
+  renderNews() {
     const { newsList } = this.state
     return (
       <Block>
@@ -977,7 +982,7 @@ export default class Index extends Component {
     )
   }
 
-  changeCurrent (current) {
+  changeCurrent(current) {
     this.setState({
       current: current + 1
     })
@@ -985,7 +990,7 @@ export default class Index extends Component {
 
 
 
-  render () {
+  render() {
     const { posterStatus, posterData, loaded, btnstate } = this.state
     const { projectDetail } = this.props
     const { uvList = {} } = projectDetail
@@ -1057,7 +1062,7 @@ export default class Index extends Component {
                       <View className='row project__addr'>
                         <Text className="label">楼盘地址：</Text>
                         <View className='address'>
-                          <Text className="address__text">{projectDetail.address}</Text>
+                          <Text className="address__text">{projectDetail.address || '暂无'}</Text>
                           {/* <Text className='iconfont icon-jingzhundaohang-copy' onClick={this.openMap.bind(this)}></Text> */}
                         </View>
                       </View>

src/pages/project/index.js

@@ -1,4 +1,5 @@
 import Taro, { Component } from '@tarojs/taro';
+import FormIdCollector from '@components/formIdCollector'
 import './index.scss'
 import ProjectItem from './item'
 import Banner from './banner'
@@ -465,11 +466,12 @@ export default class Index extends Component {
               </View>
               <View className="section-content">
                 {records.map(item => (
-                  <ProjectItem
-                    key={item.buildingId}
-                    onClick={this.onViewDetail.bind(this, item)}
-                    data={item}
-                  />
+                  <FormIdCollector key={item.buildingId}>
+                    <ProjectItem
+                      onClick={this.onViewDetail.bind(this, item)}
+                      data={item}
+                    />
+                  </FormIdCollector>
                 ))}
               </View>
             </View >

src/services/person.js

@@ -5,10 +5,17 @@ import {
   API_CUSTOMER_DETAIL,
   API_VISIT_RECORD,
   API_ACTIVITY_LIST_CUSTOMER,
-  API_FOLLOW_LIST
+  API_FOLLOW_LIST,
+  API_SEX_INFO,
 } from '@constants/api'
 
 
+/**
+ * 获取客户分析性别数据
+ * @param {*} type
+ */
+export const querySexInfo = (type, payload) => fetch({ url: `${API_SEX_INFO}/${type}`, payload })
+
 /**
  * 获取我的客户数据
  * @param {*} payload
@@ -19,27 +26,37 @@ export const queryMyCustomer = payload => fetch({ url: API_MY_CUSTOMER, payload
  * 获取客户列表
  * @param {*} type  
  */
-export const  queryCustomerList = (type, payload) => fetch({ url: `${API_CUSTOMER_LIST}/${type}`, payload })
+export const queryCustomerList = (type, payload) => fetch({ url: `${API_CUSTOMER_LIST}/${type}`, payload })
 /**
- * 获取客户列表
+ * 获取客户详情
+ * @param {*} customerId  
+ */
+export const getCustomerDetail = (customerId, payload) => fetch({ url: `${API_CUSTOMER_DETAIL}/${customerId}`, payload })
+/**
+ * 完善客户信息
  * @param {*} customerId  
  */
-export const  getCustomerDetail = (customerId, payload) => fetch({ url: `${API_CUSTOMER_DETAIL}/${customerId}`, payload })
+export const commitCustomerInfo = (customerId, payload) => fetch({ url: `${API_CUSTOMER_DETAIL}/${customerId}`, payload, method: 'PUT' })
 /**
  * 获取访问记录
  * @param {*} payload  
  */
-export const  getVisitRecord = ( payload) => fetch({ url: API_VISIT_RECORD, payload })
+export const getVisitRecord = (payload) => fetch({ url: API_VISIT_RECORD, payload })
 /**
  * 获取活动信息
  * @param {*} payload  
  */
-export const  getActivityList = ( payload) => fetch({ url: API_ACTIVITY_LIST_CUSTOMER, payload })
+export const getActivityList = (payload) => fetch({ url: API_ACTIVITY_LIST_CUSTOMER, payload })
 /**
  * 获取跟进记录
  * @param {*} payload  
  */
-export const  getFollowRecord = ( payload) => fetch({ url: API_FOLLOW_LIST, 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' })