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

config/dev.js

@@ -5,8 +5,8 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST:  '"https://dev.jinchengjiaye.com"',//测试
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    //HOST:  '"https://dev.jinchengjiaye.com"',//测试
+    //WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
     // HOST: '"http://192.168.0.84:8080"',

src/pages/person/customerAnalysis/analysis.js

@@ -135,8 +135,8 @@ export default class analysis extends Taro.Component {
           })
         })
       } else if (params == 'follow') {
-        const arr2 = res.reverse()
         getEchartMonthInfo(params).then(res => {
+          const arr2 = res.reverse()
           this.setState({
             chartInfo2: arr2.map(x => ({ name: `${x.month.substr(4)}月`, value: x.customerNum })) || []
           })

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

@@ -27,7 +27,7 @@ export default class Item extends Component {
           <View className="left">
             <View className="title">{data.title}</View>
             {data.startDate &&
-              <View className={data.jionStatus == '已签到' ? "status signed " : data.jionStatus == '成功已核销' ? "status primary" : data.jionStatus == '失败' ? "status fail" : "status"}>{data.jionStatus || ''}</View>
+              <View className={data.joinStatus == '已签到' ? "status signed " : data.joinStatus == '成功已核销' ? "status primary" : data.joinStatus == '失败' ? "status fail" : "status"}>{data.joinStatus || ''}</View>
             }
           </View>
           {data.startDate &&

src/pages/person/customerAnalysis/myCustomer.js

@@ -3,7 +3,7 @@ import { AtTabs, AtTabsPane } from 'taro-ui'
 import ListView from '@components/ListView'
 import "taro-ui/dist/style/components/tabs.scss"
 import { savePoint, updatePoint } from '@services/common'
-import { getCustomerDetail, getVisitRecord, getActivityList, getFollowRecord, addFollowRecord, commitCustomerInfo,getBuildingType } from '@services/person'
+import { getCustomerDetail, getVisitRecord, getActivityList, getFollowRecord, addFollowRecord, commitCustomerInfo, getBuildingType } from '@services/person'
 import { connect } from '@tarojs/redux'
 import './index.scss'
 import ActivityItem from './item'
@@ -258,13 +258,15 @@ export default class myCustomer extends Taro.Component {
     )
   }
   perfectInformation() {
-    const {customerDetail} = this.state
+    const { customerDetail } = this.state
     this.setState({
       baseVisible: true,
       baseInfo: customerDetail,
     })
-    getBuildingType(customerDetail.buildingId).then(res=>{
-      console.log(res,"1111111111")
+    getBuildingType(customerDetail.buildingId).then(res => {
+      this.setState({
+        selector: res || []
+      })
     })
   }
   // 保存
@@ -280,6 +282,10 @@ export default class myCustomer extends Taro.Component {
         customerSex: this.state.customerDetail.sex,
         customerId,
       }
+      Taro.showToast({
+        title: '完善信息成功',
+        icon: 'none'
+      })
       addFollowRecord(params).then(res => {
         this.queryFollowRecord(1)
       })
@@ -332,7 +338,7 @@ export default class myCustomer extends Taro.Component {
     this.setState({
       baseInfo: {
         ...this.state.baseInfo,
-        demandType: this.state.selector[e.detail.value]
+        demandType: this.state.selector[e.detail.value].buildingTypeName
       }
     })
   }
@@ -400,7 +406,7 @@ export default class myCustomer extends Taro.Component {
             </View>
             <View className="con-picker" >
               <View>
-                <Picker mode='selector' range={selector} onChange={this.onChange}>
+                <Picker mode='selector' range={selector} range-key="buildingTypeName" onChange={this.onChange}>
                   <View className='picker'>
                     {baseInfo.demandType || '　'}
                   </View>
@@ -448,13 +454,12 @@ export default class myCustomer extends Taro.Component {
     return (
       <View>
         {followVisible && this.renderFollowBox()}
-        {console.log(this.props)}
         {baseVisible && this.renderBaseBox()}
         <View className="user_con">
           <Image className="bg" src={getThumbnail('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/shop/background.jpg')} ></Image>
           <Image className="user__left__headimg" src={customerDetail.picture || require('@assets/default-avatar.png')} />
           <View className='user__left__name'>
-            <View className="text">{customerDetail.name}的数据哈酒好多次客户方</View>
+            <View className="text">{customerDetail.name}</View>
             {
               customerDetail.sex == '1' && <Image style="width:36rpx;height:38rpx;margin-left:10rpx" src={maleImg} />
             }
@@ -491,7 +496,13 @@ export default class myCustomer extends Taro.Component {
                 <View className="list">
                   {visitRecord.length && visitRecord.map((item, index) => (
                     <View className="record-item" key={index + 'follow'}>
-                      <View className="title" >{item.activity}</View>
+                      <View className="title" >{item.activity}
+                        {
+                          (item.activityName || item.buildingName) &&
+                          <Text> : </Text>
+                        }
+                        {item.activityName || item.buildingName || ""}
+                      </View>
                       <View className="time">{dayjs(item.visitTime).format('YYYY年MM月DD日 HH:mm:ss') || '　'}</View>
                     </View>
                   ))

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

@@ -5,7 +5,7 @@ import './style.scss'
 const posIcon = require('@assets/icons/amap/position.png')
 
 export default function Pannel(props) {
-  console.log(props.dataset,"props.datasetprops.datasetprops.datasetprops.dataset")
+  
   const { data = [], manualData = [] } = props.dataset || {}
   const activeKey = props.active
 

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

@@ -3,8 +3,11 @@ import { View } from '@tarojs/components'
 import './style.scss'
 
 export default function Tab(props) {
+  
   const [current, setCurrent] = useState(props.default || 0)
+  
   const tabList = props.dataset ? props.dataset.filter(x => x.num) : []
+  
   const handleClick = index => () => {
     setCurrent(index)
     if (typeof props.onChange === 'function') {
@@ -16,7 +19,7 @@ export default function Tab(props) {
     <View className="around-tab">
       {tabList.map((item, index) => {
         const { key, label, num } = item || {}
-        console.log(item,'123456')
+        
         return (
           <View
             key={key}

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

@@ -10,16 +10,18 @@ export default function Around(props) {
   console.log(detail,"detaildetaildetaildetail")
   const [lat, lng] = (detail.coordinate || '').split(',')
   const poiDatas = detail.mapJson ? JSON.parse(detail.mapJson) : []
+  const ty = Object.prototype.toString
 
   // 展示内容数组
   const dataList = poiDatas.map((item) => {
     const key = item.key
-    const manualData = (detail[`building${key}`] || '').split(',')
-
+    const manualData = (detail[`building${key}`] === '' ? [] : detail[`building${key}`].split(','))
+    
+    console.log(manualData,"manualDatamanualData")
     return {
       ...item,
       manualData,
-      num: (item.data || []).length + manualData.length,
+      num: (ty.call(item.data) === '[object String]' ? JSON.parse(item.data) : []).length + manualData.length,
     }
   })
 

src/services/person.js

@@ -44,7 +44,7 @@ export const queryCustomerList = (type, payload) => fetch({ url: `${API_CUSTOMER
  * 获取项目类型
  * @param {*} buildingId 
  */
-export const getBuildingType = (customerId, payload) => fetch({ url: `${API_BUILDING_TYPE}/${buildingId}`, payload })
+export const getBuildingType = (buildingId, payload) => fetch({ url: `${API_BUILDING_TYPE}/${buildingId}`, payload })
 /**
  * 获取客户详情
  * @param {*} customerId