fix

config/dev.js

@@ -12,6 +12,7 @@ module.exports = {
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
+    BROKER_CITY: '"南京"',
     Version: '"V0.0.20"'
   },
   mini: {},

src/components/brokerShare/index.jsx

@@ -4,17 +4,29 @@ import { Image } from "@tarojs/components";
 import { getImgURL } from "@/utils/image";
 import "./index.scss";
 
-export const brokerShareLink = (buildingId) => Taro.navigateTo({
-  url: `/pages/mine/addCustomer/index?buildingId=${buildingId}`,
-});
+export const brokerShareLink = (buildingId) =>
+  Taro.navigateTo({
+    url: `/pages/mine/addCustomer/index?buildingId=${buildingId}`,
+  });
+export const agreementLink = (buildingId) =>
+  Taro.navigateTo({
+    url: `/subpackages/pages/broker/agreement/index?buildingId=${buildingId}`,
+  });
 
 export default function ProjectListItem(props) {
   return (
     <view
       className="brokerShare flex-h"
-      onClick={() => brokerShareLink(props.buildingId)}
+      onClick={(e) => {
+        e.stopPropagation();
+      }}
     >
-      <view className="left">
+      <view
+        className="left"
+        onClick={(e) => {
+          e.stopPropagation(), agreementLink(props.buildingId);
+        }}
+      >
         <image
           className="image"
           src={`${OSS_FAST_PATH}/miniapp/broker/钱袋.png`}
@@ -23,7 +35,12 @@ export default function ProjectListItem(props) {
         />
         <text>靓盘好卖 闪付结佣</text>
       </view>
-      <view className="right">
+      <view
+        className="right"
+        onClick={(e) => {
+          e.stopPropagation(), brokerShareLink(props.buildingId);
+        }}
+      >
         <text>推荐好友</text>
 
         <image

src/constants/broker.js

@@ -22,3 +22,6 @@ export const API_BROKER_RANK_MINE = resolvePath('broker/mine')
 
 //消息
 export const API_BK_NOTICE = resolvePath('bkNotice')
+
+//我的钱包
+export const API_BK_ACCOUNT = resolvePath('bkAccountRecord')

src/pages/index/components/Menu/index.jsx

@@ -1,106 +1,205 @@
-import { useState, useEffect, useRef } from 'react'
-import { Swiper, SwiperItem, Image } from '@tarojs/components'
-import Taro from '@tarojs/taro'
-import { useSelector } from 'react-redux'
-import { getSystemParsm } from '@/services/common'
-import './index.scss'
-import { ROLE_CODE } from '@/constants/user'
+import { useState, useEffect, useRef } from "react";
+import { Swiper, SwiperItem, Image } from "@tarojs/components";
+import Taro from "@tarojs/taro";
+import { useSelector } from "react-redux";
+import { getSystemParsm } from "@/services/common";
+import "./index.scss";
+import { ROLE_CODE } from "@/constants/user";
+import { useMemo } from "react";
 
-const MINI_KANGYANG = 'MINI_KANGYANG'
+const MINI_KANGYANG = "MINI_KANGYANG";
 
-export default function Menu () {
-  const kangyangRef = useRef()
-  const person = useSelector(({user})=>user.userInfo?.person)
-  console.log('=person=',person)
+const list = [
+  {
+    name: "全部楼盘",
+    id: 1,
+    icon: require("@/assets/index-icon9.png"),
+    router: "/pages/index/buildingList/index",
+  },
+  {
+    name: "品牌地产",
+    id: 2,
+    icon: require("@/assets/index-icon8.png"),
+    router: "/pages/index/brandList/index",
+  },
+  {
+    name: "近期开盘",
+    id: 3,
+    icon: require("@/assets/index-icon6.png"),
+    router: `/pages/index/buildingList/index?isRecentOpening=1`,
+  },
+  {
+    name: "帮我找房",
+    id: 4,
+    icon: require("@/assets/index-icon1.png"),
+    router: "/pages/index/helpToFindHouse/index",
+  },
+  {
+    name: "增值服务",
+    id: 5,
+    icon: require("@/assets/index-icon16.png"),
+    router: "/pages/index/addedValueService/index",
+  },
+  {
+    name: "地图找房",
+    id: 6,
+    icon: require("@/assets/index-icon2.png"),
+    router: "/pages/index/findHouseFromMap/index",
+  },
+  {
+    name: "活动信息",
+    id: 7,
+    icon: require("@/assets/index-icon5.png"),
+    router: "/pages/index/activityList/index?type=dymic",
+  },
+  {
+    name: "团房信息",
+    id: 8,
+    icon: require("@/assets/index-icon12.png"),
+    router: "/pages/index/activityList/index?type=house",
+  },
+  {
+    name: "特价房",
+    id: 9,
+    icon: require("@/assets/index-icon11.png"),
+    router: "/pages/index/specialPriceHouse/index",
+  },
+  {
+    name: "康养",
+    id: 10,
+    icon: require("@/assets/index-icon7.png"),
+    miniapp: MINI_KANGYANG,
+  },
+  {
+    name: "文旅商办",
+    id: 11,
+    icon: require("@/assets/index-icon13.png"),
+    router: `/pages/index/buildingList/index?isCommerce=1`,
+  },
+  {
+    name: "资讯",
+    id: 12,
+    icon: require("@/assets/index-icon15.png"),
+    router: "/pages/index/newsList/index",
+  },
+  {
+    name: "购房百科",
+    id: 13,
+    icon: require("@/assets/index-icon4.png"),
+    router: "/pages/index/encyclopediasOfBuyHouse/index",
+  },
+  {
+    name: "房贷计算",
+    id: 14,
+    icon: require("@/assets/index-icon3.png"),
+    router: "/pages/mine/mortgageCalc/index",
+  },
+];
 
-  const brokerList = [
-    { name: '我要推荐', id: 25, icon: require('@/assets/index-icon25.png'), router: '/pages/mine/addCustomer/index' },
-    { name: '我的客户', id: 23, icon: require('@/assets/index-icon23.png'), router: '/pages/mine/myCustomer/index' },
-    { name: '邀请好友', id: 26, icon: require('@/assets/index-icon26.png'), router: '/subpackages/pages/broker/invitation/index' },
-    { name: '我的钱包', id: 24, icon: require('@/assets/index-icon24.png'), router: '/subpackages/pages/broker/myWallet/index' },
-  ]
+const brokerList = [
+  {
+    name: "我要推荐",
+    id: 25,
+    icon: require("@/assets/index-icon25.png"),
+    router: "/pages/mine/addCustomer/index",
+  },
+  {
+    name: "我的客户",
+    id: 23,
+    icon: require("@/assets/index-icon23.png"),
+    router: "/pages/mine/myCustomer/index",
+  },
+  {
+    name: "邀请好友",
+    id: 26,
+    icon: require("@/assets/index-icon26.png"),
+    router: "/subpackages/pages/broker/invitation/index",
+  },
+  {
+    name: "我的钱包",
+    id: 24,
+    icon: require("@/assets/index-icon24.png"),
+    router: "/subpackages/pages/broker/myWallet/index",
+  },
+];
 
-  const List = [
-    { name: '全部楼盘', id: 1, icon: require('@/assets/index-icon9.png'), router: '/pages/index/buildingList/index' },
-    { name: '品牌地产', id: 2, icon: require('@/assets/index-icon8.png'), router: '/pages/index/brandList/index' },
-    { name: '近期开盘', id: 3, icon: require('@/assets/index-icon6.png'), router: `/pages/index/buildingList/index?isRecentOpening=1` },
-    { name: '帮我找房', id: 4, icon: require('@/assets/index-icon1.png'), router: '/pages/index/helpToFindHouse/index' },
-    { name: '增值服务', id: 5, icon: require('@/assets/index-icon16.png'), router: '/pages/index/addedValueService/index' },
-    { name: '地图找房', id: 6, icon: require('@/assets/index-icon2.png'), router: '/pages/index/findHouseFromMap/index' },
-    { name: '活动信息', id: 7, icon: require('@/assets/index-icon5.png'), router: '/pages/index/activityList/index?type=dymic' },
-    { name: '团房信息', id: 8, icon: require('@/assets/index-icon12.png'), router: '/pages/index/activityList/index?type=house' },
-    { name: '特价房', id: 9, icon: require('@/assets/index-icon11.png'), router: '/pages/index/specialPriceHouse/index' },
-    { name: '康养', id: 10, icon: require('@/assets/index-icon7.png'), miniapp: MINI_KANGYANG },
-    { name: '文旅商办', id: 11, icon: require('@/assets/index-icon13.png'), router: `/pages/index/buildingList/index?isCommerce=1` },
-    { name: '资讯', id: 12, icon: require('@/assets/index-icon15.png'), router: '/pages/index/newsList/index' },
-    { name: '购房百科', id: 13, icon: require('@/assets/index-icon4.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
-    { name: '房贷计算', id: 14, icon: require('@/assets/index-icon3.png'), router: '/pages/mine/mortgageCalc/index' }
-  ]
+export default function Menu() {
+  const kangyangRef = useRef();
+  const city = useSelector((state) => state.city);
 
-  // 如果是全民经纪人添加专属菜单
-  if(person.personType===ROLE_CODE.BROKER){
-    List.unshift(...brokerList)
-  }
-  let Arr = []
-  List.map((item) => {
-    if (Arr.length) {
-      if (Arr[Arr.length - 1].length < 10) {
-        Arr[Arr.length - 1].push({ ...item })
-      } else {
-        Arr.push([{ ...item }])
-      }
+  const [List, setList] = useState(list);
+
+  useEffect(() => {
+    // 如果是全民经纪人添加专属菜单
+    if (city.curCity.shortname === BROKER_CITY) {
+      setList([...brokerList, ...list]);
     } else {
-      Arr.push([{ ...item }])
+      setList(list);
     }
-  })
-  const [MenuList] = useState(Arr)
+  }, [city.curCity.shortname]);
+
+
+  const MenuList = useMemo(() => {
+    let Arr = [];
+    List.map((item) => {
+      if (Arr.length) {
+        if (Arr[Arr.length - 1].length < 10) {
+          Arr[Arr.length - 1].push({ ...item });
+        } else {
+          Arr.push([{ ...item }]);
+        }
+      } else {
+        Arr.push([{ ...item }]);
+      }
+    });
+    return Arr
+  }, [List]);
 
   const MenuClick = (item) => {
     return () => {
       if (item.router) {
-        Taro.navigateTo({ url: item.router })
+        Taro.navigateTo({ url: item.router });
       } else if (item.miniapp === MINI_KANGYANG) {
         if (kangyangRef.current) {
           // 跳转到康养小程序
-          Taro.navigateToMiniProgram(kangyangRef.current)
+          Taro.navigateToMiniProgram(kangyangRef.current);
         }
       }
-    }
-  }
-  
+    };
+  };
+
   useEffect(() => {
     // 获取康养小程序相关
     getSystemParsm(MINI_KANGYANG).then((res) => {
       if (res && res.paramValue) {
-        kangyangRef.current = JSON.parse(res.paramValue)
+        kangyangRef.current = JSON.parse(res.paramValue);
       }
-    })
-  }, [])
+    });
+  }, []);
 
   return (
-    <view className='components Menu'>
+    <view className="components Menu">
       <view>
         <view>
           <Swiper autoplay={false} indicator-dots>
-            {
-              MenuList.map((item, index) => (
-                <SwiperItem key={`Banner-${index}`}>
-                  <view className='swiper-item'>
-                    {
-                      item.map((subItem, subIndex) => (
-                        <view key={`BannerItem-${subIndex}`} onClick={MenuClick(subItem)}>
-                          <Image mode='heightFix' src={subItem.icon || null} />
-                          <text>{subItem.name}</text>
-                        </view>
-                      ))
-                    }
-                  </view>
-                </SwiperItem>
-              ))
-            }
+            {MenuList.map((item, index) => (
+              <SwiperItem key={`Banner-${index}`}>
+                <view className="swiper-item">
+                  {item.map((subItem, subIndex) => (
+                    <view
+                      key={`BannerItem-${subIndex}`}
+                      onClick={MenuClick(subItem)}
+                    >
+                      <Image mode="heightFix" src={subItem.icon || null} />
+                      <text>{subItem.name}</text>
+                    </view>
+                  ))}
+                </view>
+              </SwiperItem>
+            ))}
           </Swiper>
         </view>
       </view>
     </view>
-  )
+  );
 }

