fix

src/constants/broker.js

@@ -25,3 +25,6 @@ export const API_BK_NOTICE = resolvePath('bkNotice')
 
 //我的钱包
 export const API_BK_ACCOUNT = resolvePath('bkAccountRecord')
+
+//我的钱包
+export const API_BK_INVITE = resolvePath('bkInviteRecord')

src/services/broker.js

@@ -9,6 +9,7 @@ import {
   API_BROKER_RANK_MINE,
   API_BK_NOTICE,
   API_BK_ACCOUNT,
+  API_BK_INVITE,
 } from "@/constants/broker";
 
 /**
@@ -63,9 +64,18 @@ export const getbkNotice = (payload) =>
 
   
 /**
- * 我的钱包
+ * 我的佣金
  * @param {*}
- *            chargeCode= deal  成交喜报  noticeType=status-change&mine=true
+ *          
  */
 export const getbkAccountRecord = (payload) =>
 fetch({ url: `${API_BK_ACCOUNT}`, payload });
+
+/**
+ * 我的奖励
+ * @param {*}
+ *            chargeCode= deal  成交喜报  noticeType=status-change&mine=true
+ */
+ export const getbkInviteRecord = (payload) =>
+ fetch({ url: `${API_BK_INVITE}`, payload });
+

src/subpackages/pages/broker/myWallet/index.jsx

