Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

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

@@ -0,0 +1,135 @@
+import WxCanvas from './wx-canvas';
+import * as echarts from './echarts';
+
+let ctx;
+
+Component({
+  properties: {
+    canvasId: {
+      type: String,
+      value: 'ec-canvas'
+    },
+
+    ec: {
+      type: Object
+    }
+  },
+
+  data: {
+
+  },
+
+  ready: function () {
+    if (!this.data.ec) {
+      console.warn('组件需绑定 ec 变量，例：<ec-canvas id="mychart-dom-bar" '
+        + 'canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas>');
+      return;
+    }
+
+    if (!this.data.ec.lazyLoad) {
+      this.init();
+    }
+  },
+
+  methods: {
+    init: function (callback) {
+      const version = wx.version.version.split('.').map(n => parseInt(n, 10));
+      const isValid = version[0] > 1 || (version[0] === 1 && version[1] > 9)
+        || (version[0] === 1 && version[1] === 9 && version[2] >= 91);
+      if (!isValid) {
+        console.error('微信基础库版本过低，需大于等于 1.9.91。'
+          + '参见：https://github.com/ecomfe/echarts-for-weixin'
+          + '#%E5%BE%AE%E4%BF%A1%E7%89%88%E6%9C%AC%E8%A6%81%E6%B1%82');
+        return;
+      }
+
+      ctx = wx.createCanvasContext(this.data.canvasId, this);
+
+      const canvas = new WxCanvas(ctx, this.data.canvasId);
+
+      echarts.setCanvasCreator(() => {
+        return canvas;
+      });
+
+      var query = wx.createSelectorQuery().in(this);
+      query.select('.ec-canvas').boundingClientRect(res => {
+        if (typeof callback === 'function') {
+          this.chart = callback(canvas, res.width, res.height);
+        }
+        else if (this.data.ec && typeof this.data.ec.onInit === 'function') {
+          this.chart = this.data.ec.onInit(canvas, res.width, res.height);
+        }
+        else {
+          this.triggerEvent('init', {
+            canvas: canvas,
+            width: res.width,
+            height: res.height
+          });
+        }
+      }).exec();
+    },
+
+    canvasToTempFilePath(opt) {
+      if (!opt.canvasId) {
+        opt.canvasId = this.data.canvasId;
+      }
+
+      ctx.draw(true, () => {
+        wx.canvasToTempFilePath(opt, this);
+      });
+    },
+
+    touchStart(e) {
+      if (this.chart && e.touches.length > 0) {
+        var touch = e.touches[0];
+        var handler = this.chart.getZr().handler;
+        handler.dispatch('mousedown', {
+          zrX: touch.x,
+          zrY: touch.y
+        });
+        handler.dispatch('mousemove', {
+          zrX: touch.x,
+          zrY: touch.y
+        });
+        handler.processGesture(wrapTouch(e), 'start');
+      }
+    },
+
+    touchMove(e) {
+      if (this.chart && e.touches.length > 0) {
+        var touch = e.touches[0];
+        var handler = this.chart.getZr().handler;
+        handler.dispatch('mousemove', {
+          zrX: touch.x,
+          zrY: touch.y
+        });
+        handler.processGesture(wrapTouch(e), 'change');
+      }
+    },
+
+    touchEnd(e) {
+      if (this.chart) {
+        const touch = e.changedTouches ? e.changedTouches[0] : {};
+        var handler = this.chart.getZr().handler;
+        handler.dispatch('mouseup', {
+          zrX: touch.x,
+          zrY: touch.y
+        });
+        handler.dispatch('click', {
+          zrX: touch.x,
+          zrY: touch.y
+        });
+        handler.processGesture(wrapTouch(e), 'end');
+      }
+    }
+  }
+});
+
+function wrapTouch(event) {
+  for (let i = 0; i < event.touches.length; ++i) {
+    const touch = event.touches[i];
+    touch.offsetX = touch.x;
+    touch.offsetY = touch.y;
+  }
+  return event;
+}

src/components/ec-canvas/ec-canvas.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

src/components/ec-canvas/ec-canvas.wxml

@@ -0,0 +1,4 @@
+<canvas class="ec-canvas" canvas-id="{{ canvasId }}"
+bindinit="init"
+bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}">
+</canvas>

src/components/ec-canvas/ec-canvas.wxss

@@ -0,0 +1,4 @@
+.ec-canvas {
+  width: 100%;
+  height: 100%;
+}

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

