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

src/pages/mine/addCustomer/components/BuildingPicker.jsx

@@ -1,18 +1,30 @@
-import React, { useEffect, useState } from 'react'
+import { useEffect, useState } from 'react'
 import Picker from '@/components/Picker'
 import { fetch } from '@/utils/request'
-import { API_GET_AGENT_BUILDINGS } from '@/constants/api'
+import { API_GET_AGENT_BUILDINGS, API_ITEMS_LIST } from '@/constants/api'
 
 export default (props) => {
+
+  const { type = '', change = () => {} } = props
   const [dicts, setDicts] = useState([])
 
   useEffect(() => {
-    fetch({ url: API_GET_AGENT_BUILDINGS }).then((res) => {
-      setDicts(res || [])
-    })
+    if (type === 'customer') {
+      fetch({ url: API_ITEMS_LIST, payload: { pageNumber: 1, pageSize: 1000 } }).then((res) => {
+        setDicts(res.records || [])
+      })
+    } else {
+      fetch({ url: API_GET_AGENT_BUILDINGS }).then((res) => {
+        setDicts(res || [])
+      })
+    }
   }, [])
 
+  const BuildingChange = (value) => {
+    change(value)
+  }
+
   return (
-    <Picker kv={['buildingName', 'buildingId']} dicts={dicts} {...props} />
+    <Picker kv={['buildingName', 'buildingId']} dicts={dicts} {...props} onChange={BuildingChange} />
   )
 }

src/pages/mine/addCustomer/index.jsx

@@ -39,6 +39,12 @@ export default withLayout((props) => {
 
   const postSubmit = getSubmitor(person)
 
+  useEffect(() => {
+    if(buildingId) {
+
+    }
+  }, [buildingId])
+
   const preSubmit = (payload) => {
     if (payload.name === '') {
       Taro.showToast({ title: '请填写客户姓名', icon: 'none' })
@@ -56,7 +62,7 @@ export default withLayout((props) => {
       Taro.showToast({ title: '请填写正确的客户电话', icon: 'none' })
       return false
     }
-    if (buildingId === null && personType !== ROLE_CODE.CONSULTANT) {
+    if (buildingId === null && personType !== ROLE_CODE.CONSULTANT && personType !== ROLE_CODE.CUSTOMER) {
       Taro.showToast({ title: '请选择客户的意向楼盘', icon: 'none' })
       return false
     }
@@ -103,6 +109,10 @@ export default withLayout((props) => {
     setFormData(Data)
   }
 
+  const BuildingChange = (e) => {
+    setBuildingId(e)
+  }
+
   return (
     <view className='Page addCustomer'>
 
@@ -137,14 +147,14 @@ export default withLayout((props) => {
               <text>意向楼盘</text>
               <view className='FormLine flex-h'>
                 <view className='flex-item'>
-                  <BuildingPicker onChange={setBuildingId} value={buildingId} />
+                  <BuildingPicker change={BuildingChange} value={buildingId} type={type} />
                 </view>
               </view>
 
               <text>内场接待（选填）</text>
               <view className='FormLine flex-h'>
                 <view className='flex-item'>
-                  <ConsultantPicker buildingId={buildingId} onChange={setCardId} value={CardId} />
+                  <ConsultantPicker onChange={setCardId} value={CardId} buildingId={buildingId} />
                 </view>
                 <Image mode='heightFix' src={defaultSpecialImage}></Image>
                 <text>选择</text>