src/services/broker.js

@@ -8,6 +8,7 @@ import {
   API_BK_AGENT_RULE,
   API_BROKER_RANK_MINE,
   API_BK_NOTICE,
+  API_BK_ACCOUNT,
 } from "@/constants/broker";
 
 /**
@@ -59,3 +60,12 @@ export const getbkAgentRule = (payload) =>
  */
 export const getbkNotice = (payload) =>
   fetch({ url: `${API_BK_NOTICE}`, payload });
+
+  
+/**
+ * 我的钱包
+ * @param {*}
+ *            chargeCode= deal  成交喜报  noticeType=status-change&mine=true
+ */
+export const getbkAccountRecord = (payload) =>
+fetch({ url: `${API_BK_ACCOUNT}`, payload });

src/subpackages/pages/broker/myMessage/components/messageItem/index.jsx

@@ -4,7 +4,7 @@ import { getDateForHumans } from '@/utils/chatDate'
 import "./index.scss";
 // const ossFastPath = OSS_FAST_PATH;
 export default (props) => {
-  const { message } = props;
+  const { item } = props;
 
   return (
     <view className="Item messageItem">
@@ -13,7 +13,7 @@ export default (props) => {
       消息提醒
      </view>
      <view className="messageItem-bottom"></view>
-     {message}
+     {`${item.buildingName}项目，您的客户${item.customerName}，变更为${item.content}`}
     </view>
   );
 };

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

@@ -58,8 +58,8 @@ export default withLayout((props) => {
         <view className="PageContent">
           {PageList.map((item, index) => (
             <view>
-              <MessageTime time="2022-07-31 9:52:14" />
-              <MessageItem message="尊贵的李先生，您好！衷心的感谢您对xx地产的 关注和支持！经确认，您于2022年7月22日签署了.尊贵的李先生，您好！衷心的感谢您对xx地产的 关注和支持！经确认，您于2022年7月22日签署了" />
+              <MessageTime item={item} time={item.createDate} />
+              <MessageItem item={item} />
             </view>
           ))}
 

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

@@ -7,8 +7,7 @@ import { ScrollView, Input, Image, Block, Textarea } from "@tarojs/components";
 import { getImgURL } from "@/utils/image";
 import { fetch, uploadFiles } from "@/utils/request";
 import { UPDATE_USER_INFO, ROLE_CODE } from "@/constants/user";
-import { API_EDIT_AGENT, API_UPDATE_PHOTO } from "@/constants/api";
-import store from "@/store";
+import { queryBrokerRankMine } from "@/services/broker";
 import WalletList from "./list";
 
 import "@/assets/css/iconfont.css";
@@ -16,17 +15,14 @@ import "./index.scss";
 
 export default withLayout((props) => {
   const { person } = props;
+  const [activeKey, setActiveKey] = useState(1);
+  const [mineInfo, setMineInfo] = useState({});
 
-  // // 获取银行卡列表
-  // useEffect(() => {
-  //   Taro.showLoading();
-
-  //   querybkBankCard().then((res) => {
-  //     console.log(res, "queryBkAgreement");
-  //     setBankCard(res?.records || []);
-  //     Taro.hideLoading();
-  //   });
-  // }, []);
+  useEffect(() => {
+    queryBrokerRankMine().then((res) => {
+      setMineInfo(res);
+    });
+  }, []);
 
   useDidShow(() => {
     if (!person.idNo) {
@@ -65,7 +61,6 @@ export default withLayout((props) => {
     });
   });
 
-  const [activeKey, setActiveKey] = useState(1);
   return (
     <view className="Page myWallet">
       <view className="top">
@@ -86,10 +81,13 @@ export default withLayout((props) => {
       </view>
       <view className="middle">
         <text className="text1">总资产（元）</text>
-        <text className="text2">9000.00</text>
+        <text className="text2">
+          {Number((mineInfo.totalCommission || 0) / 100).toFixed(2)}
+        </text>
       </view>
       <view className="bottom">
-        <WalletList></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

@@ -1,17 +1,23 @@
 import { useState, useEffect } from "react";
-
+import { formatDate } from "@/utils/chatDate";
 import "./index.scss";
 
-export default () => {
+export default (props) => {
+  const { item = {} } = props;
   return (
     <view className="components myWalletItem">
       <view className="item-top">
         <view className="top-text1">邀请好友</view>
-        <view className="top-text2">+20</view>
+        <view className="top-text2">
+          {item.chargeType === -1 ? "-" : "+"}
+          {Number((item.charges || 0) / 100).toFixed(2)}
+        </view>
       </view>
       <view className="item-bottom">
-        <view className="bottom-text1">成功邀请张三</view>
-        <view className="bottom-text2">2022.01.01</view>
+        <view className="bottom-text1">成功邀请{item.customerName}</view>
+        <view className="bottom-text2">
+          {formatDate(item.createDate, "yyyy.MM.dd")}
+        </view>
       </view>
     </view>
   );

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

@@ -1,79 +1,103 @@
-import { useState, useEffect } from 'react'
-import { useSelector } from 'react-redux'
-import { useRouter } from '@tarojs/taro'
-import { ScrollView } from '@tarojs/components'
-
-
-
-import Item from './Item'
-
-import './index.scss'
-
-export default function MyCollectForActivity () {
-
- const router=useRouter()
-   const { type,buildingId } = router.params;
-
-  
-
-  const [PageList, setPageList] = useState([{},{},{},{},{},{},{},{},{},{}])
-  const [IsPull, setPull] = useState(false)
-
-  const [pageNumber, setPageNumber] = useState(1)
-  const [HasNextPage, setHasNextPage] = useState(true)
-
+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 Item from "./Item";
+
+import "./index.scss";
+
+export default function MyCollectForActivity(props) {
+  const { show } = 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()
+    if (pageNumber) {
+      GetPageList();
     }
-  }, [pageNumber])
-
-  const PageRefresh = () => { // 页面下拉刷新回调
-    // setPull(true)
-  }
+  }, [pageNumber]);
 
   const GetPageList = () => {
-    setHasNextPage(false)
-   
-  }
-
-  const PageLoadMore = () => { // 页面上拉加载更多
-    if(HasNextPage) {
-      setPageNumber(pageNumber + 1)
+    setHasNextPage(false);
+    getbkAccountRecord().then((res) => {
+      console.log(res, "getbkAccountRecord");
+      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)
+    //     setPull(false)
+    //   })
+  };
+
+  const PageLoadMore = () => {
+    // 页面上拉加载更多
+    if (HasNextPage) {
+      setPageNumber(pageNumber + 1);
     }
-  }
-
-  useEffect(() => { // 下拉刷新触发
-    // if (IsPull) {
-    //   if(pageNumber === 1) {
-    //     GetPageList()
-    //   } else {
-    //     setPageNumber(1)
-    //   }
-    // }
-  }, [IsPull])
+  };
 
   return (
-    <view className='components myWalletList'>
-      <ScrollView scroll-y  refresher-triggered={IsPull}  onscrolltolower={PageLoadMore} refresher-background='#fff'>
-        <view className='PageContent'>
-          <view className='List'>
-            {
-              PageList.map((item, index) => (
-                <Item data={item} key={`myWalletList-${index}`}></Item>
-              ))
-            }
+    <view
+      className="components myWalletList"
+      style={{ display: show ? "block" : "none" }}
+    >
+      <ScrollView
+        scroll-y
+        onscrolltolower={PageLoadMore}
+        refresher-background="#fff"
+      >
+        <view className="PageContent">
+          <view className="List">
+            {PageList.map((item, index) => (
+              <Item item={item} key={`myWalletList-${index}`}></Item>
+            ))}
           </view>
 
           {/* bottom */}
-          <view className='PageBottom'>
+          <view className="PageBottom">
             <text>已经到底了~</text>
           </view>
         </view>
-
-
       </ScrollView>
     </view>
-  )
+  );
 }

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

@@ -77,12 +77,14 @@ export default withLayout((props) => {
         title: "修改成功",
         icon: "none",
       });
+     
       dispatch({
         type: UPDATE_USER_INFO,
         payload: {
           name: FormData.name,
           phone: FormData.phone,
           idNo: FormData.idNo,
+          personType: 'broker' 
         },
       });
       Taro.navigateBack({ delta: 1 });