fix

src/components/ProjectListItem/index.jsx

@@ -4,8 +4,11 @@ import { Image } from "@tarojs/components";
 import { getImgURL } from "@/utils/image";
 import BrokerShare from "@/components/brokerShare";
 import "./index.scss";
+import { useSelector } from "react-redux";
+import { ROLE_CODE } from "@/constants/user";
 
 export default function ProjectListItem(props) {
+  const person = useSelector(({user}) => user.userInfo?.person);
   const { Data = {}, ShowImgIcon = true } = props;
   const { uvList = [] } = Data;
 
@@ -31,13 +34,13 @@ export default function ProjectListItem(props) {
   };
 
   return (
-    <view className='components ProjectListItem' onClick={LinkTo}>
-      <view className='ProjectListItem-top flex-h'>
-        <view className='Img'>
+    <view className="components ProjectListItem" onClick={LinkTo}>
+      <view className="ProjectListItem-top flex-h">
+        <view className="Img">
           <view>
             <Image
-              mode='aspectFill'
-              className='centerLabel'
+              mode="aspectFill"
+              className="centerLabel"
               src={getImgURL(
                 (Data?.buildingListImg || []).length
                   ? Data.buildingListImg[0].url
@@ -46,43 +49,43 @@ export default function ProjectListItem(props) {
             />
             {(Data?.panoramaList || []).length > 0 && ShowImgIcon && (
               <Image
-                mode='heightFix'
-                className='Tips Vr'
+                mode="heightFix"
+                className="Tips Vr"
                 src={require("@/assets/index-icon18.png")}
               />
             )}
             {Data.videoUrl !== null && ShowImgIcon && (
               <Image
-                mode='heightFix'
-                className='Tips Video'
+                mode="heightFix"
+                className="Tips Video"
                 src={require("@/assets/index-icon19.png")}
               />
             )}
           </view>
         </view>
-        <view className='flex-item'>
-          <view className='Name flex-h'>
-            <view className='flex-item'>
+        <view className="flex-item">
+          <view className="Name flex-h">
+            <view className="flex-item">
               <text>{Data.buildingName}</text>
             </view>
             <text></text>
           </view>
-          <text className='Price'>{Data.price}</text>
-          <text className='Address'>{Data.address}</text>
-          <view className='Tags'>
+          <text className="Price">{Data.price}</text>
+          <text className="Address">{Data.address}</text>
+          <view className="Tags">
             {(Data.buildingTag || []).map((item, index) => (
               <text key={`Tags-${index}`}>{item.tagName}</text>
             ))}
           </view>
-          <view className='ShareInfo'>
-            <text className='iconfont icon-fenxiang'></text>
+          <view className="ShareInfo">
+            <text className="iconfont icon-fenxiang"></text>
             <text>{299 + (Data.shareNum || 0)}次分享</text>
-            <view className='Users'>
+            <view className="Users">
               {(uvList?.records || []).slice(0, 3).map((item, index) => (
                 <view key={`uv-${index}`}>
                   <Image
-                    mode='aspectFill'
-                    className='centerLabel'
+                    mode="aspectFill"
+                    className="centerLabel"
                     src={item.photoOravatar}
                   />
                 </view>
@@ -95,8 +98,9 @@ export default function ProjectListItem(props) {
           </view>
         </view>
       </view>
-      {Data?.isBroker&&<BrokerShare buildingId={Data.buildingId}></BrokerShare>}
-      
+      {Data?.isBroker && person?.personType === ROLE_CODE.BROKER && (
+        <BrokerShare buildingId={Data.buildingId}></BrokerShare>
+      )}
     </view>
   );
 }

src/constants/user.js

@@ -27,4 +27,5 @@ export const BIZ_STATUS = {
   '3': '认筹',
   '4': '签约',
   '5': '结佣',
+  '6': '全款到账',
 }

src/pages/index/buildingDetail/components/BasicInfo/index.jsx

@@ -15,7 +15,7 @@ import './index.scss'
 
 
 export default function BasicInfo (props) {
-  const { Info = {}, trackData } = props
+  const { Info = {}, trackData,person } = props
   const { buildingId, isSave } = Info
 
   const [isSaved, handleFavor] = useFavor(isSave, { id: buildingId, buildingId, ...trackData })
@@ -52,7 +52,7 @@ export default function BasicInfo (props) {
         }
       </view>
 
-      {Info?.isBroker&&<BrokerShare buildingId={buildingId}></BrokerShare>}
+      {Info?.isBroker&&person.personType===ROLE_CODE.BROKER&&<BrokerShare buildingId={buildingId}></BrokerShare>}
 
       {/* 项目列表 */}
       {

src/pages/index/buildingDetail/index.jsx

@@ -107,7 +107,7 @@ export default withLayout((props) => {
 
                 {/* 基本信息 */}
                 <view className='BasicInfo'>
-                  <BasicInfo Info={DetailInfo} trackData={fullTrackData}></BasicInfo>
+                  <BasicInfo Info={DetailInfo} trackData={fullTrackData}  person={person}></BasicInfo>
                 </view>
 
                 {/* 特价房源 */}

src/subpackages/pages/marketing/changeVisit/index.jsx

@@ -1,56 +1,61 @@
-import { useState, useEffect } from 'react'
-import withLayout from '@/layout'
-import { ScrollView, Input, Image, Block, Picker } from '@tarojs/components'
-import '@/assets/css/iconfont.css'
-import { getCardList, getAgents } from '@/services/card'
-import { fetch } from '@/utils/request'
-import Taro from '@tarojs/taro'
+import { useState, useEffect } from "react";
+import withLayout from "@/layout";
+import { ScrollView, Input, Image, Block, Picker } from "@tarojs/components";
+import "@/assets/css/iconfont.css";
+import { getCardList, getAgents } from "@/services/card";
+import { fetch } from "@/utils/request";
+import Taro from "@tarojs/taro";
 import { formatDate } from "@/utils/chatDate";
-import { API_SURE_CHIP, API_BUILDING_HOUSE_TYPE, API_SURE_SIGN, API_SURE_BUY, API_CUSTOMER_DETAILINFO } from '@/constants/api'
-import './index.scss'
+import {
+  API_SURE_CHIP,
+  API_BUILDING_HOUSE_TYPE,
+  API_SURE_SIGN,
+  API_SURE_BUY,
+  API_CUSTOMER_DETAILINFO,
+} from "@/constants/api";
+import "./index.scss";
+import { ROLE_CODE } from "@/constants/user";
 
 export default withLayout((props) => {
-
-  const { router } = props
-  const { name, buildingId, type, id, channelId } = router.params
-
-
+  const { router, person } = props;
+  const { name, buildingId, type, id, channelId } = router.params;
+  console.log(person, "===");
   const [RenChouData, setRenChouData] = useState({
     name,
-    realtyConsultant: '',
-    remark: '',
-  })
-
+    realtyConsultant: "",
+    remark: "",
+  });
 
   const [QianYueData, setQianYueData] = useState({
     name,
-    realtyConsultant: '',
-    remark: '',
-    dividendsName: '',
-    dividendsPer: '',
-    houseInfo: '',
-    houseType: '',
-    price: '',
-    successDate: '',
-  })
-
-  const [FormData, setFormData] = useState({ ...RenChouData })
-
-  const [ConsultantList, setConsultantList] = useState([])
-  const [HouseTypeList, setHouseTypeList] = useState([])
-  const [CurrnetConsultant, setCurrnetConsultant] = useState({})
-
-  const [SuccessDate, setSuccessDate] = useState(null)
-  const [channelCustomerId, setChannelCustomerId] = useState(null)
-
+    realtyConsultant: "",
+    remark: "",
+    dividendsName: "",
+    dividendsPer: "",
+    houseInfo: "",
+    houseType: "",
+    price: "",
+    successDate: "",
+  });
+
+  const [FormData, setFormData] = useState({ ...RenChouData });
+
+  const [ConsultantList, setConsultantList] = useState([]);
+  const [HouseTypeList, setHouseTypeList] = useState([]);
+  const [CurrnetConsultant, setCurrnetConsultant] = useState({});
+
+  const [SuccessDate, setSuccessDate] = useState(null);
+  const [channelCustomerId, setChannelCustomerId] = useState(null);
+  const [channelCustomerInfo, setChannelCustomerIdInfo] = useState({});
   const [StatusList] = useState([
-    { name: '认筹', id: 3 },
-    { name: '签约', id: 4 },
-    { name: '结佣', id: 5 },
-  ])
-  const [CurrentStatusId, setCurrentStatusId] = useState(3)
+    { name: "认筹", id: 3 },
+    { name: "签约", id: 4 },
+    { name: "全款到账", id: 6 },
+    { name: "结佣", id: 5 },
+  ]);
+  const [CurrentStatusId, setCurrentStatusId] = useState(3);
 
-  const [CurrentRoomTypeId, setCurrentRoomTypeId] = useState(null)
+  const [CurrentRoomTypeId, setCurrentRoomTypeId] = useState(null);
 
   useEffect(() => {
     if (buildingId) {
@@ -58,325 +63,505 @@ export default withLayout((props) => {
         pageNumber: 1,
         pageSize: 50,
         buildingId,
-      }
+      };
       getCardList(params).then((res) => {
-        const { records } = res
-        setConsultantList(records || [])
-      })
+        const { records } = res;
+        setConsultantList(records || []);
+      });
     }
-  }, [buildingId])
-
-
+  }, [buildingId]);
 
   const [agentsInfo, setAgentsInfo] = useState({
-    name: '',
-    channelName: ' ',
-  })
-
+    name: "",
+    channelName: " ",
+  });
 
   useEffect(() => {
-    fetch({ url: `${API_CUSTOMER_DETAILINFO}/${id}`, method: 'get' }).then((res) => {
-      //获取经纪人信息
-      setAgentsInfo({ name: res.name })
-      getAgents({ personId: res?.recommendPerson }).then((e) => {
-        let ganentsList = e.records
-        if ((ganentsList || []).length) {
-          // ganentsList
-          setAgentsInfo({ name: res.name, channelName: ganentsList[0].channelName })
+    fetch({ url: `${API_CUSTOMER_DETAILINFO}/${id}`, method: "get" }).then(
+      (res) => {
+        //获取经纪人信息
+        setChannelCustomerIdInfo(res);
+        setAgentsInfo({ name: res.name });
+        getAgents({ personId: res?.recommendPerson }).then((e) => {
+          let ganentsList = e.records;
+          if ((ganentsList || []).length) {
+            // ganentsList
+            setAgentsInfo({
+              name: res.name,
+              channelName: ganentsList[0].channelName,
+            });
+          }
+        });
+
+        if (CurrentStatusId - 0 === 3) {
+          setFormData({
+            ...FormData,
+            ...res?.customerPreparatory,
+            realtyConsultant: res?.realtyConsultant,
+          });
+        } else {
+          setFormData({
+            ...FormData,
+            ...res?.customerPreparatory,
+            realtyConsultant: res?.realtyConsultant,
+          });
         }
-      })
-
-      if (CurrentStatusId - 0 === 3) {
-        setFormData({ ...FormData, ...res?.customerPreparatory, realtyConsultant: res?.realtyConsultant })
-      } else {
-        setFormData({ ...FormData, ...res?.customerPreparatory, realtyConsultant: res?.realtyConsultant })
 
-      }
-
-      setChannelCustomerId(res?.channelCustomer?.channelCustomerId)
-      setRenChouData({ ...RenChouData, ...res?.customerPreparatory, realtyConsultant: res?.realtyConsultant })
-      if ((res.customerSignatory || []).length) {
-        let customerSignatory = res.customerSignatory[0]
-        customerSignatory.dividendsPer = customerSignatory.dividendsName.substring(customerSignatory.dividendsName.indexOf('|') + 1, customerSignatory.dividendsName.indexOf('%'))
-        customerSignatory.dividendsName = customerSignatory.dividendsName.substring(0, customerSignatory.dividendsName.indexOf('|'))
-        setQianYueData({ ...QianYueData, ...customerSignatory, realtyConsultant: res?.realtyConsultant })
-        // setQianYueData({ ...QianYueData, ...customerSignatory, realtyConsultant:   (res.customerSignatory || []).length ? res.customerSignatory[0].realtyConsultant : null })
-
-        HouseTypeList.map((item) => {
-          if (item.apartmentId === res.customerSignatory[0].houseType) {
-            setCurrentRoomTypeId(item.apartmentId)
+        setChannelCustomerId(res?.channelCustomer?.channelCustomerId);
+        setRenChouData({
+          ...RenChouData,
+          ...res?.customerPreparatory,
+          realtyConsultant: res?.realtyConsultant,
+        });
+        if ((res.customerSignatory || []).length) {
+          let customerSignatory = res.customerSignatory[0];
+          customerSignatory.dividendsPer =
+            customerSignatory.dividendsName.substring(
+              customerSignatory.dividendsName.indexOf("|") + 1,
+              customerSignatory.dividendsName.indexOf("%")
+            );
+          customerSignatory.dividendsName =
+            customerSignatory.dividendsName.substring(
+              0,
+              customerSignatory.dividendsName.indexOf("|")
+            );
+          setQianYueData({
+            ...QianYueData,
+            ...customerSignatory,
+            realtyConsultant: res?.realtyConsultant,
+          });
+          // setQianYueData({ ...QianYueData, ...customerSignatory, realtyConsultant:   (res.customerSignatory || []).length ? res.customerSignatory[0].realtyConsultant : null })
+
+          HouseTypeList.map((item) => {
+            if (item.apartmentId === res.customerSignatory[0].houseType) {
+              setCurrentRoomTypeId(item.apartmentId);
+            }
+          });
+          setSuccessDate(
+            res.customerSignatory[0].successDate?.substring(0, 10)
+          );
+        }
+        // const ConsultantId = CurrentStatusId === 3 ? res.customerPreparatory?.realtyConsultant : (res.customerSignatory || []).length ? res.customerSignatory[0].realtyConsultant : null
+        const ConsultantId =
+          CurrentStatusId === 3
+            ? res?.realtyConsultant
+            : (res.customerSignatory || []).length
+            ? res.customerSignatory[0].realtyConsultant
+            : null;
+        // setRenChouData({ realtyConsultant: res?.realtyConsultant })
+        console.log(`ConsultantId is`, ConsultantId, id);
+
+        return ConsultantList.map((item) => {
+          if (item.id === ConsultantId || `${item.userId}` === ConsultantId) {
+            setCurrnetConsultant(item);
           }
-        })
-        setSuccessDate(res.customerSignatory[0].successDate?.substring(0, 10))
+        });
       }
-      // const ConsultantId = CurrentStatusId === 3 ? res.customerPreparatory?.realtyConsultant : (res.customerSignatory || []).length ? res.customerSignatory[0].realtyConsultant : null
-      const ConsultantId = CurrentStatusId === 3 ? res?.realtyConsultant : (res.customerSignatory || []).length ? res.customerSignatory[0].realtyConsultant : null
-      // setRenChouData({ realtyConsultant: res?.realtyConsultant })
-      console.log(`ConsultantId is`, ConsultantId, id)
-
-
-      return ConsultantList.map((item) => {
-        if (item.id === ConsultantId || `${item.userId}` === ConsultantId) {
-          setCurrnetConsultant(item)
-        }
-      })
-    })
-  }, [ConsultantList, HouseTypeList, CurrentStatusId,])
+    );
+  }, [ConsultantList, HouseTypeList, CurrentStatusId]);
 
   useEffect(() => {
     if (CurrentStatusId - 0 !== 3 && buildingId) {
-      fetch({ url: `${API_BUILDING_HOUSE_TYPE}?buildingId=${buildingId}&pageSize=${500}`, method: 'get' }).then((res) => {
-        setHouseTypeList(res.records || [])
-      })
+      fetch({
+        url: `${API_BUILDING_HOUSE_TYPE}?buildingId=${buildingId}&pageSize=${500}`,
+        method: "get",
+      }).then((res) => {
+        setHouseTypeList(res.records || []);
+      });
     }
-  }, [CurrentStatusId, buildingId])
+  }, [CurrentStatusId, buildingId]);
 
   useEffect(() => {
-    console.log('FormData', FormData)
-  }, [FormData])
+    console.log("FormData", FormData);
+  }, [FormData]);
 
   const CutStatus = (item) => {
     return () => {
-      setCurrentStatusId(item.id)
+      setCurrentStatusId(item.id);
       if (item.id - 0 === 3) {
-        setFormData({ ...RenChouData })
-
+        setFormData({ ...RenChouData });
       } else if (item.id - 0 === 4) {
-        setFormData({ ...QianYueData })
-
+        setFormData({ ...QianYueData });
       } else if (item.id - 0 === 5) {
-        setFormData({ ...QianYueData })
+        setFormData({ ...QianYueData });
       }
-    }
-  }
+    };
+  };
 
   const CutRoomType = (item) => {
     return () => {
-      let resData = { ...FormData }
-      resData.houseType = item.apartmentId
-      setFormData({ ...resData })
-      setCurrentRoomTypeId(item.apartmentId)
-    }
-  }
+      let resData = { ...FormData };
+      resData.houseType = item.apartmentId;
+      setFormData({ ...resData });
+      setCurrentRoomTypeId(item.apartmentId);
+    };
+  };
 
   const InputChange = (key, e) => {
-    let resData = { ...FormData }
-    resData[key] = e.detail.value
-    setFormData({ ...resData })
-  }
+    let resData = { ...FormData };
+    resData[key] = e.detail.value;
+    setFormData({ ...resData });
+  };
 
   const PickerChange = (key, e) => {
-    let resData = { ...FormData }
-    if (key === 'realtyConsultant') {
-      resData[key] = ConsultantList[e.detail.value].id
-      resData.realtyConsultantName = ConsultantList[e.detail.value].name
-      setCurrnetConsultant(ConsultantList[e.detail.value])
+    let resData = { ...FormData };
+    if (key === "realtyConsultant") {
+      resData[key] = ConsultantList[e.detail.value].id;
+      resData.realtyConsultantName = ConsultantList[e.detail.value].name;
+      setCurrnetConsultant(ConsultantList[e.detail.value]);
     }
-    setFormData({ ...resData })
-  }
+    setFormData({ ...resData });
+  };
 
   const CheckForm = () => {
-    if (CurrentStatusId === 3) { // 认筹
-      if (FormData.name === '') {
-        Taro.showToast({ title: '姓名不能为空', icon: 'none', duration: 2000 })
-        return false
+    if (CurrentStatusId === 3) {
+      // 认筹
+      if (FormData.name === "") {
+        Taro.showToast({ title: "姓名不能为空", icon: "none", duration: 2000 });
+        return false;
       }
       // if (FormData.realtyConsultant === '') {
       //   Taro.showToast({ title: '请选择内场接待', icon: 'none', duration: 2000 })
       //   return false
       // }
-    } else if (CurrentStatusId === 4) { // 签约
-
+    } else if (CurrentStatusId === 4) {
+      // 签约
     }
-    return true
-  }
+    return true;
+  };
 
   const ToSubmit = () => {
     if (CurrentStatusId === 3) {
-      fetch({ url: API_SURE_CHIP, method: 'put', payload: { customerId: id, customerPreparatory: { ...FormData, channelId: channelId === 'null' || channelId === null ? '' : channelId, channelCustomerId, } } }).then(() => {
-        Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
+      fetch({
+        url: API_SURE_CHIP,
+        method: "put",
+        payload: {
+          customerId: id,
+          customerPreparatory: {
+            ...FormData,
+            channelId:
+              channelId === "null" || channelId === null ? "" : channelId,
+            channelCustomerId,
+          },
+        },
+      }).then(() => {
+        Taro.showToast({ title: "修改成功", icon: "none", duration: 2000 });
         setTimeout(() => {
-          Taro.navigateBack({ delta: 1 })
-        }, 2000)
-      })
+          Taro.navigateBack({ delta: 1 });
+        }, 2000);
+      });
     } else if (CurrentStatusId === 4) {
-      let params = {}
+      let params = {};
       for (let key in FormData) {
-        if (key !== 'dividendsName' && key !== 'dividendsPer') {
-          params[key] = { ...FormData }[key]
-          console.log("🚀 ~ file: index.jsx ~ line 202 ~ ToSubmit ~ FormData", FormData)
+        if (key !== "dividendsName" && key !== "dividendsPer") {
+          params[key] = { ...FormData }[key];
+          console.log(
+            "🚀 ~ file: index.jsx ~ line 202 ~ ToSubmit ~ FormData",
+            FormData
+          );
         }
       }
-      params.dividendsName = `${FormData.dividendsName}|${FormData.dividendsPer}%`
-      fetch({ url: API_SURE_SIGN, method: 'put', payload: { customerId: id, customerSignatory: { ...params, channelId: channelId === 'null' || channelId === null ? '' : channelId, channelCustomerId, } } }).then(() => {
-        Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
+      params.dividendsName = `${FormData.dividendsName}|${FormData.dividendsPer}%`;
+      fetch({
+        url: API_SURE_SIGN,
+        method: "put",
+        payload: {
+          customerId: id,
+          customerSignatory: {
+            ...params,
+            channelId:
+              channelId === "null" || channelId === null ? "" : channelId,
+            channelCustomerId,
+          },
+        },
+      }).then(() => {
+        Taro.showToast({ title: "修改成功", icon: "none", duration: 2000 });
         setTimeout(() => {
-          Taro.navigateBack({ delta: 1 })
-        }, 2000)
-      })
+          Taro.navigateBack({ delta: 1 });
+        }, 2000);
+      });
     } else if (CurrentStatusId === 5) {
-      let params = {}
+      let params = {};
       for (let key in FormData) {
-        if (key !== 'dividendsName' && key !== 'dividendsPer') {
-          params[key] = { ...FormData }[key]
+        if (key !== "dividendsName" && key !== "dividendsPer") {
+          params[key] = { ...FormData }[key];
         }
       }
-      params.dividendsName = `${FormData.dividendsName}|${FormData.dividendsPer}%`
-      fetch({ url: API_SURE_BUY, method: 'put', payload: { customerId: id, customerSignatory: { ...params, channelId: channelId === 'null' || channelId === null ? '' : channelId, channelCustomerId, } } }).then(() => {
-        Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
+      params.dividendsName = `${FormData.dividendsName}|${FormData.dividendsPer}%`;
+      fetch({
+        url: API_SURE_BUY,
+        method: "put",
+        payload: {
+          customerId: id,
+          customerSignatory: {
+            ...params,
+            channelId:
+              channelId === "null" || channelId === null ? "" : channelId,
+            channelCustomerId,
+          },
+        },
+      }).then(() => {
+        Taro.showToast({ title: "修改成功", icon: "none", duration: 2000 });
         setTimeout(() => {
-          Taro.navigateBack({ delta: 1 })
-        }, 2000)
-      })
+          Taro.navigateBack({ delta: 1 });
+        }, 2000);
+      });
     }