@@ -82,12 +82,16 @@ export default withLayout((props) => {
       <view className="middle">
         <text className="text1">总资产（元）</text>
         <text className="text2">
-          {Number((mineInfo.totalCommission || 0) / 100).toFixed(2)}
+          {Number(
+            (activeKey === 1
+              ? mineInfo.totalCommission || 0
+              : mineInfo.referralFee || 0) / 100
+          ).toFixed(2)}
         </text>
       </view>
       <view className="bottom">
-        <WalletList show={activeKey===1} type={'commission'}></WalletList>
-        <WalletList show={activeKey===2} type={'reward'}></WalletList>
+        <WalletList show={activeKey === 1} type={"commission"}></WalletList>
+        <WalletList show={activeKey === 2} type={"reward"}></WalletList>
       </view>
     </view>
   );

src/subpackages/pages/broker/myWallet/list/Item/index.jsx

@@ -3,20 +3,26 @@ import { formatDate } from "@/utils/chatDate";
 import "./index.scss";
 
 export default (props) => {
-  const { item = {} } = props;
+  const { item = {
+    
+    name:'',
+    time:'',
+    money:0,
+    moneyType:1,
+  } } = props;
   return (
     <view className="components myWalletItem">
       <view className="item-top">
         <view className="top-text1">邀请好友</view>
         <view className="top-text2">
-          {item.chargeType === -1 ? "-" : "+"}
-          {Number((item.charges || 0) / 100).toFixed(2)}
+          {item.moneyType === -1 ? "-" : "+"}
+          {Number((item.money || 0) / 100).toFixed(2)}
         </view>
       </view>
       <view className="item-bottom">
-        <view className="bottom-text1">成功邀请{item.customerName}</view>
+        <view className="bottom-text1">成功邀请{item.name}</view>
         <view className="bottom-text2">
-          {formatDate(item.createDate, "yyyy.MM.dd")}
+          {formatDate(item.time, "yyyy.MM.dd")}
         </view>
       </view>
     </view>

src/subpackages/pages/broker/myWallet/list/index.jsx

@@ -2,47 +2,21 @@ import { useState, useEffect } from "react";
 import { useSelector } from "react-redux";
 import { useRouter } from "@tarojs/taro";
 import { ScrollView } from "@tarojs/components";
-import { getbkAccountRecord } from "@/services/broker";
+import { getbkAccountRecord, getbkInviteRecord } from "@/services/broker";
 
 import Item from "./Item";
 
 import "./index.scss";
 
 export default function MyCollectForActivity(props) {
-  const { show } = props;
+  const { show, type } = props;
   const router = useRouter();
-  const { type, buildingId } = router.params;
 
   const [PageList, setPageList] = useState([]);
 
   const [pageNumber, setPageNumber] = useState(1);
   const [HasNextPage, setHasNextPage] = useState(true);
 
-  // useEffect(() => {
-  //   if(PersonId) {
-  //     GetPageList()
-  //   }
-  // }, [pageNumber, PersonId])
-
-  // const PageRefresh = () => { // 页面下拉刷新回调
-  //   setPull(true)
-  // }
-
-  // const GetPageList = () => {
-  //   setHasNextPage(false)
-  //   fetch({ url: API_ACTIVITY_LIST, method: 'get', payload: { city: city?.curCity?.id, buildingId, type, pageNumber, pageSize: 10 } }).then((res) => {
-  //     setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
-  //     setHasNextPage(res.current < res.pages)
-  //     setPull(false)
-  //   })
-  // }
-
-  // const PageLoadMore = () => { // 页面上拉加载更多
-  //   if(HasNextPage) {
-  //     setPageNumber(pageNumber + 1)
-  //   }
-  // }
-
   useEffect(() => {
     if (pageNumber) {
       GetPageList();
@@ -51,16 +25,30 @@ export default function MyCollectForActivity(props) {
 
   const GetPageList = () => {
     setHasNextPage(false);
-    getbkAccountRecord().then((res) => {
-      console.log(res, "getbkAccountRecord");
-      setPageList(
-        pageNumber === 1
-          ? res.records || []
-          : PageList.concat(res.records || [])
-      );
-      setHasNextPage(res.current < res.pages);
-    
-    });
+
+    if (type === "commission") {
+      // 我的佣金
+      getbkAccountRecord().then((res) => {
+        setPageList(
+          pageNumber === 1
+            ? res.records || []
+            : PageList.concat(res.records || [])
+        );
+        setHasNextPage(res.current < res.pages);
+      });
+    }
+    if (type === "reward") {
+      // 我的奖励
+      getbkInviteRecord({ isPayed: true }).then((res) => {
+        setPageList(
+          pageNumber === 1
+            ? res.records || []
+            : PageList.concat(res.records || [])
+        );
+        setHasNextPage(res.current < res.pages);
+      });
+    }
+
     //   fetch({ url: API_ACTIVITY_LIST, method: 'get', payload: { city: city?.curCity?.id, buildingId, type, pageNumber, pageSize: 10 } }).then((res) => {
     //     setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
     //     setHasNextPage(res.current < res.pages)
@@ -87,9 +75,23 @@ export default function MyCollectForActivity(props) {
       >
         <view className="PageContent">
           <view className="List">
-            {PageList.map((item, index) => (
-              <Item item={item} key={`myWalletList-${index}`}></Item>
-            ))}
+            {PageList.map((item, index) => {
+              if (type === "commission") {
+                item.id = item.recId;
+                item.name = item.customerName;
+                item.money = item.charges;
+                item.time = item.createDate;
+                item.moneyType = item.chargeType;
+              }else{
+                item.id = item.inviteId;
+                item.name = item.invitePersonName;
+                item.money = item.referralFee;
+                item.time = item.createDate;
+                item.moneyType = 1;
+              }
+
+              return <Item item={item} key={`myWalletList-${index}`}></Item>;
+            })}
           </view>
 
           {/* bottom */}

src/subpackages/pages/broker/rankingList/index.config.js

@@ -1,3 +1,4 @@
 export default {
-  navigationBarTitleText: '排行榜'
+  navigationBarTitleText: '排行榜',
+  navigationStyle:'custom'
 }

src/subpackages/pages/broker/rankingList/transactionList/index.jsx

@@ -70,30 +70,15 @@ export default withLayout((props) => {
       title: "佣金（元）",
       width: "25%",
       dataIndex: "totalCommission",
-      myRankRender:`${myRank.totalCommission||0}元`
+      render: (x) => (
+        `${Number((x.totalCommission || 0) / 100).toFixed(2)}元`
+      ),
+  
+      myRankRender:`${Number((myRank.totalCommission || 0) / 100).toFixed(2)}元`
     },
   ];
 
-  // const list = [
-  //   {
-  //     a: 1,
-  //     name: "张三",
-  //     number: 4433,
-  //     key: 1,
-  //   },
-  //   {
-  //     a: 2,
-  //     name: "李四",
-  //     number: 4433,
-  //     key: 2,
-  //   },
-  //   {
-  //     a: 3,
-  //     name: "张三",
-  //     number: 4433,
-  //     key: 3,
-  //   },
-  // ];
+ 
 
   return (
     <view className="invitationList">

src/subpackages/pages/broker/toBeBroker/index.jsx

@@ -18,11 +18,9 @@ export default withLayout((props) => {
   const { dispatch } = store;
   const {router} = props
   const recommendAgent =  router?.params?.recommendAgent
- console.log(recommendAgent,'==')
 
   const user = useSelector((state) => state.user);
   const [UserInfo, setUserInfo] = useState({});
-  const [UserRole, setUserRole] = useState(null); // 1-普通用户 2-经纪人 3-置业顾问 4-驻场管理 5-
   const [FormData, setFormData] = useState({
     name: "",
     phone: "",
@@ -36,26 +34,13 @@ export default withLayout((props) => {
     Taro.showLoading();
 
     querybkBankCard().then((res) => {
-      console.log(res, "queryBkAgreement");
+
       setBankCard(res?.records || []);
       Taro.hideLoading();
     });
   }, []);
 
-  useEffect(() => {
-    if (user?.userInfo?.person?.personId) {
-      const person = user.userInfo.person;
-      setUserRole(
-        person.personType === ROLE_CODE.CHANNEL_AGENT
-          ? 2
-          : person.personType === ROLE_CODE.CONSULTANT
-          ? 3
-          : person.personType === ROLE_CODE.MARKETING
-          ? 4
-          : 1
-      );
-    }
-  }, [user]);
+
 
   useEffect(() => {
     setUserInfo(user?.userInfo?.person);

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

@@ -16,11 +16,12 @@ import {
 } from "@/constants/api";
 import "./index.scss";
 import { ROLE_CODE } from "@/constants/user";
+import { useRef } from "react";
 
 export default withLayout((props) => {
   const { router, person } = props;
   const { name, buildingId, type, id, channelId } = router.params;
-  console.log(person, "===");
+  const isFirst = useRef(1);
   const [RenChouData, setRenChouData] = useState({
     name,
     realtyConsultant: "",
@@ -177,12 +178,22 @@ export default withLayout((props) => {
     }
   }, [CurrentStatusId, buildingId]);
 
+  // 进入页面带入当前客户的节点状态
+  useEffect(() => {
+    if (channelCustomerInfo?.status && isFirst.current === 1) {
+      isFirst.current++
+      CutStatus(StatusList.filter((x) => x.id === channelCustomerInfo.status)[0])();
+      
+    }
+  }, [channelCustomerInfo]);
+
   useEffect(() => {
     console.log("FormData", FormData);
   }, [FormData]);
 
   const CutStatus = (item) => {
     return () => {
+      console.log(item, "CutStatus");
       setCurrentStatusId(item.id);
       if (item.id - 0 === 3) {
         setFormData({ ...RenChouData });
@@ -190,6 +201,8 @@ export default withLayout((props) => {
         setFormData({ ...QianYueData });
       } else if (item.id - 0 === 5) {
         setFormData({ ...QianYueData });
+      } else if (item.id - 0 === 6) {
+        setFormData({ ...QianYueData });
       }
     };
   };
@@ -615,10 +628,15 @@ export default withLayout((props) => {
             CurrentStatusId === 5 ||
             CurrentStatusId === 6) && (
             <Block>
-              <text style={{ display: person.brokerManager ? "block" : "none" }}>
+              <text
+                style={{ display: person.brokerManager ? "block" : "none" }}
+              >
                 本次结佣
               </text>
-              <view className="FormLine flex-h" style={{  display: person.brokerManager ? "block" : "none" }}>
+              <view
+                className="FormLine flex-h"
+                style={{ display: person.brokerManager ? "block" : "none" }}
+              >
                 <view className="flex-item">
                   <Input
                     type="number"