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

config/dev.js

     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"http://127.0.0.1:8081"',
+    HOST: '"https://xlk.njyz.tech"',
+    // HOST: '"http://127.0.0.1:8081"',
     WSS_HOST: '"ws://127.0.0.1:8081"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

src/constants/api.js

 export const API_SAVE_CUSTOMER_INFO = resolvePath('customerInfo') // 保存客户信息
 export const API_GET_CUSTOMER_INFO = resolvePath('customerInfo/') // 查询客户信息
 
+// 获取经纪人绑定楼盘列表
+export const API_GET_AGENT_BUILDINGS = resolvePath('buildingChannel/buildings')
+
 // 课程
 export const API_COURSE_LIST = resolvePath('curriculum') // 课程列表
 export const API_COURSE_DETAIL = resolvePath('curriculum') // 课程详情

src/pages/mine/addCustomer/index.jsx

 import '@/assets/css/iconfont.css'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
-import { API_ITEMS_LIST, API_CARDS_LIST, API_REPORT_CUETOMER, API_USER_ADD_CUSTOMER, API_CHANNEL_REPORT } from '@/constants/api'
+import { API_GET_AGENT_BUILDINGS, API_CARDS_LIST, API_REPORT_CUETOMER, API_USER_ADD_CUSTOMER, API_CHANNEL_REPORT } from '@/constants/api'
 import Taro from '@tarojs/taro'
 import './index.scss'
 
   }, [BuildingId])
 
   const GetBuildingList = () => {
-    fetch({ url: API_ITEMS_LIST, method: 'get', params: { pageNumber: 1, pageSize: 1000, buildingId: BuildingId } }).then((res) => {
+    fetch({ url: API_GET_AGENT_BUILDINGS, method: 'get' }).then((res) => {
       setBuildingList((res.records || [].map((item) => { return { id: item.buildingId, name: item.name } })))
     })
   }

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

 import './index.scss'
 
 export default function EditUserDetailBasicInfo (props) {
-  const { Data = {}, close = () => { } } = props
+  const { Data = {}, close = () => { }, CustomerId = null } = props
 
   const [FormData, setFormData] = useState({ ...Data })
 
   const [CanSubmit, setCanSubmit] = useState(false)
 
   useEffect(() => {
-    if(CanSubmit) {
+    if (CanSubmit) {
       setCanSubmit(false)
       ToSubmit()
     }
   }, [CanSubmit])
 
   const ToSubmit = () => {
-    let params = {}
-    fetch({ API_SAVE_CUSTOMER_INFO, method: 'post', payload: params }).then(() => {
+    let params = { ...FormData, customerId: CustomerId }
+    let url = Data.customerId ? `${API_SAVE_CUSTOMER_INFO}/${Data.customerId}` : API_SAVE_CUSTOMER_INFO
+    fetch({ url, method: Data.customerId ? 'put' : 'post', payload: params }).then(() => {
       Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
       close()
     }).catch(() => {
     let resData = FormData
     if (key === 'age') {
       resData[key] = AgeRange[e.detail.value]
-    } else if(key === 'householdIncome') {
+    } else if (key === 'householdIncome') {
       resData[key] = IncomeRange[e.detail.value]
-    } else if(key === 'estimatedPurchaseTime') {
+    } else if (key === 'estimatedPurchaseTime') {
       resData[key] = BuyTimeRange[e.detail.value]
     }
     setFormData(resData)
   }
 
   const Submit = () => {
-    if(!CanSubmit) {
+    if (!CanSubmit) {
       setCanSubmit(true)
     }
   }
           <text>姓名</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入姓名' onInput={InputChange.bind(this, 'name')}></Input>
+              <Input placeholder='请输入姓名' value={FormData.name} onInput={InputChange.bind(this, 'name')}></Input>
             </view>
           </view>
 
           <text>昵称</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入昵称' onInput={InputChange.bind(this, 'nickname')}></Input>
+              <Input placeholder='请输入昵称' value={FormData.nickname} onInput={InputChange.bind(this, 'nickname')}></Input>
             </view>
           </view>
 
           <text>手机号码</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入手机号码' onInput={InputChange.bind(this, 'phone')}></Input>
+              <Input placeholder='请输入手机号码' value={FormData.phone} onInput={InputChange.bind(this, 'phone')}></Input>
             </view>
           </view>
 
           <text>家庭住址</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入家庭住址' onInput={InputChange.bind(this, 'homeAddress')}></Input>
+              <Input placeholder='请输入家庭住址' value={FormData.homeAddress} onInput={InputChange.bind(this, 'homeAddress')}></Input>
             </view>
           </view>
 
           <text>工作地址</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入工作地址' onInput={InputChange.bind(this, 'firmAddress')}></Input>
+              <Input placeholder='请输入工作地址' value={FormData.firmAddress} onInput={InputChange.bind(this, 'firmAddress')}></Input>
             </view>
           </view>
 
           <view className='FormLine flex-h'>
             <view className='flex-item'>
               <Picker onChange={PickerChange.bind(this, 'age')} value={null} range={AgeRange}>
-                <text>请选择</text>
+                <text>{FormData.age || '请选择'}</text>
               </Picker>
             </view>
             <text className='iconfont icon-jiantoudown'></text>
           <text>职业</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入职业' onInput={InputChange.bind(this, 'career')}></Input>
+              <Input placeholder='请输入职业' value={FormData.career} onInput={InputChange.bind(this, 'career')}></Input>
             </view>
           </view>
 
           <view className='FormLine flex-h'>
             <view className='flex-item'>
               <Picker onChange={PickerChange.bind(this, 'householdIncome')} value={null} range={IncomeRange}>
-                <text>请选择</text>
+                <text>{FormData.householdIncome || '请选择'}</text>
               </Picker>
             </view>
             <text className='iconfont icon-jiantoudown'></text>
           <text>家庭成员数</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入家庭成员数' onInput={InputChange.bind(this, 'familyNumber')}></Input>
+              <Input placeholder='请输入家庭成员数' value={FormData.familyNumber} onInput={InputChange.bind(this, 'familyNumber')}></Input>
             </view>
           </view>
 
           <text>已有房产数</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入已有房产数' onInput={InputChange.bind(this, 'houseNumber')}></Input>
+              <Input placeholder='请输入已有房产数' value={FormData.houseNumber} onInput={InputChange.bind(this, 'houseNumber')}></Input>
             </view>
           </view>
 
           <text>已有车辆数</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入已有车辆数' onInput={InputChange.bind(this, 'carNumber')}></Input>
+              <Input placeholder='请输入已有车辆数' value={FormData.carNumber} onInput={InputChange.bind(this, 'carNumber')}></Input>
             </view>
           </view>
 
           <view className='FormLine flex-h'>
             <view className='flex-item'>
               <Picker onChange={PickerChange.bind(this, 'estimatedPurchaseTime')} value={null} range={BuyTimeRange}>
-                <text>请选择</text>
+                <text>{FormData.estimatedPurchaseTime || '请选择'}</text>
               </Picker>
             </view>
             <text className='iconfont icon-jiantoudown'></text>
           <text>客户咨询重点</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等' onInput={InputChange.bind(this, 'consultation')}></Input>
+              <Input value={FormData.consultation} placeholder='请填写  如：地段、交通、社区配套、户型、价格等' onInput={InputChange.bind(this, 'consultation')}></Input>
             </view>
           </view>
 
           <text>购房动机</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请填写 如结婚、养老、二孩、改善、学区、投资等' onInput={InputChange.bind(this, 'motivation')}></Input>
+              <Input value={FormData.motivation} placeholder='请填写 如结婚、养老、二孩、改善、学区、投资等' onInput={InputChange.bind(this, 'motivation')}></Input>
             </view>
           </view>
 
           <text>客户抗性分析</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等' onInput={InputChange.bind(this, 'resistanceAnalysis')}></Input>
+              <Input value={FormData.resistanceAnalysis} placeholder='请填写  如：地段、交通、社区配套、户型、价格等' onInput={InputChange.bind(this, 'resistanceAnalysis')}></Input>
             </view>
           </view>
 
           <text>客户对项目认可点</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等' onInput={InputChange.bind(this, 'approval')}></Input>
+              <Input value={FormData.approval} placeholder='请填写  如：地段、交通、社区配套、户型、价格等' onInput={InputChange.bind(this, 'approval')}></Input>
             </view>
           </view>
 
           <text>备注</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='补充说明（选填）' onInput={InputChange.bind(this, 'remark')}></Input>
+              <Input value={FormData.remark} placeholder='补充说明（选填）' onInput={InputChange.bind(this, 'remark')}></Input>
             </view>
           </view>
 

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

 
   return (
     <view className='components StatCustomerListItem flex-h'>
-      <view className='Icon' onClick={() => { Taro.navigateTo({ url: `/pages/mine/customerDetail/index?id=${data.customerId}` }) }}>
+      <view className='Icon' onClick={() => { Taro.navigateTo({ url: `/pages/mine/customerDetail/index?id=${data.customerId}&name=${data.name}&sex=${data.sex}&phone=${data.phone}&avatarurl=${data.avatarurl}&status=${data.status}` }) }}>
         <Image mode='scaleToFill' src={data.avatarurl}></Image>
       </view>
-      <view className='flex-item' onClick={() => { Taro.navigateTo({ url: `/pages/mine/customerDetail/index?id=${data.customerId}` }) }}>
+      <view className='flex-item' onClick={() => { Taro.navigateTo({ url: `/pages/mine/customerDetail/index?id=${data.customerId}&name=${data.name}&sex=${data.sex}&phone=${data.phone}&avatarurl=${data.avatarurl}&status=${data.status}` }) }}>
         <view>
           <text>{data.name}</text>
           <text className={data.sex === 1 ? 'iconfont icon-nanxing' : 'iconfont icon-nvxing'}></text>

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

-import { useState, useEffect } from 'react'
+import { useState } from 'react'
 import { ScrollView } from '@tarojs/components'
 import './index.scss'
 import EditUserDetailBasicInfo from '../EditUserDetailBasicInfo/index'
 
 export default function UserDetailBasicInfo (props) {
-  const { CustomerInfo = {}, AddFollow = () => {} } = props
+  const { CustomerInfo = {}, AddFollow = () => {}, CustomerId = null, Update = () => {} } = props
   const [ShowEditPopup, setShowEditPopup] = useState(false)
-  const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
 
-  const PageRefresh = () => { // 页面下拉刷新回调
-    setPull(true)
+  const Close = () => {
+    Update()
+    setShowEditPopup(false)
   }
 
-  useEffect(() => { // 下拉刷新触发
-    if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
-    }
-  }, [IsPull])
-
   return (
     <view className='components UserDetailBasicInfo'>
-      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y>
         <view className='PageContent'>
 
           <view className='Content'>
               <text>性别</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>{CustomerInfo.sex === 1 ? '男' : '女'}</text>
+                <text>{CustomerInfo.sex - 0 === 1 ? '男' : '女'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>家庭住址</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>{CustomerInfo.address || '-'}</text>
+                <text>{CustomerInfo.homeAddress || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>工作地址</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>{CustomerInfo.company || '-'}</text>
+                <text>{CustomerInfo.firmAddress || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>职业</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>{CustomerInfo.work || '-'}</text>
+                <text>{CustomerInfo.career || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>家庭年收入</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>10万以下</text>
+                <text>{CustomerInfo.householdIncome || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>家庭成员数</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>5人</text>
+                <text>{CustomerInfo.familyNumber || '-'}人</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>已有房产数</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>2</text>
+                <text>{CustomerInfo.houseNumber || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>已有车辆数</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>2</text>
+                <text>{CustomerInfo.carNumber || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>预计购房时间</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>1月以内</text>
+                <text>{CustomerInfo.estimatedPurchaseTime || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>咨询重点</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>江苏省南京市雨花台区</text>
+                <text>{CustomerInfo.consultation || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>购房动机</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>结婚</text>
+                <text>{CustomerInfo.motivation || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>抗性分析</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>交通</text>
+                <text>{CustomerInfo.resistanceAnalysis || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>项目认可点</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>户型</text>
+                <text>{CustomerInfo.approval || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>备注</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>暂无</text>
+                <text>{CustomerInfo.remark || '-'}</text>
               </view>
             </view>
           </view>
         <view className='EditUserInfo'>
           <view>
             <view>
-              <EditUserDetailBasicInfo close={() => {setShowEditPopup(false)}}></EditUserDetailBasicInfo>
+              <EditUserDetailBasicInfo Data={CustomerInfo} CustomerId={CustomerId} close={() => {Close()}}></EditUserDetailBasicInfo>
             </view>
           </view>
         </view>

src/pages/mine/customerDetail/index.jsx

 import UserDetailFollowRecord from '../components/UserDetailFollowRecord/index'
 
 export default withLayout((props) => {
+
+  const { name, sex, phone, avatarurl, status } = props.router.params
   const [CustomerId] = useState(props.router.params.id)
   const [CustomerInfo, setCustomerInfo] = useState({})
   const [ShowAddFollow, setShowAddFollow] = useState(false)
 
   useEffect(() => {
     if (CustomerId) {
-      fetch({ url: `${API_GET_CUSTOMER_INFO}${CustomerId}` }).then((res) => {
-        setCustomerInfo(res)
-      })
+      UpdateCustomerInfo()
     }
   }, [CustomerId])
 
+  const UpdateCustomerInfo = () => {
+    fetch({ url: `${API_GET_CUSTOMER_INFO}${CustomerId}` }).then((res) => {
+      if (res) {
+        setCustomerInfo(res)
+      }
+    })
+  }
+
   const CutMenu = (item) => {
     return () => {
       setCurrentMenuId(item.id)
             <view className='centerLabel'>
               <view className='flex-h'>
                 <view className='Icon'>
-                  <Image mode='aspectFill' src={getImgURL(CustomerInfo.avatarurl)}></Image>
+                  <Image mode='aspectFill' src={getImgURL(CustomerInfo.avatarurl || avatarurl)}></Image>
                 </view>
                 <view className='flex-item'>
                   <view>
-                    <text>{CustomerInfo.name}</text>
-                    <text className={CustomerInfo.sex === 1 ? 'iconfont icon-nanxing' : 'iconfont icon-nvxing'}></text>
+                    <text>{CustomerInfo.name || name}</text>
+                    <text className={CustomerInfo.sex - 0 === 1 || sex - 0 === 1 ? 'iconfont icon-nanxing' : 'iconfont icon-nvxing'}></text>
                   </view>
-                  <text>{CustomerInfo.phone}</text>
+                  <text>{CustomerInfo.phone || phone}</text>
                 </view>
                 <text className='iconfont icon-liaotian'></text>
-                <text className='iconfont icon-dianhua' onClick={() => { Taro.makePhoneCall({ phoneNumber: CustomerInfo.phone }) }}></text>
+                <text className='iconfont icon-dianhua' onClick={() => { Taro.makePhoneCall({ phoneNumber: CustomerInfo.phone || phone }) }}></text>
               </view>
             </view>
-            <text className='Status'>{CustomerInfo.status === 1 || CustomerInfo.status === 0 ? '已报备' : CustomerInfo.status === 2 ? '已到访' : CustomerInfo.status === 3 ? '已认筹' : '已签约'}</text>
+            <text className='Status'>{status - 0 === 1 || status - 0 === 0 ? '已报备' : status - 0 === 2 ? '已到访' : status - 0 === 3 ? '已认筹' : '已签约'}</text>
             <text className='Tips'>NEW</text>
             <text className='Tips'>NEW</text>
           </view>
           {/* 基本信息 */}
           {
             CurrentMenuId === 1 &&
-            <UserDetailBasicInfo CustomerId={CustomerId} CustomerInfo={CustomerInfo} AddFollow={AddFollow}></UserDetailBasicInfo>
+            <UserDetailBasicInfo CustomerId={CustomerId} CustomerInfo={CustomerInfo} AddFollow={AddFollow} Update={UpdateCustomerInfo}></UserDetailBasicInfo>
           }
 
           {/* 访问记录 */}

src/pages/mine/index.jsx

   const user = useSelector(state => state.user)
   const [UserRole, setUserRole] = useState(null) // 1-普通用户 2-经纪人 3-置业顾问 4-驻场管理
   const [MenuList, setMenuList] = useState([])
-  const [IsPull, setPull] = useState(false)
   const [ShowLogin, setShowLogin] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
   const { dispatch } = store
 
   useEffect(() => {
     }
   }, [UserRole])
 
-  const PageRefresh = () => { // 页面下拉刷新回调
-    setPull(true)
-  }
-
-  useEffect(() => { // 下拉刷新触发
-    if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
-    }
-  }, [IsPull])
-
   const MenuClick = (router) => {
     return () => {
       if (router === 'propertyConsultant') {
   return (
     <view className='Page Mine'>
 
-      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y>
         <view className='PageContent'>
 
           {/* 需要登录 */}

src/pages/video/index.jsx

 import { useState, useEffect } from 'react'
-import { ScrollView } from '@tarojs/components'
+import { ScrollView, Input } from '@tarojs/components'
 import withLayout from '@/layout'
-import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
+import '@/assets/css/iconfont.css'
 import { API_LIVE_LIST, API_VIDEO_LIST } from '@/constants/api'
 import './index.scss'
-import '@/assets/css/iconfont.css'
 import VideoListItem from './components/VideoListItem/index'
 
 export default withLayout((props) => {
   const { city } = props
 
-  const [IsPull, setPull] = useState(false)
   const [CurrnetMenuId, setCurrnetMenuId] = useState('all')
   const [MenuList] = useState([
     { name: '全部', id: 'all' },
     { name: '新房推荐', id: 'new' },
     { name: '视频', id: 'video' }
   ])
-  const [PullTimer, setPullTimer] = useState(null)
   // 全部或者新房的列表
   const [activityList, setActivityList] = useState([])
   // 预告与直播的列表
     }
   }
 
-  const PageRefresh = () => { // 页面下拉刷新回调
-    setPull(true)
-  }
-
-  useEffect(() => { // 下拉刷新触发
-    if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
-    }
-  }, [IsPull])
-
   const CutMenu = (id) => {
     return () => {
       if (id !== CurrnetMenuId) {
       <view className='Search'>
         <view>
           <text className='iconfont icon-sousuo'></text>
-          <text>输入项目名称或直播标题</text>
+          <Input placeholder='请输入直播标题'></Input>
         </view>
       </view>
 
 
       <view className='flex-item'>
         <view>
-          <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#f8f8f8'>
+          <ScrollView scroll-y>
             <view className='PageContent'>
               {
                 /* 全部 与 新房 */

src/pages/video/index.scss

           margin-right: 10px;
         }
       }
+      >input {
+        display: inline-block;
+        vertical-align: middle;
+        width: 150px;
+        font-size: 20px;
+        margin-left: 10px;
+        height: 78px;
+        text-align: left;
+      }
     }
   }
   > .Menu {