@@ -0,0 +1,97 @@
+export default class WxCanvas {
+  constructor(ctx, canvasId) {
+    this.ctx = ctx;
+    this.canvasId = canvasId;
+    this.chart = null;
+
+    // this._initCanvas(zrender, ctx);
+    this._initStyle(ctx);
+    this._initEvent();
+  }
+
+  getContext(contextType) {
+    if (contextType === '2d') {
+      return this.ctx;
+    }
+  }
+
+  // canvasToTempFilePath(opt) {
+  //   if (!opt.canvasId) {
+  //     opt.canvasId = this.canvasId;
+  //   }
+
+  //   return wx.canvasToTempFilePath(opt, this);
+  // }
+
+  setChart(chart) {
+    this.chart = chart;
+  }
+
+  attachEvent () {
+    // noop
+  }
+
+  detachEvent() {
+    // noop
+  }
+
+  _initCanvas(zrender, ctx) {
+    zrender.util.getContext = function () {
+      return ctx;
+    };
+
+    zrender.util.$override('measureText', function (text, font) {
+      ctx.font = font || '12px sans-serif';
+      return ctx.measureText(text);
+    });
+  }
+
+  _initStyle(ctx) {
+    var styles = ['fillStyle', 'strokeStyle', 'globalAlpha', 
+      'textAlign', 'textBaseAlign', 'shadow', 'lineWidth',
+      'lineCap', 'lineJoin', 'lineDash', 'miterLimit', 'fontSize'];
+
+    styles.forEach(style => {
+      Object.defineProperty(ctx, style, {
+        set: value => {
+          if (style !== 'fillStyle' && style !== 'strokeStyle' 
+            || value !== 'none' && value !== null
+          ) {
+            ctx['set' + style.charAt(0).toUpperCase() + style.slice(1)](value);
+          }
+        }
+      });
+    });
+
+    ctx.createRadialGradient = () => {
+      return ctx.createCircularGradient(arguments);
+    };
+  }
+
+  _initEvent() {
+    this.event = {};
+    const eventNames = [{
+      wxName: 'touchStart',
+      ecName: 'mousedown'
+    }, {
+      wxName: 'touchMove',
+      ecName: 'mousemove'
+    }, {
+      wxName: 'touchEnd',
+      ecName: 'mouseup'
+    }, {
+      wxName: 'touchEnd',
+      ecName: 'click'
+    }];
+
+    eventNames.forEach(name => {
+      this.event[name.wxName] = e => {
+        const touch = e.touches[0];
+        this.chart.getZr().handler.dispatch(name.ecName, {
+          zrX: name.wxName === 'tap' ? touch.clientX : touch.x,
+          zrY: name.wxName === 'tap' ? touch.clientY : touch.y
+        });
+      };
+    });
+  }
+}

src/pages/mine/addCustomer/index.jsx

@@ -1,39 +1,157 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import './index.scss'
-import { ScrollView, Input, Image } from '@tarojs/components'
+import { ScrollView, Input, Image, Picker } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_ITEMS_LIST, API_CARDS_LIST, API_RECOMENT_CLIENT } from '@/constants/api'
+import Taro from '@tarojs/taro'
+import './index.scss'
 
 const defaultSpecialImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg'
 
