zls

config/prod.js

@@ -3,10 +3,12 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"http://192.168.0.72:8080"',
-    WSS_HOST: '"ws://192.168.0.72:8080"',
-    // HOST: '"https://lt.pawoma.cn"',
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
+    // HOST: '"http://192.168.0.218:8080"',
+    // WSS_HOST: '"ws://192.168.0.218:8080"',
+    // HOST:  '"https://dev.jinchengjiaye.com"',
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    HOST: '"https://lt.pawoma.cn"',
+    WSS_HOST: '"wss://lt.pawoma.cn"',
   },
   weapp: {},
   h5: {}

src/components/amap/PoiAround.js

@@ -1,7 +1,6 @@
 import Taro, { Component } from '@tarojs/taro'
 import { Map } from '@tarojs/components'
-
-const makerIcon = require('@assets/icons/blank.png')
+import icons from './icons'
 
 export default class PoiAround extends Component {
 
@@ -19,34 +18,16 @@ export default class PoiAround extends Component {
   render() {
     const { current } = this.state
     const markers =  (this.props.markers || []).map((marker, index) => {
+      const icon = icons[index].normal
+      const activeIcon = icons[index].active
 
       return {
         id: marker.id,
         latitude: marker.latitude,
         longitude: marker.longitude,
-        iconPath: makerIcon,
-        width: 30,
-        height: 30,
-        alpha: 0.7,
-        // title: index + 1,
-        // label: {
-        //   content: index + 1,
-        //   // borderRadius: 1000,
-        //   color: '#fff',
-        //   bgColor: '#f00',
-        //   textAlign: 'center',
-        // },
-        callout: {
-          content: index + 1 > 9 ? `${index + 1}` : `0${index + 1}`,
-          borderRadius: 30,
-          borderWidth: 2,
-          borderColor: '#BB9C79',
-          padding: 5,
-          color: current === marker.id ? '#fff' : '#BB9C79',
-          bgColor: current === marker.id ? '#BB9C79' : '#fff',
-          textAlign: 'center',
-          display: 'ALWAYS',
-        },
+        iconPath: current === marker.id ? activeIcon : icon,
+        width: 56,
+        height: 56,
       }
     })
 
@@ -57,7 +38,7 @@ export default class PoiAround extends Component {
         markers={markers}
         longitude={this.props.longitude}
         latitude={this.props.latitude}
-        onCalloutTap={this.handleTap}
+        onMarkerTap={this.handleTap}
         style={this.props.style}
       />
     )

src/components/amap/icons.js

@@ -0,0 +1,105 @@
+
+const icons = [
+  {
+    normal: require('@assets/icons/amap/nums/number1.png'),
+    active: require('@assets/icons/amap/active_nums/number1.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number2.png'),
+    active: require('@assets/icons/amap/active_nums/number2.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number3.png'),
+    active: require('@assets/icons/amap/active_nums/number3.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number4.png'),
+    active: require('@assets/icons/amap/active_nums/number4.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number5.png'),
+    active: require('@assets/icons/amap/active_nums/number5.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number6.png'),
+    active: require('@assets/icons/amap/active_nums/number6.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number7.png'),
+    active: require('@assets/icons/amap/active_nums/number7.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number8.png'),
+    active: require('@assets/icons/amap/active_nums/number8.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number9.png'),
+    active: require('@assets/icons/amap/active_nums/number9.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number10.png'),
+    active: require('@assets/icons/amap/active_nums/number10.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number11.png'),
+    active: require('@assets/icons/amap/active_nums/number11.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number12.png'),
+    active: require('@assets/icons/amap/active_nums/number12.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number13.png'),
+    active: require('@assets/icons/amap/active_nums/number13.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number14.png'),
+    active: require('@assets/icons/amap/active_nums/number14.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number15.png'),
+    active: require('@assets/icons/amap/active_nums/number15.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number16.png'),
+    active: require('@assets/icons/amap/active_nums/number16.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number17.png'),
+    active: require('@assets/icons/amap/active_nums/number17.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number18.png'),
+    active: require('@assets/icons/amap/active_nums/number18.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number19.png'),
+    active: require('@assets/icons/amap/active_nums/number19.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number20.png'),
+    active: require('@assets/icons/amap/active_nums/number20.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number21.png'),
+    active: require('@assets/icons/amap/active_nums/number21.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number22.png'),
+    active: require('@assets/icons/amap/active_nums/number22.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number23.png'),
+    active: require('@assets/icons/amap/active_nums/number23.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number24.png'),
+    active: require('@assets/icons/amap/active_nums/number24.png'),
+  },
+  {
+    normal: require('@assets/icons/amap/nums/number25.png'),
+    active: require('@assets/icons/amap/active_nums/number25.png'),
+  },
+]
+
+export default icons;

src/constants/api.js

@@ -166,3 +166,11 @@ export const API_CHECKIN_ACTIVE = resolvePath('buildingDynamicCheckin')
 export const API_GROUP_DETAIL = resolvePath('taShareActivity')
 export const API_GROUP_CREATE = resolvePath('taShareRecord')
 export const API_GROUP_JOIN = resolvePath('taShareChildRecord')
+
+//person
+export const API_MY_CUSTOMER = resolvePath('inventory/customer/statistics')
+export const API_CUSTOMER_LIST = resolvePath('inventory/customer/statistics')
+export const API_CUSTOMER_DETAIL = resolvePath('inventory/customer')
+export const API_VISIT_RECORD = resolvePath('taPersonVisitRecord')
+export const API_ACTIVITY_LIST_CUSTOMER = resolvePath('customer/activity/list')
+export const API_FOLLOW_LIST = resolvePath('taCustomerFollowUpRecord')

src/pages/person/customerAnalysis/analysis.js

@@ -1,8 +1,8 @@
 import Taro, { Component } from '@tarojs/taro';
 import Authorize from '@components/authorize'
 import { View } from "@tarojs/components";
-import MoveChart from '../../components/MoveChart'
-import LineChart from '../../components/LineChart'
+// import MoveChart from '../../More/More'
+// import LineChart from '../../components/LineChart'
 import './index.scss'
 import { AtTabs, AtTabsPane, AtProgress } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
@@ -44,10 +44,11 @@ export default class analysis extends Taro.Component {
         <AtTabs className="tab-bar" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >
             <View>
-              <View className="sex-box">
+              {/* <MoveChart/> */}
+              {/* <View className="sex-box">
                 <View className="sex">性别</View>
                 <AtProgress percent={25} strokeWidth={6} color='#FF4949' />
-              </View>
+              </View> */}
             </View>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={1}>
@@ -57,7 +58,6 @@ export default class analysis extends Taro.Component {
             <View style='padding: 100px 50px;background-color: #FAFBFC;text-align: center;'>标签页三的内容</View>
           </AtTabsPane>
         </AtTabs>
-
       </View>
     )
   }

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

@@ -4,6 +4,7 @@ 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'
 const iconImg = require('@assets/person/icon.png')
 
 @connect(({ user, city }) => ({ user, city }))
@@ -13,36 +14,82 @@ export default class transactionCustomer extends Taro.Component {
     navigationBarTitleText: '跟进客户'
   }
 
+
   state = {
-    list: [
-      { name: '刘丽丽', phone: '15852364821', sex: '1' },
-      { name: '邓亚平', phone: '13160056061', sex: '2' },
-    ],
     recordId: undefined, // 埋点ID
+    customerList: [],
     inputValue: '',
     screenVisible: false,
-    statusList: ['全部状态', '认筹', '到访', '签约'],
+    statusList: ['全部状态', '报备', '到访', '认筹'],
     statusIndex: -1,
-    visitDate: '',
-    visitDate2: '',
-    reportDate: '',
-    reportDate2: '',
+    startArrivalDate: '',
+    endArrivalDate: '',
+    startReportDate : '',
+    endReportDate: '',
   }
 
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+  componentDidShow() {
+    Taro.showLoading()
+    this.loadList()
+
+  }
+  loadList() {
+    const payload = {
+      type: 'follow',
+      pageNumber: 0,
+      pageSize: 9999
+    }
+    queryCustomerList(payload.type, payload).then(res => {
+
+      this.setState({
+        customerList: res.records || []
+      })
+      Taro.hideLoading()
+    })
+  }
+
+
   changeInput = e => {
     this.setState({
       inputValue: e.detail.value
     })
   }
   searchBtn() {
-    const palyload = {
-      inputValue: this.state.inputValue
+    // const playload = {
+    //   inputValue: this.state.inputValue
+    // }
+    this.filterCustomerList();
+   
+  }
+  filterCustomerList(){
+
+    const payload = {
+      type: 'follow',
+      pageNumber: 0,
+      pageSize: 9999,
+      status:this.state.statusIndex!=0?this.state.statusIndex:'',
+      startArrivalDate:this.state.startArrivalDate,
+      endArrivalDate: this.state.endArrivalDate,
+      startReportDate : this.state.startReportDate,
+      endReportDate: this.state.endReportDate,
     }
-    console.log(this.state.inputValue, "inputValue")
+    queryCustomerList(payload.type, payload).then(res => {
+
+      this.setState({
+        customerList: res.records || []
+      })
+      Taro.hideLoading()
+    })
+  }
+  saveBtn() {
+    this.filterCustomerList();
+    this.setState({
+      screenVisible: false,
+    })
   }
   screenShow() {
     this.setState({
@@ -57,41 +104,42 @@ export default class transactionCustomer extends Taro.Component {
   }
   onVisitDateChange = e => {
     this.setState({
-      visitDate: e.detail.value
+      startArrivalDate: e.detail.value
     })
   }
   onVisitDateChange2 = e => {
     this.setState({
-      visitDate2: e.detail.value
+      endArrivalDate: e.detail.value
     })
   }
   onReportDateChange = e => {
     this.setState({
-      reportDate: e.detail.value
+      startReportDate : e.detail.value
     })
   }
   onReportDateChange2 = e => {
     this.setState({
-      reportDate2: e.detail.value
-    })
-  }
-  saveBtn() {
-    this.setState({
-      screenVisible: false,
+      endReportDate: e.detail.value
     })
   }
+ 
   cancelBtn() {
     this.setState({
       screenVisible: false,
+      statusIndex: -1,
+      startArrivalDate: '',
+      endArrivalDate: '',
+      startReportDate : '',
+      endReportDate: '',
     })
   }
-  toMyCustomer() {
+  toMyCustomer(customerId) {
     Taro.navigateTo({
-      url: `/pages/person/customerAnalysis/myCustomer`
+      url: `/pages/person/customerAnalysis/myCustomer?customerId=`+customerId
     })
   }
   renderScreenBox() {
-    const { statusList, statusIndex, visitDate, visitDate2, reportDate, reportDate2 } = this.state
+    const { statusList, statusIndex, startArrivalDate, endArrivalDate, startReportDate , endReportDate } = this.state
     return (
       <View className="mask">
         <View className="content">
@@ -107,13 +155,13 @@ export default class transactionCustomer extends Taro.Component {
             到访时间：
               <Picker mode='date' onChange={this.onVisitDateChange}>
               <View className='picker'>
-                {visitDate}
-                {!visitDate && <Text className="placeholder">起始时间</Text>}
+                {startArrivalDate}
+                {!startArrivalDate && <Text className="placeholder">起始时间</Text>}
               </View>
             </Picker>-<Picker mode='date' onChange={this.onVisitDateChange2}>
               <View className='picker'>
-                {visitDate2}
-                {!visitDate2 && <Text className="placeholder">结束时间</Text>}
+                {endArrivalDate}
+                {!endArrivalDate && <Text className="placeholder">结束时间</Text>}
               </View>
             </Picker>
           </View>
@@ -121,13 +169,13 @@ export default class transactionCustomer extends Taro.Component {
             报备时间：
               <Picker mode='date' onChange={this.onReportDateChange}>
               <View className='picker'>
-                {reportDate}
-                {!reportDate && <Text className="placeholder">起始时间</Text>}
+                {startReportDate }
+                {!startReportDate  && <Text className="placeholder">起始时间</Text>}
               </View>
             </Picker>-<Picker mode='date' onChange={this.onReportDateChange2}>
               <View className='picker'>
-                {reportDate2}
-                {!reportDate2 && <Text className="placeholder">结束时间</Text>}
+                {endReportDate}
+                {!endReportDate && <Text className="placeholder">结束时间</Text>}
               </View>
             </Picker>
           </View>
@@ -147,7 +195,7 @@ export default class transactionCustomer extends Taro.Component {
   }
 
   render() {
-    const { list, screenVisible } = this.state
+    const { customerList, screenVisible } = this.state
 
     return (
       <View>
@@ -161,9 +209,14 @@ export default class transactionCustomer extends Taro.Component {
         </View>
         <View style="padding:10px">
           {
-            list.map((item, index) => (
-              <View class="item" key={index + 'list'} onClick={this.toMyCustomer}>
-                <Image src={require('@assets/default-avatar.png')} className='img'></Image>
+            !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}
                   {

src/pages/person/customerAnalysis/index.js

@@ -4,6 +4,7 @@ import './index.scss'
 import { AtTabs, AtTabsPane } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
 import { savePoint, updatePoint } from '@services/common'
+import { queryMyCustomer } from '@services/person'
 import { connect } from '@tarojs/redux'
 import Analysis from './analysis'
 
@@ -17,12 +18,29 @@ export default class customer extends Taro.Component {
   state = {
     current: 0,
     recordId: undefined, // 埋点ID
+    customerNum: {},
   }
 
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+  componentDidShow() {
+    Taro.showLoading()
+    this.loadInfo()
+
+  }
+
+  loadInfo() {
+    queryMyCustomer().then(res => {
+
+      this.setState({
+        customerNum: res || {}
+      })
+      Taro.hideLoading()
+    })
+  }
+
 
   handleClick(value) {
     this.setState({
@@ -42,6 +60,7 @@ export default class customer extends Taro.Component {
 
   render() {
     const tabList = [{ title: '客户分析' }, { title: '我的客户' }]
+    const { customerNum } = this.state
     return (
       <AtTabs className="tab-box" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
         <AtTabsPane current={this.state.current} index={0} >
@@ -54,12 +73,12 @@ export default class customer extends Taro.Component {
             <View className="my-customer" onClick={this.toFollowUpCustomer} style="border-right:1px solid rgba(0,0,0,0.12)">
               <Image mode="widthFix" src={require('@assets/person/genjin.png')} className='img'></Image>
               <View className="name">跟进客户</View>
-              <View className="num">33人</View>
+              <View className="num">{customerNum.followSum || 0}人</View>
             </View>
             <View className="my-customer" onClick={this.toTransactionCustomer}>
               <Image mode="widthFix" src={require('@assets/person/chengjiao.png')} className='img'></Image>
               <View className="name">成交客户</View>
-              <View className="name">33人</View>
+              <View className="name">{customerNum.clinchSum || 0}人</View>
             </View>
           </View>
         </AtTabsPane>

src/pages/person/customerAnalysis/index.scss

@@ -6,6 +6,8 @@
   height:100vh;
 }
 
+
+
 .tab-box{
   .at-tabs__header{
     width: 86%;
@@ -17,19 +19,24 @@
   .at-tabs__item{
     width:50%;
     flex: none;
-    color: #666;
+    color: $primary-color;
     font-size: 28px;
   }
+  .at-tabs__item:nth-child(2n+1){
+    border-radius: 44px 0 0 44px;
+  }
+  .at-tabs__item:nth-child(2n+2){
+    border-radius:0 44px 44px 0;
+  }
   .at-tabs__item--active{
     color: $primary-color;
     background-color: #f4f4f4;
-    border-radius: 0 44px 44px 0;
   }
   .at-tabs__item-underline{
-    height: 0px;
+    height: 0;
   }
   .at-tabs__underline{
-    height: 0px!important;
+    height: 0!important;
   }
   .my-customer{
     flex: 0 0 50%;
@@ -49,7 +56,7 @@
 
   }
   .tab-bar{
-    margin-top: 50px;
+    margin-top: 30px;
     .at-tabs__header{
       width: 80%;
       background-color: none;
@@ -70,12 +77,11 @@
       background-color: #fff;
     }
     .at-tabs__item-underline{
-      height: 2px;
+      height: 4px;
       background-color: $primary-color;
       width: 60%;
       margin-left: 20%;
     }
-  
   }
 }
 
@@ -111,6 +117,9 @@
     position: absolute;
     top:76px;
     left:320px;
+    display: flex;
+    align-items: center;
+    max-width: 200px;
   }
   .user__left__phone{
     font-size:32px;
@@ -221,3 +230,140 @@
     // }
     
   }
+  .mask {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    left: 0;
+    top: 0;
+    z-index: 9999;
+    background:rgba(0,0,0,0.22);
+    .base-con{
+      width: 94%;
+      height:610px;
+      position: absolute;
+      left: 3%;
+      top: 50%;
+      background-color: #fff;
+      padding: 40px;
+      margin-top: -305px;
+      border-radius:12px;
+      .con-item{
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 20px;
+      }
+      .textarea {
+        border: 2px solid #e3e3e3;
+        padding: 20px;
+        border-radius: 12px;
+        width:416px;
+        height:160px;
+        font-size: 26px;
+      }
+      .input {
+        border: 2px solid #e3e3e3;
+        padding: 0 20px;
+        border-radius: 4px;
+        width:416px;
+        height:40px;
+        line-height: 40px;
+        font-size: 26px;
+      }
+      .con-picker{
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width:456px;
+      }
+      .right-icon{
+        width:20px;
+        height:20px;
+        border-top: 2px solid #999;
+        border-right: 2px solid #999;
+        transform:rotate(45deg);
+      }
+      .bottom-btn{
+        margin: 30px auto 0 auto;
+        width: 90%;
+        height: 80px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-size: 30px;
+      
+        .save{
+          background-color: $primary-color;
+          color:#fff;
+          height: 76px;
+          line-height: 76px;
+          text-align: center;
+          width:240px;
+          border-radius:12px;
+          border:2px solid $primary-color;
+        }
+        .cancel{
+          color: $primary-color;
+          text-align: center;
+          height: 76px;
+          line-height: 76px;
+          width:240px;
+          border-radius:12px;
+          border:2px solid $primary-color;
+        }
+      }
+
+    }
+    .content {
+      width: 94%;
+      height:518px;
+      position: absolute;
+      left: 3%;
+      top: 50%;
+      background-color: #fff;
+      padding: 40px;
+      margin-top: -259px;
+      border-radius:12px;
+      .textarea {
+        border: 2px solid #e3e3e3;
+        padding: 20px;
+        border-radius: 12px;
+        width:416px;
+        height:258px;
+        font-size: 26px;
+      }
+      .bottom-btn{
+        margin: 70px auto 0 auto;
+        width: 90%;
+        height: 80px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-size: 30px;
+      
+        .save{
+          background-color: $primary-color;
+          color:#fff;
+          height: 76px;
+          line-height: 76px;
+          text-align: center;
+          width:240px;
+          border-radius:12px;
+          border:2px solid $primary-color;
+        }
+        .cancel{
+          color: $primary-color;
+          text-align: center;
+          height: 76px;
+          line-height: 76px;
+          width:240px;
+          border-radius:12px;
+          border:2px solid $primary-color;
+        }
+      }
+      
+    }
+  
+  
+   
+  }

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

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

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

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

src/pages/person/customerAnalysis/myCustomer.js

@@ -2,10 +2,12 @@ import Taro, { Component } from '@tarojs/taro';
 import { AtTabs, AtTabsPane } from 'taro-ui'
 import "taro-ui/dist/style/components/tabs.scss"
 import { savePoint, updatePoint } from '@services/common'
+import { getCustomerDetail, getVisitRecord, getActivityList, getFollowRecord } from '@services/person'
 import { connect } from '@tarojs/redux'
 import './index.scss'
 import ActivityItem from './item'
-import { getActNewList } from '@services/activity'
+import dayjs from 'dayjs'
+const iconImg = require('@assets/person/icon.png')
 
 @connect(({ user, city }) => ({ user, city }))
 export default class myCustomer extends Taro.Component {
@@ -17,15 +19,64 @@ export default class myCustomer extends Taro.Component {
   state = {
     current: 0,
     recordId: undefined, // 埋点ID
-    list: []
+    activityList: [],
+    followVisible: false,
+    baseVisible: false,
+    message: '', //跟进内容
+    desc: '', //客户描述
+    selectorChecked: '',
+    selector: ['美国', '中国', '巴西', '日本'],
+    customerDetail: {},
+    followRecord: []
+
   }
 
   componentWillUnmount() {
+
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
 
   handleClick(value) {
+    if (value == 1) {
+      const { customerId } = this.$router.params
+      const payload = {
+        pageNumber: '0',
+        pageSize: '10',
+        customerId,
+      }
+      getVisitRecord(payload).then(res => {
+        // this.setState({
+        //   customerDetail: res || {}
+        // })
+      })
+    } else if (value == 2) {
+      const { customerId } = this.$router.params
+      const payload = {
+        pageNumber: '0',
+        pageSize: '10',
+        customerId,
+      }
+      getActivityList(payload).then(res => {
+        this.setState({
+          activityList: res.records || []
+        })
+      })
+    } else if (value == 3) {
+      const { customerId } = this.$router.params
+      const payload = {
+        pageNumber: '0',
+        pageSize: '10',
+        customerId,
+      }
+      getFollowRecord(payload).then(res => {
+        console.log(res.records,"res")
+        this.setState({
+          followRecord: res.records 
+        }, console.log(this.state.followRecord, "followRecord")
+        )
+      })
+    }
     this.setState({
       current: value
     }, )
@@ -36,13 +87,20 @@ export default class myCustomer extends Taro.Component {
     this.loadList()
   }
   loadList() {
-    getActNewList().then(res => {
+    const { customerId } = this.$router.params
+    getCustomerDetail(customerId).then(res => {
       this.setState({
-        list: res.records || []
+        customerDetail: res || {}
       })
     })
   }
   handleItemClick(item) {
+    // if (item.status == 0) {
+    //   Taro.showToast({
+    //     title: '当前活动已失效',
+    //     icon: 'none'
+    //   })
+    // } else {
     switch (item.type) {
       case 'help':
         Taro.navigateTo({
@@ -60,30 +118,172 @@ export default class myCustomer extends Taro.Component {
         })
         return
     }
+    // }
+  }
+  addFollow() {
+    this.setState({
+      followVisible: true,
+    })
+  }
+  saveBtn() {
+    this.setState({
+      followVisible: false,
+    })
+  }
+  cancelBtn() {
+    this.setState({
+      followVisible: false,
+    })
+  }
+  onTextareaChange(e) {
+    this.setState({
+      message: e.target.value
+    })
+  }
+  renderFollowBox() {
+    const { message } = this.state
+    return (
+      <View className="mask">
+        <View className="content">
+          <View style="display:flex;justify-content: space-between;">
+            <View style="font-size:14px;color:#666">
+              跟进内容：
+            </View>
+            <Textarea
+              className="textarea"
+              value={message}
+              onInput={this.onTextareaChange}
+              maxLength={150}
+              placeholder='不超过150字'
+            />
+          </View>
+          <View className="bottom-btn">
+            <View className="save" onClick={this.saveBtn}>
+              保存
+            </View>
+            <View className="cancel" onClick={this.cancelBtn}>
+              取消
+          </View>
+          </View>
+        </View>
+      </View>
+    )
+  }
+  perfectInformation() {
+    this.setState({
+      baseVisible: true,
+    })
   }
+  baseSaveBtn() {
+    this.setState({
+      baseVisible: false,
+    })
+  }
+  baseCancelBtn() {
+    this.setState({
+      baseVisible: false,
+    })
+  }
+  onBaseTextareaChange(e) {
+    this.setState({
+      desc: e.target.value
+    })
+  }
+  onChange = e => {
+    this.setState({
+      selectorChecked: this.state.selector[e.detail.value]
+    })
+  }
+  renderBaseBox() {
+    const { desc, selector, selectorChecked } = 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={desc} onInput={this.onBaseTextareaChange} placeholder='' />
+          </View>
+          <View className="con-item">
+            <View style="font-size:14px;color:#666">
+              项目类型：
+            </View>
+            <View className="con-picker" >
+              <View>
+                <Picker mode='selector' range={selector} onChange={this.onChange}>
+                  <View className='picker'>
+                    当前选择：{selectorChecked}
+                  </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='' />
+          </View>
+          <View style="display:flex;justify-content: space-between;">
+            <View style="font-size:14px;color:#666">
+              客户描述：
+            </View>
+            <Textarea
+              className="textarea"
+              value={desc}
+              onInput={this.onBaseTextareaChange}
+              maxLength={150}
+              placeholder='不超过150字'
+            />
+          </View>
+          <View className="bottom-btn">
+            <View className="save" onClick={this.baseSaveBtn}>
+              保存
+            </View>
+            <View className="cancel" onClick={this.baseCancelBtn}>
+              取消
+          </View>
+          </View>
+        </View>
+      </View>
+    )
+  }
+
 
   render() {
 
     const tabList = [{ title: '基本信息' }, { title: '访问记录' }, { title: '活动信息' }, { title: '跟进记录' }]
-    const { list } = this.state
+    const { customerDetail, activityList, followRecord, followVisible, baseVisible } = this.state
     return (
       <View>
+        {followVisible && this.renderFollowBox()}
+        {baseVisible && this.renderBaseBox()}
         <View className="user_con">
           <Image className="bg" src={require('@assets/shop/background.jpg')} ></Image>
-          <Image className="user__left__headimg" src={require('@assets/default-avatar.png')} />
-          <View className='user__left__name'>客户姓名</View>
-          <View className='user__left__phone'>175 1562 8701</View>
+          <Image className="user__left__headimg" src={customerDetail.picture || require('@assets/default-avatar.png')} />
+          <View className='user__left__name'>
+            {customerDetail.name}
+            {
+              customerDetail.sex == '1' && <View style={`margin-left:10px;background-image: url(${iconImg});background-size: 100%;background-position: 0px -20px;width: 18px;height: 18px;`}></View>
+            }
+            {
+              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>
         <AtTabs className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >
             <View className="tab-pane1 pane">
-              <View className="status">到访</View>
-              <View className="base-item">意向项目：<View className="con">银城悦见山</View></View>
-              <View className="base-item">物业类型：<View className="con">自住</View></View>
-              <View className="base-item">项目类型：<View className="con">高层</View></View>
-              <View className="base-item">价格区间：<View className="con">{desc || '暂无'}</View></View>
-              <View className="base-item">客户描述：<View className="con">{desc || '暂无'}</View></View>
-              <View className="btn">完善信息</View>
+              <View className="status">{customerDetail.status == 1 ? '报备' : customerDetail.status == 2 ? '到访' : customerDetail.status == 3 ? '认筹' : '签约'}</View>
+              <View className="base-item">意向项目：<View className="con">{customerDetail.intention || '暂无'}</View></View>
+              <View className="base-item">物业类型：<View className="con">{customerDetail.realtyManageType || '暂无'}</View></View>
+              <View className="base-item">项目类型：<View className="con">{customerDetail.demandType || '暂无'}</View></View>
+              <View className="base-item">价格区间：<View className="con">{customerDetail.priceRange || '暂无'}</View></View>
+              <View className="base-item">客户描述：<View className="con">{customerDetail.describe || '暂无'}</View></View>
+              <View className="btn" onClick={this.perfectInformation}>完善信息</View>
             </View>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={1}>
@@ -96,13 +296,12 @@ export default class myCustomer extends Taro.Component {
               <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>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={2}>
             <View className="tab-pane3 pane">
-              {list.length > 0 &&
-                list.map(item => (
+              {activityList.length > 0 &&
+                activityList.map(item => (
                   <ActivityItem
                     data={item}
                     key={item.id}
@@ -113,13 +312,17 @@ export default class myCustomer extends Taro.Component {
             </View>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={3}>
-            <View  style="padding:10px 20px 120px 20px">
-              <View style=" display: flex;justify-content: space-between;align-items: center;color: #333;font-size: 16px;">
-                <View style=" display: flex;align-items: center;"><View style="width:8px;height:8px;margin-right:10px;display:inline-block;background:rgba(246,182,29,1);border-radius: 50%;"></View>编辑客户信息</View>
-                <View classNam="time" style=" font-size: 13px;color: #999;">2019年11月11日 12:24:59</View>
-              </View>
-              <View className="btn">添加跟进</View>
+            <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>
+
           </AtTabsPane>
         </AtTabs>
       </View>

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

@@ -3,7 +3,7 @@ import Authorize from '@components/authorize'
 import './index.scss'
 import { savePoint, updatePoint } from '@services/common'
 import { connect } from '@tarojs/redux'
-// import { getThumbnail } from '@utils/tools'
+import { queryCustomerList } from '@services/person'
 const iconImg = require('@assets/person/icon.png')
 
 
@@ -15,29 +15,47 @@ export default class transactionCustomer extends Taro.Component {
   }
 
   state = {
-    list: [
-      { name: '刘丽丽', phone: '15852364821', sex: '1' },
-      { name: '邓亚平', phone: '13160056061', sex: '2' },
-    ],
     recordId: undefined, // 埋点ID
+    customerList: [],
   }
 
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+  componentDidShow() {
+    Taro.showLoading()
+    this.loadList()
+
+  }
+  loadList() {
+    const payload = {
+      type: 'clinch',
+      pageNumber: 0,
+      pageSize: 9999
+    }
+    queryCustomerList(payload.type, payload).then(res => {
+      this.setState({
+        customerList: res.records || []
+      })
+      Taro.hideLoading()
+    })
+  }
 
   render() {
-    const { list } = this.state
+    const { customerList } = this.state
 
     return (
       <View style="padding:10px">
         {
-
-          list.map(item => (
+          !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={require('@assets/default-avatar.png')} className='img'></Image>
+              <Image src={item.picture || require('@assets/default-avatar.png')} className='img'></Image>
               <View className="name">
                 {item.name}
                 {
@@ -48,7 +66,7 @@ export default class transactionCustomer extends Taro.Component {
                 }
               </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 style={`background-image: url(${iconImg});background-size: 100%;background-position: 0px -44px;width: 22px;height: 22px;`}></View>
             </View>
           ))
         }

src/pages/person/menus.js

@@ -44,7 +44,7 @@ const menus = [
       url: '/pages/person/customerAnalysis/index',
       icon: icons.homepage,
       extends: undefined,
-      userTypes: [CONSULTANT],
+      userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
     },
     // {
     //   name: '成为经纪人',

src/pages/project/detail/Around/Pannel.js

@@ -2,6 +2,8 @@ import Taro from '@tarojs/taro'
 import { View } from '@tarojs/components'
 import './style.scss'
 
+const posIcon = require('@assets/icons/amap/position.png')
+
 export default function Pannel(props) {
   const { data = [], manualData = [] } = props.dataset || {}
   const activeKey = props.active
@@ -17,7 +19,10 @@ export default function Pannel(props) {
           return (
             <View className={`around-cell ${active ? 'active' : ''}`} key={`auto-${id}`}>
               <View className="around-cell__body">{`${index + 1}、${name}`}</View>
-              <View className="around-cell__action">{dist}</View>
+              <View className="around-cell__action">
+                <Image className="icon" src={posIcon} />
+                {dist}
+              </View>
             </View>
           )
         })

src/pages/project/detail/Around/style.scss

@@ -91,7 +91,17 @@
 
   &__action {
     flex: none;
-    width: 200px;
+    width: 160px;
+    font-size: 30px;
+    line-height: 42px;
+    vertical-align: middle;
+
+    .icon {
+      width: 26px;
+      height: 26px;
+      display: inline-block;
+      margin: 0 10px;
+    }
   }
 }
 

src/pages/project/index.js

@@ -94,8 +94,8 @@ export default class Index extends Component {
           // debugger
           let city = res.result.address_component.city
 
-          // console.log('-----city-->', city)
-          
+          console.log('-----city-->', city)
+
           let curCity = cityList.filter(item => {
             return item.name == city
           })
@@ -146,7 +146,7 @@ export default class Index extends Component {
       status: 1,
       zipcode: "320100"
     }
-    
+
     const GuiYang = {
       citycode: "0851",
       id: 520100,
@@ -161,6 +161,49 @@ export default class Index extends Component {
       status: 1,
       zipcode: "520100"
     }
+    const LiuZhou = {
+      citycode: "0772",
+      id: 450200,
+      initial: "L",
+      lat: "24.314617",
+      leveltype: 2,
+      lng: "109.411703",
+      name: "柳州市",
+      parentid: 450000,
+      pinyin: "Liuzhou",
+      shortname: "柳州",
+      status: "1",
+      zipcode: "545001",
+    }
+    const KunMing = {
+      citycode: "0871",
+      id: 530100,
+      initial: "K",
+      lat: "25.040609",
+      leveltype: 2,
+      lng: "102.712251",
+      name: "昆明市",
+      parentid: 530000,
+      pinyin: "Kunming",
+      shortname: "昆明",
+      status: "1",
+      zipcode: "650500",
+    }
+    const HuZhou = {
+      citycode: "0572",
+      id: 330500,
+      initial: "H",
+      lat: "30.867198",
+      leveltype: 2,
+      lng: "120.102398",
+      name: "湖州市",
+      parentid: 330000,
+      pinyin: "Huzhou",
+      shortname: "湖州",
+      status: "1",
+      zipcode: "313000",
+    }
+
 
     const appId = accountInfo.miniProgram.appId;
     let params;
@@ -170,11 +213,43 @@ export default class Index extends Component {
       case 'wxd6f47a9bb3052175':
         params = NanJing;
         break;
-
       // 橙蕉
       case 'wxe3b1e683853800b5':
         params = GuiYang;
         break;
+      // 香颂
+      case 'wx09cd665abf378db7':
+        params = LiuZhou;
+        break;
+      // 诚通公园里
+      case 'wx7c72475f7f354d17':
+        params = HuZhou;
+        break;
+      // 北京城建
+      case 'wx766cfc5d8429c927':
+        params = NanJing;
+        break;
+      // 云南昊居
+      case 'wx03aca9d7d9b0b7f1':
+        params = KunMing;
+        break;
+      // 奥园金基
+      case 'wx7183d7d918a426d3':
+        params = NanJing;
+        break;
+      // 南京楼市
+      case 'wxb2175cd2ead31a60':
+        params = NanJing;
+        break;
+      // 融创
+      case 'wxe9e01aa4a3568f52':
+        params = NanJing;
+        break;
+      // 尾房宝
+      case 'wx755faa4b3ec76cd3':
+        params = NanJing;
+        break;
+
       default:
         params = payload;
         break;
@@ -460,9 +535,9 @@ export default class Index extends Component {
       })
     } else {
       Taro.navigateTo({
-        url: `/pages/agent/recommend/index?type=index&cityId=` +this.props.curCity.id
+        url: `/pages/agent/recommend/index?type=index&cityId=` + this.props.curCity.id
       })
-      console.log(this.props.curCity.id,"this.props.curCity.id")
+      console.log(this.props.curCity.id, "this.props.curCity.id")
     }
   }
   toMapHouse() {

src/pages/shop/index.js

@@ -262,6 +262,7 @@ export default class Shop extends Component {
           <View className="list__wrap">
             <View className="hot_title">热门商品</View>
             {
+              goodsList.length &&
               goodsList.map(item => (
                 
                 <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
@@ -279,6 +280,12 @@ export default class Shop extends Component {
                 </View>
               ))
             }
+            {
+              goodsList.length < 1 &&
+              <View style="font-size:14px;color:#888;margin:40px auto;text-align: center;">
+                暂无商品~
+              </View>
+            }
           </View>
         }
         {
@@ -289,7 +296,7 @@ export default class Shop extends Component {
               {goodsBuilding.map((l_item, index) => (
                 <AtTabsPane current={current} key={`pane-${index}`} index={index} >
                   <View>
-                    {
+                    {goodsList.length &&
                       goodsList.map(item => (
                         <View className="item" key={item.goodsId} onClick={this.onViewDetail.bind(this, item)}>
                           <Image className="item__img" mode="aspectFill" src={item.imgUrl} />
@@ -306,7 +313,12 @@ export default class Shop extends Component {
                         </View>
                       ))
                     }
-
+                    {
+                      goodsList.length < 1 &&
+                      <View style="font-size:14px;color:#888;margin:40px auto;text-align: center;">
+                        暂无商品~
+                      </View>
+                    }
                   </View>
                 </AtTabsPane>
               ))
@@ -321,7 +333,7 @@ export default class Shop extends Component {
   }
 
   renderDetail() {
-    const { user,points } = this.state
+    const { user, points } = this.state
     const { userInfo: { person }, curCity } = this.props
     const { bannerList = [] } = this.state
     return (
@@ -370,7 +382,7 @@ export default class Shop extends Component {
 
 
           {bannerList.length > 0 &&
-            <Banner list={bannerList}  onClick={this.handleBannerClick} indicatorDots={false}></Banner>
+            <Banner list={bannerList} onClick={this.handleBannerClick} indicatorDots={false}></Banner>
           }
 
 

src/services/person.js

@@ -0,0 +1,45 @@
+import { fetch } from '@utils/request'
+import {
+  API_MY_CUSTOMER,
+  API_CUSTOMER_LIST,
+  API_CUSTOMER_DETAIL,
+  API_VISIT_RECORD,
+  API_ACTIVITY_LIST_CUSTOMER,
+  API_FOLLOW_LIST
+} from '@constants/api'
+
+
+/**
+ * 获取我的客户数据
+ * @param {*} payload
+ */
+export const queryMyCustomer = payload => fetch({ url: API_MY_CUSTOMER, payload })
+
+/**
+ * 获取客户列表
+ * @param {*} type  
+ */
+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 {*} payload  
+ */
+export const  getVisitRecord = ( payload) => fetch({ url: API_VISIT_RECORD, payload })
+/**
+ * 获取活动信息
+ * @param {*} payload  
+ */
+export const  getActivityList = ( payload) => fetch({ url: API_ACTIVITY_LIST_CUSTOMER, payload })
+/**
+ * 获取跟进记录
+ * @param {*} payload  
+ */
+export const  getFollowRecord = ( payload) => fetch({ url: API_FOLLOW_LIST, payload })
+
+
+

src/utils/amap.js

@@ -1,99 +0,0 @@
-/**
- * 高德地图
- * 
- * POI 类型下载 https://lbs.amap.com/api/webservice/guide/api/search/#around
- * 
- */
-const amapLib = require('../lib/amap-wx');
-const myAmapKey = '766411323b66f7e876f428d8a23aa83c'
-const amap = new amapLib.AMapWX({ key: myAmapKey })
-
-// key 值会被拿到 building 表中 组合为字段名
-const POI_TYPES = [
-  {
-    key: 'Transport',
-    label: '交通',
-    types: ['150100', '150200', '150300', '150400', '150500', '150600'],
-  },
-  {
-    key: 'Mall',
-    label: '商业',
-    types: ['060100', '060200', '060300', '060400', '060500', '060600',
-            '060700', '060800', '060900', '061000', '061100', '061200',
-            '061300', '061400', '080100', '080200', '080300', '080400',
-            '080500', '080600'],
-  },
-  {
-    key: 'Edu',
-    label: '学校',
-    types: ['141200'],
-  },
-  {
-    key: 'Hospital',
-    label: '医院',
-    types: ['090100', '090200', '090300', '090400', '090500', '090600', '090700'],
-  },
-  {
-    key: 'Bank',
-    label: '银行',
-    types: ['160100'],
-  },
-  {
-    key: 'Restaurant',
-    label: '餐饮',
-    types: ['050100', '050200', '050300', '050400', '050500', '050600',
-            '050700', '050800', '050900'],
-  },
-]
-
-const getPrefix = str => str.substr(0, 4)
-
-export function getPoiAround(params) {
-  const {
-    lng,
-    lat
-  } = params || {}
-
-  return new Promise((resolve, reject) => {
-    const querytypes = POI_TYPES.reduce((acc, item) => ([ ...acc, ...item.types ]), []).join('|')
-    const location = `${lng},${lat}`
-    const iconPath = undefined
-    const iconPathSelected = undefined
-    const resultList = []
-
-    // 成功回调
-    // https://lbs.amap.com/api/webservice/guide/api/search/#around
-    const successCall = poiType => res => {
-      resultList.push({
-        key: poiType.key,
-        label: poiType.label,
-        poisData: res.poisData,
-        markers: res.markers
-      })
-
-      if (resultList.length === POI_TYPES.length) {
-        resolve(resultList)
-      }
-    }
-
-    // 失败回调
-    // https://lbs.amap.com/api/webservice/guide/tools/info/
-    const failCall = poiType => info => {
-      console.error(poiType, info)
-      reject(info)
-    }
-
-    POI_TYPES.forEach((pt) => {
-      const querytypes = pt.types.join('|')
-
-      amap.getPoiAround({
-        querytypes,
-        location,
-        iconPath,
-        iconPathSelected,
-        success: successCall(pt),
-        fail: failCall(pt),
-      })
-    })
-  })
-}