-  }
+  };
 
   const SuccessDateChange = (e) => {
-    let resData = { ...FormData }
-    resData.successDate = new Date(e.detail.value)
-    setFormData(resData)
-    setSuccessDate(e.detail.value)
-  }
-
+    let resData = { ...FormData };
+    resData.successDate = new Date(e.detail.value);
+    setFormData(resData);
+    setSuccessDate(e.detail.value);
+  };
 
   return (
-    <view className='Page changeVisit'>
-
+    <view className="Page changeVisit">
       <ScrollView scroll-y>
-        <view className='PageContent'>
-
-          <text className='required'>变更状态</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <view className='CheckBoxList'>
-                {
-                  StatusList.map((item, index) => (
-                    <view key={`StatusItem-${index}`} onClick={CutStatus(item)} style={{ marginRight: index === 2 ? '0px' : '44rpx' }}>
-                      <text>{item.name}</text>
-                      {
-                        CurrentStatusId === item.id &&
-                        <Image mode='widthFix' src={require('@/assets/findHouse-icon1.png')}></Image>
-                      }
-                    </view>
-                  ))
-                }
+        <view className="PageContent">
+          <text className="required">变更状态</text>
+          <view className="FormLine flex-h">
+            <view className="flex-item">
+              <view className="CheckBoxList">
+                {StatusList.map((item, index) => (
+                  <view
+                    key={`StatusItem-${index}`}
+                    onClick={CutStatus(item)}
+                    style={{ marginRight: index === 2 ? "0px" : "44rpx" }}
+                  >
+                    <text>{item.name}</text>
+                    {CurrentStatusId === item.id && (
+                      <Image
+                        mode="widthFix"
+                        src={require("@/assets/findHouse-icon1.png")}
+                      ></Image>
+                    )}
+                  </view>
+                ))}
               </view>
             </view>
           </view>
 
-          <text className='required'>客户姓名</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入姓名' disabled={CurrentStatusId === 5} value={agentsInfo.name} onInput={InputChange.bind(this, 'name')}></Input>
+          <text className="required">客户姓名</text>
+          <view className="FormLine flex-h">
+            <view className="flex-item">
+              <Input
+                placeholder="请输入姓名"
+                disabled={CurrentStatusId === 5}
+                value={agentsInfo.name}
+                onInput={InputChange.bind(this, "name")}
+              ></Input>
             </view>
           </view>
 
-
-          <text>归属渠道</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入渠道' disabled value={agentsInfo.channelName}></Input>
-            </view>
-          </view>
+          {/* {channelCustomer.recommendPersonType === ROLE_CODE.BROKER ? (
+            <>
+              <text>报备经纪人</text>
+              <view className="FormLine flex-h">
+                <view className="flex-item">
+                  <text>{channelCustomer.recommendPersonName}</text>
+               
+                </view>
+              </view>
+            </>
+          ) : (
+            <>
+              <text>归属渠道</text>
+              <view className="FormLine flex-h">
+                <view className="flex-item">
+                  <text>{channelCustomer.channelName}</text>
+                
+                </view>
+              </view>
+            </>
+          )} */}
+
+          {channelCustomerInfo?.channelCustomer?.recommendPersonType ===
+          ROLE_CODE.BROKER ? (
+            <>
+              <text>报备经纪人</text>
+              <view className="FormLine flex-h">
+                <view className="flex-item">
+                  <Input
+                    placeholder="请输入经纪人"
+                    disabled
+                    value={
+                      channelCustomerInfo.channelCustomer?.recommendPersonName
+                    }
+                  ></Input>
+                </view>
+              </view>
+            </>
+          ) : (
+            <>
+              <text>归属渠道</text>
+              <view className="FormLine flex-h">
+                <view className="flex-item">
+                  <Input
+                    placeholder="请输入渠道"
+                    disabled
+                    value={agentsInfo.channelName}
+                  ></Input>
+                </view>
+              </view>
+            </>
+          )}
 
           <text>内场接待</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Picker range-key='name' range={ConsultantList} value={0} onChange={PickerChange.bind(this, 'realtyConsultant')}>{CurrnetConsultant.name || '请选择'}</Picker>
+          <view className="FormLine flex-h">
+            <view className="flex-item">
+              <Picker
+                range-key="name"
+                range={ConsultantList}
+                value={0}
+                onChange={PickerChange.bind(this, "realtyConsultant")}
+              >
+                {CurrnetConsultant.name || "请选择"}
+              </Picker>
             </view>
           </view>
 
-          {
-            (CurrentStatusId === 4 || CurrentStatusId === 5) &&
+          {(CurrentStatusId === 4 ||
+            CurrentStatusId === 5 ||
+            CurrentStatusId === 6) && (
             <Block>
               <text>业绩分成人|占比/%</text>
-              <view className='FormLine flex-h'>
-                <view className='flex-item'>
-                  <Input placeholder='请输入业绩分成人' value={FormData.dividendsName} onInput={InputChange.bind(this, 'dividendsName')}></Input>
+              <view className="FormLine flex-h">
+                <view className="flex-item">
+                  <Input
+                    placeholder="请输入业绩分成人"
+                    value={FormData.dividendsName}
+                    onInput={InputChange.bind(this, "dividendsName")}
+                  ></Input>
                 </view>
-                <view className='flex-item'>
-                  <Input placeholder='请输入占比%' value={FormData.dividendsPer} type='number' onInput={InputChange.bind(this, 'dividendsPer')}></Input>
+                <view className="flex-item">
+                  <Input
+                    placeholder="请输入占比%"
+                    value={FormData.dividendsPer}
+                    type="number"
+                    onInput={InputChange.bind(this, "dividendsPer")}
+                  ></Input>
                 </view>
               </view>
             </Block>
-          }
+          )}
 
-          {
-            (CurrentStatusId === 4 || CurrentStatusId === 5) &&
+          {(CurrentStatusId === 4 ||
+            CurrentStatusId === 5 ||
+            CurrentStatusId === 6) && (
             <Block>
               <text>户型</text>
-              <view className='FormLine flex-h'>
-                <view className='flex-item'>
-                  <view className='CheckBoxList'>
-                    {
-                      HouseTypeList.map((item, index) => (
-                        <view key={`RoomTypeItem-${index}`} onClick={CutRoomType(item)}>
-                          <text>{item.apartmentName}</text>
-                          {
-                            CurrentRoomTypeId === item.apartmentId &&
-                            <Image mode='widthFix' src={require('@/assets/findHouse-icon1.png')}></Image>
-                          }
-                        </view>
-                      ))
-                    }
+              <view className="FormLine flex-h">
+                <view className="flex-item">
+                  <view className="CheckBoxList">
+                    {HouseTypeList.map((item, index) => (
+                      <view
+                        key={`RoomTypeItem-${index}`}
+                        onClick={CutRoomType(item)}
+                      >
+                        <text>{item.apartmentName}</text>
+                        {CurrentRoomTypeId === item.apartmentId && (
+                          <Image
+                            mode="widthFix"
+                            src={require("@/assets/findHouse-icon1.png")}
+                          ></Image>
+                        )}
+                      </view>
+                    ))}
                   </view>
                 </view>
               </view>
             </Block>
-          }
+          )}
 
-          {
-            (CurrentStatusId === 4 || CurrentStatusId === 5) &&
+          {(CurrentStatusId === 4 ||
+            CurrentStatusId === 5 ||
+            CurrentStatusId === 6) && (
             <Block>
               <text>房号</text>
-              <view className='FormLine flex-h'>
-                <view className='flex-item'>
-                  <Input placeholder='请输入房号' value={FormData.houseInfo} onInput={InputChange.bind(this, 'houseInfo')}></Input>
+              <view className="FormLine flex-h">
+                <view className="flex-item">
+                  <Input
+                    placeholder="请输入房号"
+                    value={FormData.houseInfo}
+                    onInput={InputChange.bind(this, "houseInfo")}
+                  ></Input>
                 </view>
               </view>
             </Block>
-          }
+          )}
 
-          {
-            (CurrentStatusId === 4 || CurrentStatusId === 5) &&
+          {(CurrentStatusId === 4 ||
+            CurrentStatusId === 5 ||
+            CurrentStatusId === 6) && (
             <Block>
               <text>签约日期</text>
-              <view className='FormLine flex-h'>
-                <view className='flex-item'>
-                  <Picker mode='date' value={FormData.successDate} onChange={SuccessDateChange}>{SuccessDate || '请选择开始日期'}</Picker>
+              <view className="FormLine flex-h">
+                <view className="flex-item">
+                  <Picker
+                    mode="date"
+                    value={FormData.successDate}
+                    onChange={SuccessDateChange}
+                  >
+                    {SuccessDate || "请选择开始日期"}
+                  </Picker>
                 </view>
-                <text className='iconfont icon-jiantoudown'></text>
+                <text className="iconfont icon-jiantoudown"></text>
               </view>
             </Block>
-          }
+          )}
 
-          {
-            (CurrentStatusId === 4 || CurrentStatusId === 5) &&
+          {(CurrentStatusId === 4 ||
+            CurrentStatusId === 5 ||
+            CurrentStatusId === 6) && (
             <Block>
               <text>成交金额</text>
-              <view className='FormLine flex-h'>
-                <view className='flex-item'>
-                  <Input placeholder='请输入金额' value={FormData.price} onInput={InputChange.bind(this, 'price')}></Input>
+              <view className="FormLine flex-h">
+                <view className="flex-item">
+                  <Input
+                    placeholder="请输入金额"
+                    value={FormData.price}
+                    onInput={InputChange.bind(this, "price")}
+                  ></Input>
                 </view>
               </view>
             </Block>
-          }
+          )}
 
+{/* {(CurrentStatusId === 4 ||
+            CurrentStatusId === 5 ||
+            CurrentStatusId === 6) && (
+            <Block>
+              <text>佣金总额</text>
+              <view className="FormLine flex-h">
+                <view className="flex-item">
+                  <Input
+                    placeholder="请输入金额"
+                    value={FormData.price}
+                    onInput={InputChange.bind(this, "price")}
+                  ></Input>
+                </view>
+              </view>
+            </Block>
+          )} */}
 
           <text>备注</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='补充说明（选填）' value={FormData.remark} onInput={InputChange.bind(this, 'remark')}></Input>
+          <view className="FormLine flex-h">
+            <view className="flex-item">
+              <Input
+                placeholder="补充说明（选填）"
+                value={FormData.remark}
+                onInput={InputChange.bind(this, "remark")}
+              ></Input>
             </view>
           </view>
 
-          <view className='Btn'>
+          <view className="Btn">
             <text onClick={ToSubmit}>提交</text>
           </view>
-
         </view>
       </ScrollView>
-
     </view>
-  )
-})
+  );
+});