-export default withLayout((props) => {
+export default withLayout(() => {
+
+  const user = useSelector(state => state.user)
+  const [PersonId, setPersonId] = useState(null)
+  const [BuildingName, setBuildingName] = useState(null)
+  const [CanSubmit, setCanSubmit] = useState(false)
+  const [BuildingId, setBuildingId] = useState(null)
+  const [CardName, setCardName] = useState(null)
+  const [CardId, setCardId] = useState(null)
+  const [BuildingList, setBuildingList] = useState([])
+  const [CardList, setCardList] = useState([])
+  const [SexList] = useState([
+    { name: '男', id: '1' },
+    { name: '女', id: '2' }
+  ])
+  const [SexName, setSexName] = useState(null)
+  const [SexId, setSexId] = useState(null)
+  const [FormData, setFormData] = useState({
+    name: '', // 姓名
+    phone: '', // 电话
+    sex: '', // 性别
+    intention: '', // 意向楼盘
+    realtyConsultant: '', // 置业顾问
+    describe: '', // 描述
+  })
+  
+
+  useEffect(() => {
+    if (PersonId !== user.userInfo.person.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+  
+  useEffect(() => {
+    if (CanSubmit) {
+      const params = {...FormData, sex: SexId, intention: BuildingId, realtyConsultant: CardId}
+      fetch({ url: API_RECOMENT_CLIENT, method: 'post', payload: params }).then(() => {
+        Taro.showToast({title: '添加成功', icon: 'none'})
+        Taro.navigateBack({delta: 1})
+      })
+    }
+  }, [CanSubmit])
+
+  useEffect(() => {
+    if (PersonId) {
+      GetBuildingList()
+    }
+  }, [PersonId])
+
+  useEffect(() => {
+    if (BuildingId) {
+      GetCardList()
+    }
+  }, [BuildingId])
+
+  const GetBuildingList = () => {
+    fetch({ url: API_ITEMS_LIST, method: 'get', params: { pageNumber: 1, pageSize: 1000, buildingId: BuildingId } }).then((res) => {
+      setBuildingList((res.records || [].map((item) => { return { id: item.buildingId, name: item.name } })))
+    })
+  }
+
+  const GetCardList = () => {
+    fetch({ url: API_CARDS_LIST, method: 'get', params: { pageNumber: 1, pageSize: 1000 } }).then((res) => {
+      setCardList((res.records || [].map((item) => { return { id: item.buildingId, name: item.name } })))
+    })
+  }
+
+  const PickerChange = (e) => {
+    setBuildingId(BuildingList[e.detail.value - 0].buildingId)
+    setBuildingName(BuildingList[e.detail.value - 0].name)
+    setCardId(null)
+    setCardName(null)
+  }
+
+  const CardPickerChange = (e) => {
+    setCardId(CardList[e.detail.value - 0].id)
+    setCardName(CardList[e.detail.value - 0].name)
+  }
+
+  const SexPickerChange = (e) => {
+    setSexId(SexList[e.detail.value - 0].id)
+    setSexName(SexList[e.detail.value - 0].name)
+  }
+
+  const FormInput = (e) => {
+    let Data = {...FormData}
+    Data[e.currentTarget.dataset.type] = e.detail.value
+    setFormData(Data)
+  }
 
-  // const [PageProps] = useState(props)
+  const ToSubmit = () => {
+    if(FormData.name === '') {
+      Taro.showToast({title: '请填写客户姓名', icon: 'none'})
+      return false
+    }
+    if(SexId === null) {
+      Taro.showToast({title: '请选择客户性别', icon: 'none'})
+      return false
+    }
+    if(FormData.phone === '') {
+      Taro.showToast({title: '请填写客户电话', icon: 'none'})
+      return false
+    }
+    if(!(/^1[3|4|5|6|7|8|9][0-9]\d{4,8}$/.test(FormData.phone)) || FormData.phone.length != 11) {
+      Taro.showToast({title: '请填写正确的客户电话', icon: 'none'})
+      return false
+    }
+    if(BuildingId === null) {
+      Taro.showToast({title: '请选择客户的意向楼盘', icon: 'none'})
+      return false
+    }
+    if(!CanSubmit) {
+      setCanSubmit(true)
+    }
+  }
 
   return (
     <view className='Page addCustomer'>
 
-      <ScrollView scroll-y={true} refresher-enabled={false} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled={false} refresher-background='#fff'>
         <view className='PageContent'>
 
           <text>客户姓名</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入客户真实姓名'></Input>
+              <Input placeholder='请输入客户真实姓名' data-type='name' onInput={FormInput.bind(this)}></Input>
             </view>
           </view>
 
           <text>客户电话</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入手机号'></Input>
+              <Input placeholder='请输入手机号' data-type='phone' onInput={FormInput.bind(this)}></Input>
             </view>
           </view>
 
           <text>性别</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <text>请选择</text>
+              <Picker range-key='name' onChange={SexPickerChange} value={0} range={SexList}>
+                <text>{SexName || '请选择'}</text>
+              </Picker>
             </view>
             <text className='iconfont icon-jiantoudown'></text>
           </view>
@@ -41,14 +159,18 @@ export default withLayout((props) => {
           <text>意向楼盘</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入楼盘名称'></Input>
+              <Picker range-key='name' onChange={PickerChange} value={0} range={BuildingList}>
+                <text>{BuildingName || '请选择'}</text>
+              </Picker>
             </view>
           </view>
 
           <text>内场接待（选填）</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <text>请选择</text>
+              <Picker range-key='name' onChange={CardPickerChange} value={0} range={CardList}>
+                <text>{CardName || '请选择'}</text>
+              </Picker>
             </view>
             <Image mode='heightFix' src={defaultSpecialImage}></Image>
             <text>选择</text>
@@ -57,12 +179,12 @@ export default withLayout((props) => {
           <text>备注</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='补充说明（选填）'></Input>
+              <Input placeholder='补充说明（选填）' data-type='describe' onInput={FormInput.bind(this)}></Input>
             </view>
           </view>
 
           <view className='Btn'>
-            <text>提交</text>
+            <text onClick={ToSubmit}>提交</text>
           </view>
 
         </view>

src/pages/mine/customerAnalyse/index.config.js

@@ -1,3 +1,6 @@
 export default {
-  navigationBarTitleText: '客户分析'
+  navigationBarTitleText: '客户分析',
+  usingComponents: {
+    'ec-canvas': '@/components/ec-canvas/ec-canvas'
+  }
 }

src/pages/mine/customerAnalyse/index.jsx

@@ -1,12 +1,16 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import './index.scss'
 import '@/assets/css/iconfont.css'
 import { ScrollView } from '@tarojs/components'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_SEX_INFO, API_ECHERTS_DAILY } from '@/constants/api'
+import echarts from '@/components/ec-canvas/echarts'
+// import dayjs from 'dayjs'
+import './index.scss'
 
-export default withLayout((props) => {
+export default withLayout(() => {
 
-  // const [PageProps] = useState(props)
   const [MenuList] = useState([
     { name: '新增客户', id: 1 },
     { name: '跟进客户', id: 2 },
@@ -20,11 +24,50 @@ export default withLayout((props) => {
   ])
   const [CurrentChartMenuId, setCurrentChartMenuId] = useState(1)
 
-  const [SexList, setSexList] = useState([
-    { name: '男', per: 0.6 },
-    { name: '女', per: 0.3 },
-    { name: '未知', per: 0.1 }
-  ])
+  const [ChartList, setChartList] = useState([])
+  const [SexList, setSexList] = useState([])
+  const user = useSelector(state => state.user)
+  const [PersonId, setPersonId] = useState(null)
+
+  useEffect(() => {
+    if (PersonId !== user.userInfo.person.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    setChartList([])
+    GetSexInfo()
+  }, [CurrentMenuId])
+
+  useEffect(() => {
+    if(!ChartList.length) {
+      GetChartInfo()
+    } else {
+      // const chart = echarts.init(canvas, null, { width: '100%', height: '100%' })
+      // canvas.setChart(chart)
+    }
+  }, [ChartList])
+
+  const GetSexInfo = () => {
+    fetch({ url: `${API_SEX_INFO}/${CurrentMenuId === 1 ? 'new' : CurrentMenuId === 2 ? 'follow' : 'visite'}`, method: 'get' }).then((res) => {
+      const SexRes = (res || []).map((item) => {
+        return { name: item.genderType == 1 ? '男' : item.genderType == 2 ? '女' : '未知', per: item.percentage }
+      })
+      setSexList(SexRes.length ? SexRes : [
+        { name: '男', per: 0 },
+        { name: '女', per: 0 },
+        { name: '未知', per: 0 }
+      ])
+    })
+  }
+
+  const GetChartInfo = () => {
+    fetch({ url: `${API_ECHERTS_DAILY}/${CurrentMenuId === 1 ? 'new' : CurrentMenuId === 2 ? 'follow' : 'visite'}`, method: 'get' }).then((res) => {
+      const Arr = (res || []).reverse()
+      setChartList(Arr.map(x => ({ name: x.day, value: x.customerNum })))
+    })
+  }
 
   const CutMenu = (item) => {
     return () => {
@@ -38,6 +81,82 @@ export default withLayout((props) => {
     }
   }
 
+  const createLineOptions = (source = []) => {
+    const colorWithOpacity = op => `rgba(187,156,121, ${op})`
+
+    const defaultOpt = {
+      color: [colorWithOpacity(1)],
+      xAxis: {
+        type: 'category',
+        boundaryGap: false,
+        axisLabel: {
+          textStyle: {
+            color: '#666'
+          }
+        }
+
+      },
+      yAxis: {
+        type: 'value',
+        axisLabel: {
+          textStyle: {
+            color: '#666'
+          }
+        }
+      },
+      grid: {
+        left: '10%',
+        right: '8%',
+        bottom: '12%',
+        top: '15%',
+      },
+      series: [],
+    }
+    // 数据展示只展示 5 个
+    const endValue = source.length - 1 > 0 ? source.length - 1 : 0
+    const startValue = endValue - 5 > 0 ? endValue - 5 : 0
+
+    return {
+      ...defaultOpt,
+      dataset: { source },
+      dataZoom: [{
+        type: 'inside',
+        startValue, endValue,
+        show: true,
+      }],
+      series: [{
+        type: 'line',
+        dimensions: ['name', 'value'],
+        symbolSize: 6,
+        smooth: true,
+        label: {
+          show: true,
+          formatter: '{@value}人'
+        },
+        lineStyle: {
+          shadowColor: colorWithOpacity(0.5),
+          shadowBlur: 5,
+          shadowOffsetY: 7
+        },
+        areaStyle: {
+          color: {
+            type: 'linear',
+            x: 0,
+            y: 0,
+            x2: 0,
+            y2: 1,
+            colorStops: [{
+              offset: 0, color: colorWithOpacity(0.2) // 0% 处的颜色
+            }, {
+              offset: 1, color: colorWithOpacity(0) // 100% 处的颜色
+            }],
+            global: false,
+          }
+        },
+      }],
+    }
+  }
+
   return (
     <view className='Page customerAnalyse flex-v'>
 
@@ -53,7 +172,7 @@ export default withLayout((props) => {
 
       <view className='flex-item'>
         <view>
-          <ScrollView scroll-y={true} refresher-enabled={false}>
+          <ScrollView scroll-y refresher-enabled={false}>
             <view className='PageContent'>
 
               {/* 图表 */}
@@ -66,7 +185,7 @@ export default withLayout((props) => {
                   }
                 </view>
                 <view className='LineChart'>
-
+                  <ec-canvas id='CanvasChart' canvas-id='CanvasChart' ec={{ lazyLoad: true }}></ec-canvas>
                 </view>
               </view>
 
@@ -78,7 +197,7 @@ export default withLayout((props) => {
                     <view className='flex-h' key={`SexItem-${index}`}>
                       <text>{item.name}</text>
                       <view className='flex-item'>
-                        <view style={{width: `${Math.floor(item.per * 100)}%`}}></view>
+                        <view style={{ width: `${Math.floor(item.per * 100)}%` }}></view>
                       </view>
                       <text>{Math.floor(item.per * 100)}%</text>
                     </view>

src/pages/mine/customerAnalyse/index.scss

@@ -99,6 +99,10 @@
                 height: 450px;
                 position: relative;
                 overflow: hidden;
+                // >#CanvasChart{
+                //   width: 100%;
+                //   height: 100%;
+                // }
               }
             }
             &.Sex {

src/pages/mine/myHomepage/index.jsx

@@ -1,17 +1,54 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+import Taro from '@tarojs/taro'
 import withLayout from '@/layout'
-import './index.scss'
 import { ScrollView, Image } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_AGENT_CURRENT, API_ITEMS_DETAIL } from '@/constants/api'
+import './index.scss'
 import ProjectListItem from '../../../components/ProjectListItem/index'
 
-export default withLayout((props) => {
-
-  // const [PageProps] = useState(props)
-  const [PageList, setPageList] = useState(['', ''])
+export default withLayout(() => {
+  
   const [IsPull, setPull] = useState(false)
   const [ShowPopup, setShowPopup] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
+  const [UserInfo, setUserInfo] = useState({})
+  const [BuildingInfo, setBuildingInfo] = useState({})
+
+  const user = useSelector(state => state.user)
+  const [PersonId, setPersonId] = useState(null)
+
+  useEffect(() => {
+    if (PersonId !== user.userInfo.person.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    if (PersonId) {
+      GetUserInfo()
+    }
+  }, [PersonId])
+
+  useEffect(() => {
+    if (UserInfo.buildingId) {
+      GetBuildingInfo()
+    }
+  }, [UserInfo])
+
+  const GetUserInfo = () => {
+    fetch({ url: API_AGENT_CURRENT, method: 'get' }).then((res) => {
+      setUserInfo(res)
+    })
+  }
+
+  const GetBuildingInfo = () => {
+    fetch({ url: `${API_ITEMS_DETAIL}/${UserInfo.buildingId}`, method: 'get', showToast: false }).then((res) => {
+      setBuildingInfo(res)
+    })
+  }
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
@@ -29,21 +66,21 @@ export default withLayout((props) => {
   return (
     <view className='Page myHomepage'>
 
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
         <view className='PageContent'>
 
           <view className='Card UserInfo'>
             <view className='flex-h Top'>
               <view className='Icon'>
-                <Image mode='aspectFill' src={null}></Image>
+                <Image mode='aspectFill' src={UserInfo.avatarurl}></Image>
               </view>
               <view className='flex-item'>
                 <view className='flex-h'>
                   <view className='flex-item'>
-                    <text>陆毅 13045678976</text>
+                    <text>{UserInfo.nickname} {UserInfo.phone}</text>
                   </view>
                   <text className='iconfont icon-dianzan'></text>
-                  <text>23赞</text>
+                  <text>{UserInfo.likeNum || 0}赞</text>
                 </view>
                 <view className='Tag'>
                   <view>
@@ -55,30 +92,30 @@ export default withLayout((props) => {
             </view>
             <view className='Work flex-h'>
               <view className='flex-item'>
-                <text>营销</text>
+                <text>{UserInfo.department || '-'}</text>
                 <text>部门</text>
               </view>
               <view className='flex-item'>
-                <text>营销经理</text>
+                <text>{UserInfo.post || '-'}</text>
                 <text>职位</text>
               </view>
               <view className='flex-item'>
-                <text>香颂·蔚澜半岛</text>
+                <text>{UserInfo.buildingName || '-'}</text>
                 <text>楼盘</text>
               </view>
             </view>
             <view className='Hot flex-h'>
               <view className='flex-item'>
                 {
-                  ['', '', '', '', '', ''].map((item, index) => (
+                  (UserInfo.visitRecords || []).map((item, index) => (
                     <view key={`UserItem-${index}`}>
-                      <Image mode='aspectFill' src={null}></Image>
+                      <Image mode='aspectFill' src={item.avatar}></Image>
                     </view>
                   ))
                 }
               </view>
               <text className='iconfont icon-renqi'></text>
-              <text>人气值6</text>
+              <text>人气值{UserInfo.hotNum || 0}</text>
             </view>
           </view>
 
@@ -88,14 +125,14 @@ export default withLayout((props) => {
               <text className='iconfont icon-dianhua'></text>
               <text>手机：</text>
               <view className='flex-item'>
-                <text>136 1394 9434</text>
+                <text>{UserInfo.phone}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text className='iconfont icon-dingwei'></text>
               <text>地址：</text>
               <view className='flex-item'>
-                <text>江苏省南京市雨花台区汇智大厦</text>
+                <text>{UserInfo.address || '暂无地址'}</text>
               </view>
             </view>
             <view className='Btn'>
@@ -103,22 +140,21 @@ export default withLayout((props) => {
             </view>
           </view>
 
-          <view className='ProjectList'>
-            <view className='flex-h'>
-              <view className='flex-item'>
-                <text>项目信息</text>
+          {
+            BuildingInfo.buildingId &&
+            <view className='ProjectList'>
+              <view className='flex-h'>
+                <view className='flex-item'>
+                  <text>项目信息</text>
+                </view>
+                <text onClick={() => { Taro.navigateTo({ url: `/pages/index/buildingList/index` }) }}>更多</text>
+                <text className='iconfont icon-jiantouright'></text>
+              </view>
+              <view className='List'>
+                <ProjectListItem data={BuildingInfo}></ProjectListItem>
               </view>
-              <text>更多</text>
-              <text className='iconfont icon-jiantouright'></text>
-            </view>
-            <view className='List'>
-              {
-                PageList.map((item, index) => (
-                  <ProjectListItem key={`ListItem-${index}`} data={item}></ProjectListItem>
-                ))
-              }
             </view>
-          </view>
+          }
 
 
           {/* bottom */}
@@ -127,7 +163,7 @@ export default withLayout((props) => {
           </view>
 
           <view className='Share'>
-            <text onClick={() => {setShowPopup(true)}}>生成海报分享好友</text>
+            <text onClick={() => { setShowPopup(true) }}>生成海报分享好友</text>
           </view>
 
         </view>
@@ -142,7 +178,7 @@ export default withLayout((props) => {
                 <view className='flex-item'>
                   <text>保存后分享图片</text>
                 </view>
-                <text className='iconfont icon-guanbi' onClick={() => {setShowPopup(false)}}></text>
+                <text className='iconfont icon-guanbi' onClick={() => { setShowPopup(false) }}></text>
               </view>
               <view className='flex-item'>
                 <view>