fix

src/components/brokerShare/index.jsx

@@ -4,29 +4,33 @@ 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 default function ProjectListItem(props) {
-  const onClick =()=>{
-    Taro.navigateTo({ url: `/pages/mine/addCustomer/index?buildingId=${props.buildingId}` })
-  }
   return (
-    <view className='brokerShare flex-h' onClick={()=>onClick()}>
-      <view className='left'>
+    <view
+      className="brokerShare flex-h"
+      onClick={() => brokerShareLink(props.buildingId)}
+    >
+      <view className="left">
         <image
-          className='image'
+          className="image"
           src={`${OSS_FAST_PATH}/miniapp/broker/钱袋.png`}
-          alt=''
-          srcset=''
+          alt=""
+          srcset=""
         />
-       <text>靓盘好卖 闪付结佣</text>
+        <text>靓盘好卖 闪付结佣</text>
       </view>
-      <view className='right'>
-      <text>推荐好友</text>
-      
+      <view className="right">
+        <text>推荐好友</text>
+
         <image
-          className='image'
+          className="image"
           src={`${OSS_FAST_PATH}/miniapp/broker/分享.png`}
-          alt=''
-          srcset=''
+          alt=""
+          srcset=""
         />
       </view>
     </view>

src/constants/broker.js

@@ -16,3 +16,9 @@ export const API_BROKER_LIST = resolvePath('broker')
 
 //经纪人榜单
 export const API_BROKER_RANK = resolvePath('broker/rank')
+
+//榜单我的排行
+export const API_BROKER_RANK_MINE = resolvePath('broker/mine')
+
+//消息
+export const API_BK_NOTICE = resolvePath('bkNotice')

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

@@ -2,6 +2,7 @@ import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import { useSelector } from 'react-redux'
 import { Image } from '@tarojs/components'
+import {brokerShareLink} from '@/components/brokerShare'
 import { queryActivityList } from '@/services/activity'
 import { ROLE_CODE } from '@/constants/user'
 import './index.scss'
@@ -48,6 +49,8 @@ export default function DetailBottom (props) {
       Taro.navigateTo({
         url: `/pages/mine/addCustomer/index?type=${personType}&${params}`
       })
+    } else if(personType === ROLE_CODE.BROKER){
+      brokerShareLink(Info.buildingId)
     } else {
       Taro.showToast({ title: '该功能暂不能为您提供服务', icon: 'none', duration: 2000 })
     }

src/pages/index/components/NewestNnews/index.jsx

@@ -1,51 +1,57 @@
 import { useState, useEffect } from "react";
 import { useSelector } from "react-redux";
 import Taro from "@tarojs/taro";
-import { queryActivityList } from "@/services/activity";
-import { Swiper, SwiperItem, Block } from "@tarojs/components";
+import { getbkNotice } from "@/services/broker";
+import { Swiper, SwiperItem, Block, View } from "@tarojs/components";
 import "@/assets/css/iconfont.css";
 import "./index.scss";
 
 export default function HotRecommend(props) {
   const { change = () => {} } = props;
   const city = useSelector((state) => state.city);
-  const [CurrentId, setCurrentId] = useState("dymic");
-  const [list, setList] = useState([[], []]);
+
+  const [list, setList] = useState([]);
   const [CurrentContentInfo, setCurrentContentInfo] = useState({});
 
   useEffect(() => {
-    if (city.curCity.name) {
-      GetRecommendActivity();
-    }
-  }, [city]);
-
-  const GetRecommendActivity = () => {
-    // queryActivityList({ home: 1, cityId: city.curCity.id, type: 'dymic' }).then((res) => {
-    //   const resArr = res.records || []
-    //   queryActivityList({ home: 1, cityId: city.curCity.id, type: 'house' }).then((subRes) => {
-    //     const subResArr = subRes.records || []
-    //     setList([resArr || [], subResArr || []])
-    //     change(resArr.length || subResArr.length)
-    //   })
-    // })
-  };
+    getbkNotice({ noticeType: "deal" })
+      .then((res) => {
+        // const resArr = res.records || []
+        setList(res.records);
+        change(res?.total);
+      })
+      .catch(() => {
+        change(0);
+      });
+  }, []);
 
   return (
     <view className="components NewestNnews">
       <view className="content">
-        <view className="icon">
-          <text className="iconfont icon-shoucang"></text>
-        </view>
-        <view className="newstype">成交喜报</view>
+        <image
+          className="newsimage"
+          src={`${OSS_FAST_PATH}/miniapp/broker/成交喜报.png`}
+          alt=""
+          srcset=""
+        />
+
         <view className="newstext">
-          <text
-            className="looptext"
-            style={{ animation: "10s loop linear infinite normal" }}
+          <Swiper
+            className="swiper"
+            indicatorColor="#999"
+            indicatorActiveColor="#333"
+            vertical
+            circular
+            autoplay
           >
-            <text>2222222222222222233333333333333333333333</text>
-            <text>9999999996666666666666665555555555555544</text>
-            <text>5548888888888888888777773333333333333222</text>
-          </text>
+            {list.map((item, index) => (
+              <SwiperItem className="swiper-item" key={`NewestNnews-${index}`}>
+                <View className="swiper-text">
+                  {item.buildingName}项目{item.personName}推荐客户{item.content}
+                </View>
+              </SwiperItem>
+            ))}
+          </Swiper>
         </view>
       </view>
     </view>

src/pages/index/components/NewestNnews/index.scss

@@ -3,35 +3,47 @@
   overflow: visible;
   padding: 0 30px;
   margin-top: 40px;
-
+  box-sizing: border-box;
+  // height: 30px;
   .content {
     box-sizing: border-box;
-    padding: 13px 20px;
-    // height: 166px;
+    padding: 10px 20px;
+
     position: relative;
-    // overflow: hidden;
+    display: flex;
+    align-items: center;
 
     background: rgba(25, 60, 131, 0.08);
 
     border-radius: 8px;
     font-size: 28px;
     display: flex;
-    .icon {
-      width: 50px;
-      > text {
-        font-size: 44px;
-      }
-    }
-    .newstype{
+
+    .newsimage {
       width: 150px;
+      height: 30px;
+      margin-right: 20px;
     }
+
     .newstext {
-      overflow: hidden;
-      width: 500px;
-      .looptext {
-        display: inline-block;
-         text {
-          margin-right: 10px;
+      .swiper {
+        width: 480px;
+        height: 70px;
+
+        font-size: 28px;
+        font-family: HYk2gj;
+        font-weight: 400;
+
+        color: rgba(51, 51, 51, 0.99);
+        .swiper-item {
+         display: flex;
+         align-items: center;
+        }
+        .swiper-text {
+          // overflow: hidden;
+          // width: 480px;
+          // text-overflow: ellipsis;
+          // white-space: nowrap;
         }
       }
     }

src/pages/index/index.jsx

@@ -124,7 +124,7 @@ export default withLayout((props) => {
           </view>
 
            {/* 最新动态 */}
-           <view className='NewestNnews' style={{display: ShowNewestNnews ? 'block' : 'block'}}>
+           <view className='NewestNnews' style={{display: ShowNewestNnews ? 'block' : 'none'}}>
             {/* <ColumnTitle Name='热门推荐' Icon='icon-shoucang'></ColumnTitle> */}
             <NewestNnews change={NewestNnewsChange}></NewestNnews>
           </view>

src/services/broker.js

@@ -1,43 +1,61 @@
-import { fetch } from '@/utils/request'
+import { fetch } from "@/utils/request";
 
 import {
   API_BK_AGREEMENT,
   API_BK_BANk_CARD,
   API_BROKER_LIST,
   API_BROKER_RANK,
-  API_BK_AGENT_RULE
-} from '@/constants/broker'
-
+  API_BK_AGENT_RULE,
+  API_BROKER_RANK_MINE,
+  API_BK_NOTICE,
+} from "@/constants/broker";
 
 /**
  * 获取佣金数据
  * @param {*} id
  */
-export const queryBkAgreement = (payload) => fetch({ url: `${API_BK_AGREEMENT}`, payload })
-
+export const queryBkAgreement = (payload) =>
+  fetch({ url: `${API_BK_AGREEMENT}`, payload });
 
 /**
  * 获取银行卡
- * @param {*} 
+ * @param {*}
  */
- export const querybkBankCard = (payload) => fetch({ url: `${API_BK_BANk_CARD}`, payload })
-
+export const querybkBankCard = (payload) =>
+  fetch({ url: `${API_BK_BANk_CARD}`, payload });
 
 /**
  * 邀请的经纪人列表
- * @param {*} 
+ * @param {*}
  */
- export const querybrokerList = (payload) => fetch({ url: `${API_BROKER_LIST}`, payload })
+export const querybrokerList = (payload) =>
+  fetch({ url: `${API_BROKER_LIST}`, payload });
 
- /**
+/**
  * 经纪人排行榜
- * @param {*} 
+ * @param {*}
  */
-  export const queryBrokerRank = (payload) => fetch({ url: `${API_BROKER_RANK}`, payload })
+export const queryBrokerRank = (payload) =>
+  fetch({ url: `${API_BROKER_RANK}`, payload });
 
+/**
+ * 经纪人排行榜 我的
+ * @param {*}
+ */
+export const queryBrokerRankMine = (payload) =>
+  fetch({ url: `${API_BROKER_RANK_MINE}`, payload });
 
-   /**
+/**
  * 经纪人规则
- * @param {*} 
+ * @param {*}
+ */
+export const getbkAgentRule = (payload) =>
+  fetch({ url: `${API_BK_AGENT_RULE}`, payload });
+
+/**
+ * 消息
+ * @param {*}
+ *            noticeType=deal  成交喜报  noticeType=status-change&mine=true
  */
-    export const getbkAgentRule = (payload) => fetch({ url: `${API_BK_AGENT_RULE}`, payload })
+export const getbkNotice = (payload) =>
+  fetch({ url: `${API_BK_NOTICE}`, payload });

src/subpackages/pages/broker/invitation/BottomAction.jsx

@@ -1,4 +1,5 @@
 import { Button, View, Navigator, Image } from "@tarojs/components";
+import Taro from '@tarojs/taro'
 import { useState } from "react";
 import { getImgURL } from "@/utils/image";
 import "./index.scss";
@@ -8,13 +9,30 @@ export default (props) => {
 
   // const [showPoter, setShowPoster] = useState(true);
 
+
+  const onLinkShare = () =>{
+
+    Taro.showModal({
+      title: '点击右上角，分享给好友',
+      confirmText:'我知道了',
+      showCancel:false,
+      success: function (res) {
+        if (res.confirm) {
+          console.log('用户点击确定')
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  }
+
   return (
     <View className="invitation-bottom">
       <View className="Btn">
         <Button onClick={() => onPoster(true)}>海报分享</Button>
       </View>
       <View className="Btn">
-        <Button className="default">链接转发</Button>
+        <Button className="default" onClick={()=>onLinkShare()}>链接转发</Button>
       </View>
       <View className="invitation-bottom-links">
         <View>

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

@@ -1,3 +1,4 @@
 export default {
-  navigationBarTitleText: '我的邀请'
+  navigationBarTitleText: '我的邀请',
+  enableShareAppMessage: true,
 }

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

@@ -6,6 +6,7 @@ import usePoster from "./poster/usePoster";
 import Poster from "./poster";
 import BottomAction from "./BottomAction";
 import { useEffect, useState } from "react";
+import { useShareAppMessage } from "@tarojs/taro";
 
 const defaultImage =
   "https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/broker/%E6%B5%B7%E6%8A%A5.png";
@@ -14,10 +15,17 @@ export default withLayout((props) => {
   const { router, person } = props;
   const [posterImg, setPosterImg] = useState();
   const [showPoster, setShowPoster] = useState(false);
-  // 'subpackages/pages/broker/toBeBroker/index'
+  // subpackages/pages/broker/toBeBroker/index
+  useShareAppMessage((res) => {
+    return {
+      title: "全民经纪人，一荐值万金",
+      path: `subpackages/pages/broker/toBeBroker/index?recommendAgent=${person.personId}`,
+    };
+  });
+
   const posterData = usePoster(
     posterImg,
-    "pages/mine/index",
+    "subpackages/pages/broker/toBeBroker/index",
     `recommendAgent=${person.personId}`
   );
   useEffect(() => {
@@ -25,7 +33,7 @@ export default withLayout((props) => {
       setPosterImg(res.poster);
     });
   }, []);
-  console.log(showPoster, "showPoster");
+
   return (
     <>
       <View className="invitation-iframe">
@@ -34,14 +42,13 @@ export default withLayout((props) => {
           posterImg={posterImg}
           onPoster={() => setShowPoster(true)}
         />
-        
       </View>
       <Poster
-          show={showPoster}
-          dataSource={posterData}
-          onClose={() => setShowPoster(false)}
-          onSuccess={() => setShowPoster(false)}
-        />
+        show={showPoster}
+        dataSource={posterData}
+        onClose={() => setShowPoster(false)}
+        onSuccess={() => setShowPoster(false)}
+      />
     </>
   );
 });

src/subpackages/pages/broker/invitation/poster/config.js

@@ -19,33 +19,26 @@ export function getConfig() {
   // 图片
   const poster = {
     width: canvas.width,
-    height: canvas.width * 3 / 2, // 图片宽高 9 : 16 占用 canvas 80%
+    height: canvas.height, 
     x: 0,
     y: 0,
   }
 
-  const marign = 22.5;
-  const innerMargin = 15
 
-
-console.log(canvas,'canvas')
   // 小程序码
   const miniCode = {
     arc: true,
-    width: 125,
-    height: 125,
-    x: 30,  // 99 是宽度
-    y: canvas.height - 230,
+    width: canvas.width /3,
+    height:  canvas.width /3,
+    x: canvas.width / 3,  
+    y: canvas.height - canvas.width /3 - 100, //100是距离底部的位置
   }
 
 
-
-
   return {
     systemInfo,
     canvas,
     poster,
     miniCode,
-
   }
 }

src/subpackages/pages/broker/invitation/poster/index.jsx

@@ -13,14 +13,14 @@ export default (props) => {
     dataSource,
     onClose,
     onSuccess,
-    title = "保存后分享图片",
-    btnText = "保存海报至相册",
   } = props;
 
   const [img, setImg] = useState();
   const [processing, setProcessing] = useState(false);
-  const [loading, setLoading] = useState(false);
+
   const [canvasInited, setCanvasInited] = useState(false);
+
+  
   const posterRender = useRef();
 
   useCanvas("canvas-broker-poster", (fn) => {
@@ -28,58 +28,6 @@ export default (props) => {
     setCanvasInited(true);
   });
 
-  // const handlePoster = (url, sdk) => {
-  //   setImg(url)
-  //   setProcessing(false)
-  //   sdkRef.current = sdk
-  // }
-
-  const handleSave = () => {
-    if (!img) {
-      Taro.showToast({
-        title: "海报未生成, 请稍后",
-        icon: "none",
-      });
-      return;
-    }
-
-    // 保存到相册
-    setLoading(true);
-    save2Album(img).then(
-      () => {
-        setLoading(false);
-        onSuccess();
-        Taro.showToast({ title: "保存成功", icon: "none" });
-      },
-      () => setLoading(false)
-    );
-
-    // sdkRef.current.download().then((tempPath) => {
-    //   console.log('------poster----tempPath---', tempPath, new Date().valueOf())
-
-    //   Taro.previewImage({
-    //     urls: [tempPath]
-    //   })
-
-    //   // save2Album(tempPath).then(() => {
-    //   //   setLoading(false)
-    //   //   onSuccess()
-    //   //   Taro.showToast({ title: '保存成功', icon: 'none' })
-    //   // }, () => setLoading(false))
-    // }).catch((err) => {
-    //   setLoading(false)
-    //   console.error(err)
-    //   const message = err.errMsg || err.message || err
-    //   Taro.showToast({
-    //     title: message,
-    //     icon: 'none',
-    //   })
-    // })
-  };
-
-  const handleImage = (e) => {
-    Taro.previewImage({ current: img, urls: [img], showmenu: true });
-  };
 
   useEffect(() => {
     if (dataSource && canvasInited) {
@@ -87,32 +35,21 @@ export default (props) => {
       setProcessing(true);
       getPoster(dataSource)
         .then((image) => {
-          // 生成临时文件
-          const base64 = image.split("base64,")[1];
-          base64ToFile(base64)
-            .then((tmpFile) => {
-              setImg(tmpFile);
-              setProcessing(false);
-            })
-            .catch((err) => {
-              setProcessing(false);
-              Taro.showToast({
-                title: err.errMsg,
-                icon: "none",
-              });
-            });
+        
+          setImg(image);
+
+          setProcessing(false);
+       
         })
         .catch(() => {
           setProcessing(false);
         });
     }
   }, [dataSource, canvasInited]);
-  console.log(show, "show");
+
   return (
-    // <Modal title={title} visible={show} onClose={onClose}>
-    // eslint-disable-next-line react/jsx-no-undef
     <>
-      {!show && (
+      {show && (
         <View className="container" onClick={() => onClose()}>
           <view className="centerLabel">
             <view>

src/subpackages/pages/broker/invitation/poster/useCanvas.js

@@ -19,11 +19,9 @@ export default (canvasId, callback) => {
     }
 
     return new Promise((resolve, reject) => {
-      const { poster, miniCode, name, avatar, desc = '长按识别在线看房',  } = dataSource || {}
-
-     
-     
+      const { poster, miniCode  } = dataSource || {}
 
+    
       let cnt = 0
       // 封面
       sdk.getImage(poster).then((posterImg) => {

src/subpackages/pages/broker/invitation/poster/usePoster.js

@@ -1,36 +1,30 @@
-import { useEffect, useState } from 'react'
-import { getMiniQrcode } from '@/services/common'
+import { useEffect, useState } from "react";
+import { getMiniQrcode } from "@/services/common";
 
-export default function usePoster( poster, page, params) {
-  const [posterData, setPosterData] = useState()
+export default function usePoster(poster, page, params) {
+  const [posterData, setPosterData] = useState();
 
   useEffect(() => {
     if (poster) {
       // const page = router.path.indexOf('/') === 0 ? router.path.substring(1) : router.path
-      const scene = params
+      const scene = params;
 
-         setPosterData({
-          poster,
-          miniCode: 'https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1635430528241-c9a8f2c8-8edb-4684-a39c-c83af007ec918733913667837026296.jpg',
-          
+      getMiniQrcode({ page, scene, is_hyaline: false })
+        .then((miniCode) => {
+          setPosterData({
+            poster,
+            miniCode,
+          });
         })
-     
-      // getMiniQrcode({ page, scene,is_hyaline :false}).then((miniCode) => {
-      //   setPosterData({
-      //     poster,
-      //     miniCode,
-          
-      //   })
-      // }).catch(() => {
-      //   setPosterData({
-      //     poster,
-      //     miniCode: undefined,
-        
-      //   })
-      // })
+        .catch(() => {
+          setPosterData({
+            poster,
+            miniCode: undefined,
+          });
+        });
     }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [ poster])
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [poster]);
 
-  return posterData
+  return posterData;
 }

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

@@ -1,31 +1,73 @@
 import withLayout from "@/layout";
 import Taro from "@tarojs/taro";
-import { View, Image, Text } from "@tarojs/components";
+import { View, Image, Text, ScrollView } from "@tarojs/components";
 
 import "./index.scss";
 import { useState, useEffect } from "react";
-import { querybrokerList } from "@/services/broker";
+import { querybrokerList, queryBrokerRankMine } from "@/services/broker";
 import { formatDate } from "@/utils/chatDate";
 export default withLayout(() => {
   const [list, setList] = useState([]);
-  const [total, setTotal] = useState(0);
+  const [total, setTotal] = useState();
+
+  // useEffect(() => {
+  //   getList();
+  // }, []);
+
+  // const getList = () => {
+
+  // };
+
+  const [IsPull, setPull] = useState(false);
+
+  const [pageNumber, setPageNumber] = useState(1);
+  const [HasNextPage, setHasNextPage] = useState(true);
+
   useEffect(() => {
-    getList();
-  }, []);
+    if (pageNumber) {
+      GetPageList();
+    }
+  }, [pageNumber]);
 
-  const getList = () => {
-    querybrokerList().then((res) => {
-      setList([...res.records, ...res.records]);
+  const GetPageList = () => {
+    setHasNextPage(false);
+    //   querybrokerList().then((res) => {
+    //     setList([...res.records]);
+    //     setTotal(res.total);
+    //   });
+    querybrokerList({ pageNumber, pageSize: 10 }).then((res) => {
+      setList(
+        pageNumber === 1 ? res.records || [] : list.concat(res.records || [])
+      );
       setTotal(res.total);
+      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]);
+
   const img1 =
     "https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/broker/%E9%82%80%E8%AF%B7%E5%A5%96%E5%8A%B1.png";
   const img2 =
     "https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/broker/%E9%82%80%E8%AF%B7%E6%B3%A8%E5%86%8C%E6%A6%9C.png";
-  const defaultRuleImage =
-    "https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/broker/%E5%85%A8%E6%B0%91%E7%BB%8F%E7%BA%AA%E4%BA%BA.png";
+
   return (
     <View className="invitationlist-background">
       <View>
@@ -42,7 +84,7 @@ export default withLayout(() => {
           邀请奖励
         </View>
         <View className="invitationlist-background-2">
-          <View className="invitationlist-font-tl">{total}</View>
+          <View className="invitationlist-font-tl">{total || 0}</View>
           <View
             className="invitationlist-font-right-t"
             onClick={() => {
@@ -56,37 +98,55 @@ export default withLayout(() => {
           </View>
         </View>
       </View>
-      <View className="invitationlist-view-list">
-        {list.map((item) => {
-          return (
-            <View key={item.personId} className="invitationlist-view-item">
-              <View className="invitationlist-img-frame">
-                <Image
-                  className="invitationlist-img-head"
-                  src={item.avatarurl}
-                />
-              </View>
-              <View className="invitationlist-view-list-ifr">
-                <Text className="invitationlist-text-1">{item.name}</Text>
-                <Text className="invitationlist-text">
-                  {item.customerNum || 0}
-                </Text>
-                <Text className="invitationlist-text">
-                  {item.brokerNum || 0}
-                </Text>
-                <Text className="invitationlist-time">2022/07/26</Text>
+      <ScrollView
+        scroll-y
+        refresher-triggered={IsPull}
+        onscrolltolower={PageLoadMore}
+        refresher-background="#fff"
+      >
+        <View className="invitationlist-view-list">
+          {list?.map((item) => {
+            return (
+              <View key={item.personId} className="invitationlist-view-item">
+                <View className="invitationlist-img-frame">
+                  <Image
+                    className="invitationlist-img-head"
+                    src={item.avatarurl}
+                  />
+                </View>
+                <View className="invitationlist-view-list-ifr">
+                  <Text className="invitationlist-text-1">{item.name}</Text>
+                  <Text className="invitationlist-text">
+                    {item.customerNum || 0}
+                  </Text>
+                  <Text className="invitationlist-text">
+                    {item.brokerNum || 0}
+                  </Text>
+                  <Text className="invitationlist-time">2022/07/26</Text>
+                </View>
+                <View className="invitationlist-view-list-ifr-t">
+                  <Text className="invitationlist-text-t1">{item.phone}</Text>
+                  <Text className="invitationlist-text-t">客户（组）</Text>
+                  <Text className="invitationlist-text-t">成交（组）</Text>
+                  <Text className="invitationlist-time-t">12:00</Text>
+                </View>
+                <View className="invitationlist-border"></View>
               </View>
-              <View className="invitationlist-view-list-ifr-t">
-                <Text className="invitationlist-text-t1">{item.phone}</Text>
-                <Text className="invitationlist-text-t">客户（组）</Text>
-                <Text className="invitationlist-text-t">成交（组）</Text>
-                <Text className="invitationlist-time-t">12:00</Text>
-              </View>
-              <View className="invitationlist-border"></View>
-            </View>
-          );
-        })}
-      </View>
+            );
+          })}
+          {total > 0 && (
+            <view className="PageBottom">
+              <text>已经到底了~</text>
+            </view>
+          )}
+          {total === 0 && (
+            <view className="NoData centerLabel">
+              <text className="iconfont icon-nodata"></text>
+              <text>暂无数据~</text>
+            </view>
+          )}
+        </View>
+      </ScrollView>
     </View>
   );
 });

src/subpackages/pages/broker/invitationlist/index.scss

@@ -65,7 +65,7 @@
   }
   .invitationlist-view-list{
     flex: 1;
-    height: 150rpx;
+    height: calc(100vh - 350px);
     width: 100%;
     display: inline-block;
     margin-top: 52rpx;
@@ -139,5 +139,28 @@
       border-bottom: 1rpx solid rgba(25, 60, 131, 0.2);
     }
   }
-  
+  .NoData {
+    >text {
+      display: block;
+      text-align: center;
+      font-size: 28px;
+      color: #ccc;
+      &.iconfont {
+        font-size: 160px;
+        margin-bottom: 40px;
+      }
+    }
+  }
+  .PageBottom {
+    text-align: center;
+    font-size: 0;
+    white-space: nowrap;
+    > text {
+      display: inline-block;
+      font-size: 28px;
+      color: #666;
+      line-height: 40px;
+      margin: 20px auto;
+    }
+  }
 }

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

@@ -5,14 +5,14 @@ import { ScrollView } from "@tarojs/components";
 import "@/assets/css/iconfont.css";
 import { fetch } from "@/utils/request";
 import { API_NEWS_LIST } from "@/constants/api";
+import { getbkNotice } from "@/services/broker";
 import MessageTime from "./components/messageTime";
 import MessageItem from "./components/messageItem";
 import "./index.scss";
 
 export default withLayout((props) => {
   const [PageList, setPageList] = useState([]);
-  const [IsPull, setPull] = useState(false);
-  const [PersonId, setPersonId] = useState(null);
+
   const [pageNumber, setPageNumber] = useState(1);
   const [HasNextPage, setHasNextPage] = useState(true);
 
@@ -20,56 +20,49 @@ export default withLayout((props) => {
     GetPageList();
   }, [pageNumber]);
 
-  const PageRefresh = () => {
-    // 页面下拉刷新回调
-    setPull(true);
-  };
-
   const GetPageList = () => {
     setHasNextPage(false);
-    // fetch({ url: API_NEWS_LIST, method: 'get', payload: { pageNumber, pageSize: 10, cityId: city.id } }).then((res) => {
-    //   setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
-    //   setHasNextPage(res.current < res.pages)
-    //   setPull(false)
-    // })
+    getbkNotice({
+      pageNumber,
+      pageSize: 10,
+      noticeType: "status-change",
+      mine: true,
+    })
+      .then((res) => {
+        setPageList(
+          pageNumber === 1
+            ? res.records || []
+            : PageList.concat(res.records || [])
+        );
+        setHasNextPage(res.current < res.pages);
+      })
+      .catch(() => {
+        change(0);
+      });
   };
 
   const PageLoadMore = () => {
     // 页面上拉加载更多
-    // if(HasNextPage) {
-    //   setPageNumber(pageNumber + 1)
-    // }
+    if (HasNextPage) {
+      setPageNumber(pageNumber + 1);
+    }
   };
 
-  useEffect(() => {
-    // 下拉刷新触发
-    // if (IsPull) {
-    //   if(pageNumber === 1) {
-    //     GetPageList()
-    //   } else {
-    //     setPageNumber(1)
-    //   }
-    // }
-  }, [IsPull]);
-
   return (
     <view className="Page myMessage">
       <ScrollView
         scroll-y
-        refresher-enabled
-        refresher-triggered={IsPull}
-        onrefresherrefresh={PageRefresh}
         refresher-background="#F8F8F8"
         onscrolltolower={PageLoadMore}
       >
         <view className="PageContent">
-          {/* {PageList.map((item, index) => (
-            <NewsListItem data={item} key={`ListItem-${index}`}></NewsListItem>
-          ))} */}
-          <MessageTime time="2022-07-31 9:52:14" />
-          <MessageItem
-            message="尊贵的李先生，您好！衷心的感谢您对xx地产的 关注和支持！经确认，您于2022年7月22日签署了.尊贵的李先生，您好！衷心的感谢您对xx地产的 关注和支持！经确认，您于2022年7月22日签署了"
-          />
+          {PageList.map((item, index) => (
+            <view>
+              <MessageTime time="2022-07-31 9:52:14" />
+              <MessageItem message="尊贵的李先生，您好！衷心的感谢您对xx地产的 关注和支持！经确认，您于2022年7月22日签署了.尊贵的李先生，您好！衷心的感谢您对xx地产的 关注和支持！经确认，您于2022年7月22日签署了" />
+            </view>
+          ))}
+
           {/* bottom */}
           <view className="PageBottom">
             <text>已经到底了~</text>

src/subpackages/pages/broker/rankingList/components/list/index.jsx

@@ -90,84 +90,10 @@ export default withLayout((props) => {
           })}
         </view>
 
-        {/* <view className="PageBottom">
+        <view className="PageBottom">
           <text>已经到底了~</text>
-        </view> */}
+        </view>
       </ScrollView>
     </view>
   );
 });
-
-// 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)
-
-//   useEffect(() => {
-//     if(pageNumber) {
-//     //   GetPageList()
-//     }
-//   }, [pageNumber])
-
-//   const PageRefresh = () => { // 页面下拉刷新回调
-//     // setPull(true)
-//   }
-
-//   const GetPageList = () => {
-//     setHasNextPage(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>
-
-//           {/* bottom */}
-//           <view className='PageBottom'>
-//             <text>已经到底了~</text>
-//           </view>
-//         </view>
-
-//       </ScrollView>
-//     </view>
-//   )
-// }

src/subpackages/pages/broker/rankingList/components/list/index.scss

@@ -14,6 +14,19 @@
       justify-content: space-around;
       align-items: center;
       padding: 16px 0;
+      border-bottom: 1px solid rgba(0, 0, 0, 0.0800);
+    }
+  }
+   .PageBottom {
+    text-align: center;
+    font-size: 0;
+    white-space: nowrap;
+    > text {
+      display: inline-block;
+      font-size: 28px;
+      color: #666;
+      line-height: 40px;
+      margin: 20px auto;
     }
   }
 }

src/subpackages/pages/broker/rankingList/components/myAchievement/index.jsx

@@ -20,7 +20,7 @@ export default withLayout((props) => {
       <view className="myAchievement-tag">我的成绩</view>
       <view className="info">
         {columns.map((x, index) => (
-          <view key={index} style={{width:x.width,textAlign:'center'}}>{data[x.dataIndex]}</view>
+          <view key={index} style={{width:x.width,textAlign:'center'}}>{x.myRankRender}</view>
         ))}
       </view>
     </view>

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

@@ -10,11 +10,19 @@ import { API_EDIT_AGENT, API_UPDATE_PHOTO } from "@/constants/api";
 import store from "@/store";
 import InvitationList from "./invitationList";
 import TransactionList from "./transactionList";
+import {queryBrokerRankMine} from '@/services/broker'
 import "@/assets/css/iconfont.css";
 import "./index.scss";
 
 export default withLayout(() => {
   const [activeKey, setActiveKey] = useState(1);
+  const [myRank,setMyRank] = useState({})
+
+  useEffect(()=>{
+    queryBrokerRankMine().then(res=>{
+      setMyRank(res)
+    })
+  },[])
   return (
     <view className="rankingList">
       <view className="rankingList-backimage">
@@ -42,11 +50,11 @@ export default withLayout(() => {
         </view>
         <view className="bottom">
           <view style={{display:activeKey==1?'block':'none'}}>
-            <InvitationList />
+            <InvitationList myRank={myRank}/>
           </view>
           <view style={{display:activeKey==2?'block':'none'}}>
 
-            <TransactionList />
+            <TransactionList myRank={myRank}/>
           </view>
 
           {/* <view></view> */}

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

@@ -10,33 +10,45 @@ import store from "@/store";
 import "@/assets/css/iconfont.css";
 import "./index.scss";
 
-export default withLayout(() => {
-
+export default withLayout((props) => {
+  const { myRank } = props;
 
   const columns = [
     {
       title: "排名",
-      width: "30%",
+      width: "20%",
       dataIndex: "a",
+      style: {
+        textAlign: "left",
+      },
+      myRankRender:'*',
       render: (x, index) => {
-        if (index >= 3) {
-          return index + 1;
-        } else {
-          return (
-            <image
-              className="rank-image"
-              src={`${OSS_FAST_PATH}/miniapp/broker/${index + 1}.png`}
-              alt=""
-              srcset=""
-            />
-          );
-        }
+        return (
+          <view>
+            {index <= 3 ? (
+              <image
+                className="rank-image"
+                src={`${OSS_FAST_PATH}/miniapp/broker/${index + 1}.png`}
+                alt=""
+                srcset=""
+              />
+            ) : (
+              index + 1
+            )}
+          </view>
+        );
       },
     },
     {
       title: "经纪人",
-      width: "30%",
+      width: "50%",
       dataIndex: "name",
+      myRankRender: (
+        <view>
+          <image className="list-image" src={myRank.avatarurl} alt="" srcset="" />
+          {myRank.name}
+        </view>
+      ),
       render: (x) => (
         <view>
           <image className="list-image" src={x.avatarurl} alt="" srcset="" />
@@ -46,8 +58,9 @@ export default withLayout(() => {
     },
     {
       title: "邀请人（个）",
-      width: "40%",
+      width: "30%",
       dataIndex: "brokerNum",
+      myRankRender:`${myRank.brokerNum||0}个`,
     },
   ];
 
@@ -74,15 +87,7 @@ export default withLayout(() => {
 
   return (
     <view className="invitationList">
-      <MyAchievement
-        columns={columns}
-        data={{
-          a: 3,
-          name: "张三",
-          number: 4433,
-          key: 3,
-        }}
-      />
+      <MyAchievement columns={columns} data={{ ...myRank, a: "*" }} />
       <AchievementList
         columns={columns}
         params={{ rankType: "person" }}

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

@@ -12,12 +12,14 @@ import store from "@/store";
 import "@/assets/css/iconfont.css";
 import "./index.scss";
 
-export default withLayout(() => {
+export default withLayout((props) => {
+  const {myRank} = props
   const columns = [
     {
       title: "排名",
-      width: "15%",
+      width: "20%",
       dataIndex: "a",
+      myRankRender:'*',
       render: (x, index) => {
         if (index >= 3) {
           return index + 1;
@@ -37,11 +39,20 @@ export default withLayout(() => {
       title: "姓名",
       width: "30%",
       dataIndex: "name",
+      myRankRender: <view>
+      <image
+        className="list-image"
+        src={myRank.avatarurl}
+        alt=""
+        srcset=""
+      />
+      {myRank.name}
+    </view>,
       render: (x) => (
         <view>
           <image
             className="list-image"
-            src={`${OSS_FAST_PATH}/miniapp/broker/消息.png`}
+            src={x.avatarurl}
             alt=""
             srcset=""
           />
@@ -53,11 +64,13 @@ export default withLayout(() => {
       title: "数量（组）",
       width: "25%",
       dataIndex: "customerNum",
+      myRankRender:`${myRank.customerNum||0}组`,
     },
     {
       title: "佣金（元）",
-      width: "30%",
+      width: "25%",
       dataIndex: "totalCommission",
+      myRankRender:`${myRank.totalCommission||0}元`
     },
   ];
 
@@ -86,12 +99,7 @@ export default withLayout(() => {
     <view className="invitationList">
       <MyAchievement
         columns={columns}
-        data={{
-          a: 3,
-          name: "张三",
-          number: 4433,
-          key: 3,
-        }}
+        data={{...myRank,a:'*'}}
       />
       <AchievementList
         columns={columns}

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

@@ -14,8 +14,11 @@ import { querybkBankCard } from "@/services/broker";
 import "@/assets/css/iconfont.css";
 import "./index.scss";
 
-export default withLayout(() => {
+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({});
@@ -68,7 +71,7 @@ export default withLayout(() => {
     fetch({
       url: `${API_BIND_BROKER}`,
       method: "put",
-      payload: { ...FormData, bankCardList: bankCard },
+      payload: { ...FormData, bankCardList: bankCard, recommendAgent  },
     }).then(() => {
       Taro.showToast({
         title: "修改成功",