src/subpackages/pages/marketing/residentManager/index.jsx

@@ -1,131 +1,158 @@
-import { useState, useEffect, useCallback, useRef } from 'react'
-import withLayout from '@/layout'
-import { ScrollView, Input } from '@tarojs/components'
-import '@/assets/css/iconfont.css'
-import { useSelector } from 'react-redux'
-import { fetch } from '@/utils/request'
-import { API_MANAGE_CUSTOMER_LIST, API_MY_BUILDINGIDS } from '@/constants/api'
-import './index.scss'
-import ResidentListItem from '../components/ResidentListItem/index'
+import { useState, useEffect, useCallback, useRef } from "react";
+import withLayout from "@/layout";
+import { ScrollView, Input } from "@tarojs/components";
+import "@/assets/css/iconfont.css";
+import { useSelector } from "react-redux";
+import { fetch } from "@/utils/request";
+import { API_MANAGE_CUSTOMER_LIST, API_MY_BUILDINGIDS } from "@/constants/api";
+import "./index.scss";
+import ResidentListItem from "../components/ResidentListItem/index";
+import { useDidShow } from "@tarojs/taro";
 
 export default withLayout((props) => {
-  const { person } = props
-  
-  const [BuildingIds, setBuildingIds] = useState([])
-  const [PageList, setPageList] = useState([])
-  const [IsPull, setPull] = useState(false)
-  const [HasNextPage, setHasNextPage] = useState(true)
-  const [CurrentBuildingId, setCurrentBuildingId] = useState(null)
-  const [CurrentBuildingName, setCurrentBuildingName] = useState(null)
-  const [page, setPage] = useState({ pageNumber: 1 })
-  const queryParamsRef = useRef({})
-  const getListRef = useRef()
+  const { person } = props;
+
+  const [BuildingIds, setBuildingIds] = useState([]);
+  const [PageList, setPageList] = useState([]);
+  const [IsPull, setPull] = useState(false);
+  const [HasNextPage, setHasNextPage] = useState(true);
+  const [CurrentBuildingId, setCurrentBuildingId] = useState(null);
+  const [CurrentBuildingName, setCurrentBuildingName] = useState(null);
+  const [page, setPage] = useState({ pageNumber: 1 });
+  const queryParamsRef = useRef({});
+  const getListRef = useRef();
+
+  useDidShow(() => {
+   
+      setPage({pageNumber: 1});
+
+
+  });
 
   const GetMyBuildingIds = () => {
-    fetch({ url: API_MY_BUILDINGIDS, method: 'get' }).then((res) => {
-      setBuildingIds(res || [])
-    })
-  }
+    fetch({ url: API_MY_BUILDINGIDS, method: "get" }).then((res) => {
+      setBuildingIds(res || []);
+    });
+  };
 
-  const PageRefresh = () => { // 页面下拉刷新回调
-    setPull(true)
-  }
+  const PageRefresh = () => {
+    // 页面下拉刷新回调
+    setPull(true);
+  };
 
   getListRef.current = (params) => {
     if (!CurrentBuildingId) return;
 
-    setHasNextPage(false)
+    setHasNextPage(false);
     fetch({
       url: API_MANAGE_CUSTOMER_LIST,
       payload: {
         pageSize: 10,
         ...params,
         ...queryParamsRef.current,
-        buildingId: CurrentBuildingId
+        buildingId: CurrentBuildingId,
       },
     }).then((res) => {
-      setPageList(res.current === 1 ? res.records || [] : PageList.concat(res.records || []))
-      setHasNextPage(res.current < res.pages)
-      setPull(false)
-    })
-  }
+      setPageList(
+        res.current === 1
+          ? res.records || []
+          : PageList.concat(res.records || [])
+      );
+      setHasNextPage(res.current < res.pages);
+      setPull(false);
+    });
+  };
 
   const PickerChange = (e) => {
-    setCurrentBuildingId(BuildingIds[e.detail.value - 0].buildingId)
-    setCurrentBuildingName(BuildingIds[e.detail.value - 0].name)
-  }
+    setCurrentBuildingId(BuildingIds[e.detail.value - 0].buildingId);
+    setCurrentBuildingName(BuildingIds[e.detail.value - 0].name);
+  };
 
   const SearchConfirm = (e) => {
     queryParamsRef.current = {
       ...queryParamsRef.current,
       keywords: e.detail.value,
-    }
-    setPage({ pageNumber: 1 })
-  }
+    };
+    setPage({ pageNumber: 1 });
+  };
 
   const ListChange = (index) => {
     return () => {
-      let List = [...PageList]
-      List.splice(index, 1)
-      setPageList(List)
-    }
-  }
+      let List = [...PageList];
+      List.splice(index, 1);
+      setPageList(List);
+    };
+  };
 
   // 页面上拉加载更多
   const PageLoadMore = () => {
     if (HasNextPage) {
-      setPage({ pageNumber: page.pageNumber + 1 })
+      setPage({ pageNumber: page.pageNumber + 1 });
     }
-  }
-  
+  };
+
   useEffect(() => {
-    GetMyBuildingIds()
-  }, [])
+    GetMyBuildingIds();
+  }, []);
 
   useEffect(() => {
     if (BuildingIds.length) {
-      setCurrentBuildingId(BuildingIds[0].buildingId)
-      setCurrentBuildingName(BuildingIds[0].name)
+      setCurrentBuildingId(BuildingIds[0].buildingId);
+      setCurrentBuildingName(BuildingIds[0].name);
     }
-  }, [BuildingIds])
+  }, [BuildingIds]);
 
   // 选择楼盘
   useEffect(() => {
     if (CurrentBuildingId) {
-      setPage({ pageNumber: 1 })
+      setPage({ pageNumber: 1 });
     }
-  }, [CurrentBuildingId])
+  }, [CurrentBuildingId]);
 
   // 下拉刷新
   useEffect(() => {
     if (IsPull) {
-      setPage({ pageNumber: 1 })
+      setPage({ pageNumber: 1 });
     }
-  }, [IsPull])
+  }, [IsPull]);
 
   useEffect(() => {
-    getListRef.current(page)
-  }, [page])
+    getListRef.current(page);
+  }, [page]);
 
   return (
-    <view className='Page residentManager flex-v'>
-
-      <view className='Search flex-h'>
-        <view className='flex-item'>
-          <text className='iconfont icon-sousuo'></text>
-          <Input confirm-type='search' placeholder='请输入关键字搜索' onConfirm={SearchConfirm}></Input>
+    <view className="Page residentManager flex-v">
+      <view className="Search flex-h">
+        <view className="flex-item">
+          <text className="iconfont icon-sousuo"></text>
+          <Input
+            confirm-type="search"
+            placeholder="请输入关键字搜索"
+            onConfirm={SearchConfirm}
+          ></Input>
         </view>
         <text>{CurrentBuildingName}</text>
-        <picker value={0} range-key='name' onChange={PickerChange} range={BuildingIds}>
-          <view class='picker'>更换</view>
+        <picker
+          value={0}
+          range-key="name"
+          onChange={PickerChange}
+          range={BuildingIds}
+        >
+          <view class="picker">更换</view>
         </picker>
       </view>
 
-      <view className='flex-item'>
+      <view className="flex-item">
         <view>
-          <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
-            <view className='PageContent'>
-
+          <ScrollView
+            scroll-y
+            refresher-enabled
+            refresher-triggered={IsPull}
+            onrefresherrefresh={PageRefresh}
+            onscrolltolower={PageLoadMore}
+            refresher-background="#fff"
+          >
+            <view className="PageContent">
               {/* <view className='Filter'>
                 <text>筛选条件</text>
                 <view>
@@ -143,24 +170,24 @@ export default withLayout((props) => {
                 </view>
               </view> */}
 
-              <view className='List'>
-                {
-                  PageList.map((item, index) => (
-                    <ResidentListItem data={item} key={`ResidentListItem-${index}`} change={ListChange(index)}></ResidentListItem>
-                  ))
-                }
+              <view className="List">
+                {PageList.map((item, index) => (
+                  <ResidentListItem
+                    data={item}
+                    key={`ResidentListItem-${index}`}
+                    change={ListChange(index)}
+                  ></ResidentListItem>
+                ))}
               </view>
 
               {/* bottom */}
-              <view className='PageBottom'>
+              <view className="PageBottom">
                 <text>已经到底了~</text>
               </view>
-
             </view>
           </ScrollView>
         </view>
       </view>
-
     </view>
-  )
-})
+  );
+});