Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v3.5.1

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // 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: '"http://192.168.0.84:8080"',
+    WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

package.json

@@ -10,13 +10,13 @@
   "author": "pcli",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/async-await": "1.3.8",
-    "@tarojs/cli": "1.3.8",
-    "@tarojs/components": "1.3.8",
-    "@tarojs/redux": "^1.3.8",
-    "@tarojs/router": "1.3.8",
-    "@tarojs/taro": "1.3.8",
-    "@tarojs/taro-weapp": "1.3.8",
+    "@tarojs/async-await": "1.3.25",
+    "@tarojs/cli": "1.3.25",
+    "@tarojs/components": "1.3.25",
+    "@tarojs/redux": "^1.3.25",
+    "@tarojs/router": "1.3.25",
+    "@tarojs/taro": "1.3.25",
+    "@tarojs/taro-weapp": "1.3.25",
     "dayjs": "^1.8.14",
     "min-ready": "^2.3.0",
     "nervjs": "^1.4.3",
@@ -27,12 +27,12 @@
     "taro-ui": "^2.2.1"
   },
   "devDependencies": {
-    "@tarojs/plugin-babel": "1.3.8",
-    "@tarojs/plugin-csso": "1.3.8",
-    "@tarojs/plugin-less": "1.3.8",
-    "@tarojs/plugin-sass": "1.3.8",
-    "@tarojs/plugin-uglifyjs": "1.3.8",
-    "@tarojs/webpack-runner": "1.3.8",
+    "@tarojs/plugin-babel": "1.3.25",
+    "@tarojs/plugin-csso": "1.3.25",
+    "@tarojs/plugin-less": "1.3.25",
+    "@tarojs/plugin-sass": "1.3.25",
+    "@tarojs/plugin-uglifyjs": "1.3.25",
+    "@tarojs/webpack-runner": "1.3.25",
     "@types/react": "^16.4.6",
     "@types/webpack-env": "^1.13.6",
     "babel-eslint": "^8.2.3",

src/components/charts/Line.js

@@ -35,6 +35,7 @@ export default class LineChart extends Component {
 
   // 禁止 props 变更时渲染
   shouldComponentUpdate(nextProps) {
+    console.log('------------>', this.props, nextProps)
     if (nextProps.source && nextProps.source.length) {
       this.refreshChart(this.props.source)
     }
@@ -42,7 +43,7 @@ export default class LineChart extends Component {
     return false
   }
 
-  handleEcComponent (ref) {
+  handleEcComponent(ref) {
     this.ecComponent = ref
   }
 
@@ -51,27 +52,81 @@ export default class LineChart extends Component {
   }
 
   createOptions(source = []) {
+    const colorWithOpacity = op => `rgba(187,156,121, ${op})`
+
     const defaultOpt = {
-      color: ['#BB9C79', '#666666'],
-      xAxis: { type: 'category' },
-      yAxis: { type: 'value' },
+      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: '10%',
+        top: '6%',
+      },
       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 }],
       series: [{
         type: 'line',
-        areaStyle: {},
         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,
+          }
+        },
       }],
     }
   }
 
