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

src/constants/api.js

@@ -14,6 +14,10 @@ export const resolvePath = api => `${host + pathname}/${api}`
 
 export const API_CITY_AREA = resolvePath('tdCityList/tdAreaCity') // 城市下区域查询
 
+// 客户
+export const API_SAVE_CUSTOMER_INFO = resolvePath('customerInfo') // 保存客户信息
+export const API_GET_CUSTOMER_INFO = resolvePath('customerInfo/') // 查询客户信息
+
 // 课程
 export const API_COURSE_LIST = resolvePath('curriculum') // 课程列表
 export const API_MY_COLLECT_COURSE_LIST = resolvePath('curriculum/save') // 我收藏的课程列表

src/pages/mine/addCustomer/index.jsx

@@ -59,7 +59,7 @@ export default withLayout((props) => {
       if (type === 'consultant') {
         params = { name: FormData.name, phone: FormData.phone, sex: SexId }
       } else {
-        params = { ...FormData, sex: SexId, intention: BuildingId, realtyConsultant: CardId }
+        params = { ...FormData, sex: SexId, buildingId: BuildingId, realtyConsultant: CardId }
       }
       if (type === 'estateAgent') {
         params.channelCustomerId = PersonId
@@ -144,14 +144,10 @@ export default withLayout((props) => {
       Taro.showToast({ title: '请填写正确的客户电话', icon: 'none' })
       return false
     }
-    if (BuildingId === null) {
+    if (BuildingId === null && type !== 'consultant') {
       Taro.showToast({ title: '请选择客户的意向楼盘', icon: 'none' })
       return false
     }
-    if (CardId === null) {
-      Taro.showToast({ title: '请选择内场接待', icon: 'none' })
-      return false
-    }
     if (!CanSubmit) {
       setCanSubmit(true)
     }
@@ -180,37 +176,36 @@ export default withLayout((props) => {
           <text>性别</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Picker range-key='name' onChange={SexPickerChange} value={0} range={SexList}>
+              <Picker range-key='name' onChange={SexPickerChange} value={null} range={SexList}>
                 <text>{SexName || '请选择'}</text>
               </Picker>
             </view>
             <text className='iconfont icon-jiantoudown'></text>
           </view>
 
-
-          <text>意向楼盘</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <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'>
-              <Picker range-key='name' onChange={CardPickerChange} value={0} range={CardList}>
-                <text>{CardName || '请选择'}</text>
-              </Picker>
-            </view>
-            <Image mode='heightFix' src={defaultSpecialImage}></Image>
-            <text>选择</text>
-          </view>
-
           {
             type !== 'consultant' &&
             <Block>
+              <text>意向楼盘</text>
+              <view className='FormLine flex-h'>
+                <view className='flex-item'>
+                  <Picker range-key='name' onChange={PickerChange} value={null} range={BuildingList}>
+                    <text>{BuildingName || '请选择'}</text>
+                  </Picker>
+                </view>
+              </view>
+
+              <text>内场接待（选填）</text>
+              <view className='FormLine flex-h'>
+                <view className='flex-item'>
+                  <Picker range-key='name' onChange={CardPickerChange} value={null} range={CardList}>
+                    <text>{CardName || '请选择'}</text>
+                  </Picker>
+                </view>
+                <Image mode='heightFix' src={defaultSpecialImage}></Image>
+                <text>选择</text>
+              </view>
+
               <text>备注</text>
               <view className='FormLine flex-h'>
                 <view className='flex-item'>

src/pages/mine/components/EditUserDetailBasicInfo/index.jsx

@@ -1,5 +1,8 @@
 import { useState, useEffect } from 'react'
 import { ScrollView, Input, Picker } from '@tarojs/components'
+import { fetch } from '@/utils/request'
+import { API_SAVE_CUSTOMER_INFO } from '@/constants/api'
+import Taro from '@tarojs/taro'
 import './index.scss'
 
 export default function EditUserDetailBasicInfo (props) {
@@ -15,11 +18,20 @@ export default function EditUserDetailBasicInfo (props) {
   useEffect(() => {
     if(CanSubmit) {
       setCanSubmit(false)
-      console.log(FormData)
-      close()
+      ToSubmit()
     }
   }, [CanSubmit])
 
+  const ToSubmit = () => {
+    let params = {}
+    fetch({ API_SAVE_CUSTOMER_INFO, method: 'post', payload: params }).then(() => {
+      Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
+      close()
+    }).catch(() => {
+      setCanSubmit(false)
+    })
+  }
+
   const PickerChange = (key, e) => {
     let resData = FormData
     if (key === 'age') {

src/pages/mine/customerDetail/index.jsx

@@ -4,7 +4,7 @@ import withLayout from '@/layout'
 import '@/assets/css/iconfont.css'
 import { Image, Textarea } from '@tarojs/components'
 import { fetch } from '@/utils/request'
-import { API_CUSTOMER_DETAILINFO, API_FOLLOW_LIST } from '@/constants/api'
+import { API_GET_CUSTOMER_INFO, API_FOLLOW_LIST } from '@/constants/api'
 import { getImgURL } from '@/utils/image'
 import './index.scss'
 import UserDetailBasicInfo from '../components/UserDetailBasicInfo/index'
@@ -28,7 +28,7 @@ export default withLayout((props) => {
 
   useEffect(() => {
     if (CustomerId) {
-      fetch({ url: `${API_CUSTOMER_DETAILINFO}/${CustomerId}` }).then((res) => {
+      fetch({ url: `${API_GET_CUSTOMER_INFO}${CustomerId}` }).then((res) => {
         setCustomerInfo(res)
       })
     }

src/pages/mine/index.jsx

@@ -7,7 +7,7 @@ import '@/assets/css/iconfont.css'
 import { fetch } from '@/utils/request'
 import { API_PUT_REGISTERCONSULTANT } from '@/constants/api'
 import { getImgURL } from '@/utils/image'
-import { UPDATE_USER_INFO } from '@/constants/user'
+import { UPDATE_USER_INFO, ROLE_CODE } from '@/constants/user'
 import store from '@/store'
 import './index.scss'
 import NeedLogin from './components/NeedLogin'
@@ -29,7 +29,7 @@ export default withLayout(() => {
     setShowLogin(false)
     if (user?.userInfo?.person?.personId) {
       const person = user.userInfo.person
-      setUserRole(person.personType === 'customer' || person.personType === 'drift' ? 1 : person.personType === 'estate agent' || person.personType === 'channel agent' ? 2 : person.personType === 'Realty Consultant' ? 3 : 4)
+      setUserRole(person.personType === ROLE_CODE.CUSTOMER ? 1 : person.personType === ROLE_CODE.CHANNEL_AGENT ? 2 : person.personType === ROLE_CODE.CONSULTANT ? 3 : 4)
     }
   }, [user])