-  refreshChart(source) {    
+  refreshChart(source) {
     const options = this.createOptions(source)
-
+    console.log(source,"source")
     if (!this.echart) {
       if (this.ecComponent) {
         const initFunc = initChart(this.handleChart.bind(this), options)

src/components/charts/style.scss

@@ -1,11 +1,11 @@
 .map-container {
   position: absolute;
-  top: 0;
+  top: 80px;
   bottom: 0;
   left: 1vw;
   right: 0;
-  width:98vw;
-  height:600px;
+  width:100vw;
+  height:400px;
   display: flex;
   flex-direction: column;
   align-items: center;

src/constants/api.js

@@ -175,3 +175,5 @@ 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')
+export const API_ECHERTS_DAILY = resolvePath('customerStatisticDaily')
+export const API_ECHERTS_MONTH = resolvePath('customerStatisticMonthly')

src/pages/person/customerAnalysis/analysis.js

@@ -6,7 +6,7 @@ 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 { querySexInfo, getEchartDailyInfo, getEchartMonthInfo } from '@services/person'
 import { connect } from '@tarojs/redux'
 import LineChart from "../../../components/charts/Line";
 
@@ -22,14 +22,15 @@ export default class analysis extends Taro.Component {
     current: 0,
     recordId: undefined, // 埋点ID
     sexInfo: [],
+    checkedWhich: 0,
     chartInfo: [
-      { name: '周一', value: '26' },
-      { name: '周二', value: '84' },
-      { name: '周三', value: '107' },
-      { name: '周四', value: '93' },
-      { name: '周五', value: '127' },
-      { name: '周六', value: '64' },
-      { name: '周日', value: '94' },
+      // { name: '周一', value: '26' },
+      // { name: '周二', value: '84' },
+      // { name: '周三', value: '107' },
+      // { name: '周四', value: '93' },
+      // { name: '周五', value: '127' },
+      // { name: '周六', value: '64' },
+      // { name: '周日', value: '94' },
     ]
   }
 
@@ -71,65 +72,126 @@ export default class analysis extends Taro.Component {
         sexInfo: res || []
       })
     })
-    const chartData = [
-      { value: 335, name: '直接访问' },
-      { value: 310, name: '邮件营销' },
-      { value: 234, name: '联盟广告' },
-      { value: 135, name: '视频广告' },
-      { value: 1548, name: '搜索引擎' }
-    ];
+    getEchartDailyInfo('new').then(res => {
+      let arr = []
+      res.map((item, index) => {
+        arr.push({ value: item.customerNum, name: item.day })
+      })
+      console.log(arr, "88888888888888888888888888888888888")
+      this.setState({
+        chartInfo: arr || []
+      })
+    })
+  }
+  changeDailyMonth(inx) {
+    const { current } = this.state
+    const params = current == 0 ? 'new' : current == 1 ? 'follow' : 'visite'
+    if (inx == 0) {
+      getEchartDailyInfo(params).then(res => {
+
+
+        let arr = []
+        res.map((item, index) => {
+          arr.push({ value: item.customerNum, name: item.day })
+        })
+        console.log(arr, "88888888888888888888888888888888888")
+        this.setState({
+          chartInfo: arr || []
+        })
+      })
+    } else {
+      getEchartMonthInfo(params).then(res => {
+
+        this.setState({
+        })
+      })
+    }
+    this.setState({
+      checkedWhich: inx
+    })
 
   }
 
   render() {
 
     const tabList = [{ title: '新增客户' }, { title: '跟进客户' }, { title: '到访客户' }]
-    const { sexInfo, chartInfo } = this.state
+    const dailyMonth = ['日', '月']
+    const { sexInfo, chartInfo, checkedWhich, current } = 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} >
+        <AtTabs className="tab-bar" current={current} tabList={tabList} onClick={this.handleClick.bind(this)}>
+          <AtTabsPane current={current} index={0} >
             <View>
-              <View style="width:90vw;height:600rpx">
+              <View style="height:'40rpx;position: relative;">
+                <View className="daily-month" >
+                  {
+                    dailyMonth.map((item, index) => (
+                      <View key={index + 'daily'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
+                        {item}
+                      </View>))
+                  }
+                </View>
+              </View>
+              <View style="width:100vw;height:530rpx">
                 <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>
-                  ))
+                {sexInfo.map((item, index) => (
+                  <View key={index + 'sex1'} 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}>
+          <AtTabsPane current={current} index={1}>
             <View>
-              <LineChart />
+              <View style="height:'40rpx;position: relative;">
+                <View className="daily-month" >
+                  {
+                    dailyMonth.map((item, index) => (
+                      <View key={index + 'month'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
+                        {item}
+                      </View>))
+                  }
+                </View>
+              </View>
+              <View style="width:100vw;height:520rpx">
+                <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>
-                  ))
+                {sexInfo.map((item, index) => (
+                  <View key={index + 'sex2'} 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}>
+          <AtTabsPane current={current} index={2}>
             <View>
-              <LineChart />
+              <View style="height:'40rpx;position: relative;">
+                <View className="daily-month" >
+                  {
+                    dailyMonth.map((item, index) => (
+                      <View key={index + 'day'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
+                        {item}
+                      </View>))
+                  }
+                </View>
+              </View>
+              <View style="width:100vw;height:520rpx">
+                <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>
-                  ))
+                {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>

src/pages/person/customerAnalysis/index.scss

@@ -5,7 +5,38 @@
   position: relative;
   height:100vh;
 }
+.daily-month{
+  display: flex;
+  align-items: center;
+  text-align: right;
+  padding: 0 25px;
+  position: absolute;
+  right: 0;
+  .item{
+    width:76px;
+    height:40px;
+    line-height: 40px;
+    background:rgba(245,245,245,1);
+    border-radius:4px;
+    color:#999990;
+    font-size: 28px;
+    text-align: center;
+    margin: 0 15px;
 
+  }
+  .checked{
+    width:76px;
+    height:40px;
+    line-height: 40px;
+    background:rgba(240,233,226,1);
+    border-radius:4px;
+    color:#957C60;
+    font-size: 28px;
+    margin: 0 15px;
+    text-align: center;
+  
+  }
+}
 .tab-box{
   .at-tabs__header{
     width: 86%;

src/pages/person/customerAnalysis/myCustomer.js

@@ -214,6 +214,7 @@ export default class myCustomer extends Taro.Component {
       followVisible: true,
     })
   }
+  addFollowRecord
   followSaveBtn() {
     const { customerId } = this.$router.params
     const params = {
@@ -293,6 +294,14 @@ export default class myCustomer extends Taro.Component {
       this.setState({
         customerDetail: res || {}
       })
+      const params = {
+        recordType: '添加跟进',
+        customerSex: this.state.customerDetail.sex,
+        customerId,
+      }
+      addFollowRecord(params).then(res => {
+        this.queryFollowRecord(1)
+      })
     })
     this.setState({
       baseVisible: false,

src/pages/person/menus.js

@@ -45,7 +45,7 @@ const menus = [
       url: '/pages/person/customerAnalysis/index',
       icon: icons.homepage,
       extends: undefined,
-      userTypes: [ CONSULTANT],
+      userTypes: [CONSULTANT, CUSTOMER],
       style: '',
     },
     // {
@@ -60,7 +60,7 @@ const menus = [
       url: '/pages/agent/client/index',
       icon: icons.recommend,
       extends: undefined,
-      userTypes: [CUSTOMER,ESTATE_AGENT, CHANNEL_AGENT],
+      userTypes: [CUSTOMER, ESTATE_AGENT, CHANNEL_AGENT],
       style: '',
     },
     // {
@@ -151,16 +151,16 @@ const menus = [
       url: '/pages/agent/become/index',
       icon: icons.development,
       extends: undefined,
-      userTypes: [CUSTOMER,ESTATE_AGENT],
-      style: {color:'#888888'},
+      userTypes: [CUSTOMER, ESTATE_AGENT],
+      style: { color: '#888888' },
     },
     {
       name: '成为置业顾问',
       url: '',
       icon: icons.consultant,
       extends: undefined,
-      style: {color:'#888888'},
-      userTypes: [CUSTOMER,ESTATE_AGENT],
+      style: { color: '#888888' },
+      userTypes: [CUSTOMER, ESTATE_AGENT],
     },
 
   ]

src/services/person.js

@@ -7,6 +7,8 @@ import {
   API_ACTIVITY_LIST_CUSTOMER,
   API_FOLLOW_LIST,
   API_SEX_INFO,
+  API_ECHERTS_DAILY,
+  API_ECHERTS_MONTH
 } from '@constants/api'
 
 
@@ -15,6 +17,16 @@ import {
  * @param {*} type
  */
 export const querySexInfo = (type, payload) => fetch({ url: `${API_SEX_INFO}/${type}`, payload })
+/**
+ * 获取客户图表日数据
+ * @param {*} type
+ */
+export const getEchartDailyInfo = (type, payload) => fetch({ url: `${API_ECHERTS_DAILY}/${type}`, payload })
+/**
+ * 获取客户图表月数据
+ * @param {*} type
+ */
+export const getEchartMonthInfo = (type, payload) => fetch({ url: `${API_ECHERTS_MONTH}/${type}`, payload })
 
 /**
  * 获取我的客户数据