lisenzhou 2 년 전
부모
커밋
2fc2be224e
25개의 변경된 파일438개의 추가작업 그리고 402개의 파일을 삭제
  1. 19
    15
      src/components/brokerShare/index.jsx
  2. 6
    0
      src/constants/broker.js
  3. 3
    0
      src/pages/index/buildingDetail/components/DetailBottom/index.jsx
  4. 36
    30
      src/pages/index/components/NewestNnews/index.jsx
  5. 29
    17
      src/pages/index/components/NewestNnews/index.scss
  6. 1
    1
      src/pages/index/index.jsx
  7. 35
    17
      src/services/broker.js
  8. 19
    1
      src/subpackages/pages/broker/invitation/BottomAction.jsx
  9. 2
    1
      src/subpackages/pages/broker/invitation/index.config.js
  10. 16
    9
      src/subpackages/pages/broker/invitation/index.jsx
  11. 5
    12
      src/subpackages/pages/broker/invitation/poster/config.js
  12. 10
    73
      src/subpackages/pages/broker/invitation/poster/index.jsx
  13. 2
    4
      src/subpackages/pages/broker/invitation/poster/useCanvas.js
  14. 20
    26
      src/subpackages/pages/broker/invitation/poster/usePoster.js
  15. 101
    41
      src/subpackages/pages/broker/invitationlist/index.jsx
  16. 25
    2
      src/subpackages/pages/broker/invitationlist/index.scss
  17. 29
    36
      src/subpackages/pages/broker/myMessage/index.jsx
  18. 2
    76
      src/subpackages/pages/broker/rankingList/components/list/index.jsx
  19. 13
    0
      src/subpackages/pages/broker/rankingList/components/list/index.scss
  20. 0
    0
      src/subpackages/pages/broker/rankingList/components/list/item.jsx
  21. 1
    1
      src/subpackages/pages/broker/rankingList/components/myAchievement/index.jsx
  22. 10
    2
      src/subpackages/pages/broker/rankingList/index.jsx
  23. 31
    26
      src/subpackages/pages/broker/rankingList/invitationList/index.jsx
  24. 18
    10
      src/subpackages/pages/broker/rankingList/transactionList/index.jsx
  25. 5
    2
      src/subpackages/pages/broker/toBeBroker/index.jsx

+ 19
- 15
src/components/brokerShare/index.jsx 파일 보기

@@ -4,29 +4,33 @@ import { Image } from "@tarojs/components";
4 4
 import { getImgURL } from "@/utils/image";
5 5
 import "./index.scss";
6 6
 
7
+export const brokerShareLink = (buildingId) => Taro.navigateTo({
8
+  url: `/pages/mine/addCustomer/index?buildingId=${buildingId}`,
9
+});
10
+
7 11
 export default function ProjectListItem(props) {
8
-  const onClick =()=>{
9
-    Taro.navigateTo({ url: `/pages/mine/addCustomer/index?buildingId=${props.buildingId}` })
10
-  }
11 12
   return (
12
-    <view className='brokerShare flex-h' onClick={()=>onClick()}>
13
-      <view className='left'>
13
+    <view
14
+      className="brokerShare flex-h"
15
+      onClick={() => brokerShareLink(props.buildingId)}
16
+    >
17
+      <view className="left">
14 18
         <image
15
-          className='image'
19
+          className="image"
16 20
           src={`${OSS_FAST_PATH}/miniapp/broker/钱袋.png`}
17
-          alt=''
18
-          srcset=''
21
+          alt=""
22
+          srcset=""
19 23
         />
20
-       <text>靓盘好卖 闪付结佣</text>
24
+        <text>靓盘好卖 闪付结佣</text>
21 25
       </view>
22
-      <view className='right'>
23
-      <text>推荐好友</text>
24
-      
26
+      <view className="right">
27
+        <text>推荐好友</text>
28
+
25 29
         <image
26
-          className='image'
30
+          className="image"
27 31
           src={`${OSS_FAST_PATH}/miniapp/broker/分享.png`}
28
-          alt=''
29
-          srcset=''
32
+          alt=""
33
+          srcset=""
30 34
         />
31 35
       </view>
32 36
     </view>

+ 6
- 0
src/constants/broker.js 파일 보기

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

+ 3
- 0
src/pages/index/buildingDetail/components/DetailBottom/index.jsx 파일 보기

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

+ 36
- 30
src/pages/index/components/NewestNnews/index.jsx 파일 보기

@@ -1,51 +1,57 @@
1 1
 import { useState, useEffect } from "react";
2 2
 import { useSelector } from "react-redux";
3 3
 import Taro from "@tarojs/taro";
4
-import { queryActivityList } from "@/services/activity";
5
-import { Swiper, SwiperItem, Block } from "@tarojs/components";
4
+import { getbkNotice } from "@/services/broker";
5
+import { Swiper, SwiperItem, Block, View } from "@tarojs/components";
6 6
 import "@/assets/css/iconfont.css";
7 7
 import "./index.scss";
8 8
 
9 9
 export default function HotRecommend(props) {
10 10
   const { change = () => {} } = props;
11 11
   const city = useSelector((state) => state.city);
12
-  const [CurrentId, setCurrentId] = useState("dymic");
13
-  const [list, setList] = useState([[], []]);
12
+
13
+  const [list, setList] = useState([]);
14 14
   const [CurrentContentInfo, setCurrentContentInfo] = useState({});
15 15
 
16 16
   useEffect(() => {
17
-    if (city.curCity.name) {
18
-      GetRecommendActivity();
19
-    }
20
-  }, [city]);
21
-
22
-  const GetRecommendActivity = () => {
23
-    // queryActivityList({ home: 1, cityId: city.curCity.id, type: 'dymic' }).then((res) => {
24
-    //   const resArr = res.records || []
25
-    //   queryActivityList({ home: 1, cityId: city.curCity.id, type: 'house' }).then((subRes) => {
26
-    //     const subResArr = subRes.records || []
27
-    //     setList([resArr || [], subResArr || []])
28
-    //     change(resArr.length || subResArr.length)
29
-    //   })
30
-    // })
31
-  };
17
+    getbkNotice({ noticeType: "deal" })
18
+      .then((res) => {
19
+        // const resArr = res.records || []
20
+        setList(res.records);
21
+        change(res?.total);
22
+      })
23
+      .catch(() => {
24
+        change(0);
25
+      });
26
+  }, []);
32 27
 
33 28
   return (
34 29
     <view className="components NewestNnews">
35 30
       <view className="content">
36
-        <view className="icon">
37
-          <text className="iconfont icon-shoucang"></text>
38
-        </view>
39
-        <view className="newstype">成交喜报</view>
31
+        <image
32
+          className="newsimage"
33
+          src={`${OSS_FAST_PATH}/miniapp/broker/成交喜报.png`}
34
+          alt=""
35
+          srcset=""
36
+        />
37
+
40 38
         <view className="newstext">
41
-          <text
42
-            className="looptext"
43
-            style={{ animation: "10s loop linear infinite normal" }}
39
+          <Swiper
40
+            className="swiper"
41
+            indicatorColor="#999"
42
+            indicatorActiveColor="#333"
43
+            vertical
44
+            circular
45
+            autoplay
44 46
           >
45
-            <text>2222222222222222233333333333333333333333</text>
46
-            <text>9999999996666666666666665555555555555544</text>
47
-            <text>5548888888888888888777773333333333333222</text>
48
-          </text>
47
+            {list.map((item, index) => (
48
+              <SwiperItem className="swiper-item" key={`NewestNnews-${index}`}>
49
+                <View className="swiper-text">
50
+                  {item.buildingName}项目{item.personName}推荐客户{item.content}
51
+                </View>
52
+              </SwiperItem>
53
+            ))}
54
+          </Swiper>
49 55
         </view>
50 56
       </view>
51 57
     </view>

+ 29
- 17
src/pages/index/components/NewestNnews/index.scss 파일 보기

@@ -3,35 +3,47 @@
3 3
   overflow: visible;
4 4
   padding: 0 30px;
5 5
   margin-top: 40px;
6
-
6
+  box-sizing: border-box;
7
+  // height: 30px;
7 8
   .content {
8 9
     box-sizing: border-box;
9
-    padding: 13px 20px;
10
-    // height: 166px;
10
+    padding: 10px 20px;
11
+
11 12
     position: relative;
12
-    // overflow: hidden;
13
+    display: flex;
14
+    align-items: center;
13 15
 
14 16
     background: rgba(25, 60, 131, 0.08);
15 17
 
16 18
     border-radius: 8px;
17 19
     font-size: 28px;
18 20
     display: flex;
19
-    .icon {
20
-      width: 50px;
21
-      > text {
22
-        font-size: 44px;
23
-      }
24
-    }
25
-    .newstype{
21
+
22
+    .newsimage {
26 23
       width: 150px;
24
+      height: 30px;
25
+      margin-right: 20px;
27 26
     }
27
+
28 28
     .newstext {
29
-      overflow: hidden;
30
-      width: 500px;
31
-      .looptext {
32
-        display: inline-block;
33
-         text {
34
-          margin-right: 10px;
29
+      .swiper {
30
+        width: 480px;
31
+        height: 70px;
32
+
33
+        font-size: 28px;
34
+        font-family: HYk2gj;
35
+        font-weight: 400;
36
+
37
+        color: rgba(51, 51, 51, 0.99);
38
+        .swiper-item {
39
+         display: flex;
40
+         align-items: center;
41
+        }
42
+        .swiper-text {
43
+          // overflow: hidden;
44
+          // width: 480px;
45
+          // text-overflow: ellipsis;
46
+          // white-space: nowrap;
35 47
         }
36 48
       }
37 49
     }

+ 1
- 1
src/pages/index/index.jsx 파일 보기

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

+ 35
- 17
src/services/broker.js 파일 보기

@@ -1,43 +1,61 @@
1
-import { fetch } from '@/utils/request'
1
+import { fetch } from "@/utils/request";
2 2
 
3 3
 import {
4 4
   API_BK_AGREEMENT,
5 5
   API_BK_BANk_CARD,
6 6
   API_BROKER_LIST,
7 7
   API_BROKER_RANK,
8
-  API_BK_AGENT_RULE
9
-} from '@/constants/broker'
10
-
8
+  API_BK_AGENT_RULE,
9
+  API_BROKER_RANK_MINE,
10
+  API_BK_NOTICE,
11
+} from "@/constants/broker";
11 12
 
12 13
 /**
13 14
  * 获取佣金数据
14 15
  * @param {*} id
15 16
  */
16
-export const queryBkAgreement = (payload) => fetch({ url: `${API_BK_AGREEMENT}`, payload })
17
-
17
+export const queryBkAgreement = (payload) =>
18
+  fetch({ url: `${API_BK_AGREEMENT}`, payload });
18 19
 
19 20
 /**
20 21
  * 获取银行卡
21
- * @param {*} 
22
+ * @param {*}
22 23
  */
23
- export const querybkBankCard = (payload) => fetch({ url: `${API_BK_BANk_CARD}`, payload })
24
-
24
+export const querybkBankCard = (payload) =>
25
+  fetch({ url: `${API_BK_BANk_CARD}`, payload });
25 26
 
26 27
 /**
27 28
  * 邀请的经纪人列表
28
- * @param {*} 
29
+ * @param {*}
29 30
  */
30
- export const querybrokerList = (payload) => fetch({ url: `${API_BROKER_LIST}`, payload })
31
+export const querybrokerList = (payload) =>
32
+  fetch({ url: `${API_BROKER_LIST}`, payload });
31 33
 
32
- /**
34
+/**
33 35
  * 经纪人排行榜
34
- * @param {*} 
36
+ * @param {*}
35 37
  */
36
-  export const queryBrokerRank = (payload) => fetch({ url: `${API_BROKER_RANK}`, payload })
38
+export const queryBrokerRank = (payload) =>
39
+  fetch({ url: `${API_BROKER_RANK}`, payload });
37 40
 
41
+/**
42
+ * 经纪人排行榜 我的
43
+ * @param {*}
44
+ */
45
+export const queryBrokerRankMine = (payload) =>
46
+  fetch({ url: `${API_BROKER_RANK_MINE}`, payload });
38 47
 
39
-   /**
48
+/**
40 49
  * 经纪人规则
41
- * @param {*} 
50
+ * @param {*}
51
+ */
52
+export const getbkAgentRule = (payload) =>
53
+  fetch({ url: `${API_BK_AGENT_RULE}`, payload });
54
+
55
+/**
56
+ * 消息
57
+ * @param {*}
58
+ *            noticeType=deal  成交喜报  noticeType=status-change&mine=true
42 59
  */
43
-    export const getbkAgentRule = (payload) => fetch({ url: `${API_BK_AGENT_RULE}`, payload })
60
+export const getbkNotice = (payload) =>
61
+  fetch({ url: `${API_BK_NOTICE}`, payload });

+ 19
- 1
src/subpackages/pages/broker/invitation/BottomAction.jsx 파일 보기

@@ -1,4 +1,5 @@
1 1
 import { Button, View, Navigator, Image } from "@tarojs/components";
2
+import Taro from '@tarojs/taro'
2 3
 import { useState } from "react";
3 4
 import { getImgURL } from "@/utils/image";
4 5
 import "./index.scss";
@@ -8,13 +9,30 @@ export default (props) => {
8 9
 
9 10
   // const [showPoter, setShowPoster] = useState(true);
10 11
 
12
+
13
+  const onLinkShare = () =>{
14
+
15
+    Taro.showModal({
16
+      title: '点击右上角,分享给好友',
17
+      confirmText:'我知道了',
18
+      showCancel:false,
19
+      success: function (res) {
20
+        if (res.confirm) {
21
+          console.log('用户点击确定')
22
+        } else if (res.cancel) {
23
+          console.log('用户点击取消')
24
+        }
25
+      }
26
+    })
27
+  }
28
+
11 29
   return (
12 30
     <View className="invitation-bottom">
13 31
       <View className="Btn">
14 32
         <Button onClick={() => onPoster(true)}>海报分享</Button>
15 33
       </View>
16 34
       <View className="Btn">
17
-        <Button className="default">链接转发</Button>
35
+        <Button className="default" onClick={()=>onLinkShare()}>链接转发</Button>
18 36
       </View>
19 37
       <View className="invitation-bottom-links">
20 38
         <View>

+ 2
- 1
src/subpackages/pages/broker/invitation/index.config.js 파일 보기

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

+ 16
- 9
src/subpackages/pages/broker/invitation/index.jsx 파일 보기

@@ -6,6 +6,7 @@ import usePoster from "./poster/usePoster";
6 6
 import Poster from "./poster";
7 7
 import BottomAction from "./BottomAction";
8 8
 import { useEffect, useState } from "react";
9
+import { useShareAppMessage } from "@tarojs/taro";
9 10
 
10 11
 const defaultImage =
11 12
   "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) => {
14 15
   const { router, person } = props;
15 16
   const [posterImg, setPosterImg] = useState();
16 17
   const [showPoster, setShowPoster] = useState(false);
17
-  // 'subpackages/pages/broker/toBeBroker/index'
18
+  // subpackages/pages/broker/toBeBroker/index
19
+  useShareAppMessage((res) => {
20
+    return {
21
+      title: "全民经纪人,一荐值万金",
22
+      path: `subpackages/pages/broker/toBeBroker/index?recommendAgent=${person.personId}`,
23
+    };
24
+  });
25
+
18 26
   const posterData = usePoster(
19 27
     posterImg,
20
-    "pages/mine/index",
28
+    "subpackages/pages/broker/toBeBroker/index",
21 29
     `recommendAgent=${person.personId}`
22 30
   );
23 31
   useEffect(() => {
@@ -25,7 +33,7 @@ export default withLayout((props) => {
25 33
       setPosterImg(res.poster);
26 34
     });
27 35
   }, []);
28
-  console.log(showPoster, "showPoster");
36
+
29 37
   return (
30 38
     <>
31 39
       <View className="invitation-iframe">
@@ -34,14 +42,13 @@ export default withLayout((props) => {
34 42
           posterImg={posterImg}
35 43
           onPoster={() => setShowPoster(true)}
36 44
         />
37
-        
38 45
       </View>
39 46
       <Poster
40
-          show={showPoster}
41
-          dataSource={posterData}
42
-          onClose={() => setShowPoster(false)}
43
-          onSuccess={() => setShowPoster(false)}
44
-        />
47
+        show={showPoster}
48
+        dataSource={posterData}
49
+        onClose={() => setShowPoster(false)}
50
+        onSuccess={() => setShowPoster(false)}
51
+      />
45 52
     </>
46 53
   );
47 54
 });

+ 5
- 12
src/subpackages/pages/broker/invitation/poster/config.js 파일 보기

@@ -19,33 +19,26 @@ export function getConfig() {
19 19
   // 图片
20 20
   const poster = {
21 21
     width: canvas.width,
22
-    height: canvas.width * 3 / 2, // 图片宽高 9 : 16 占用 canvas 80%
22
+    height: canvas.height, 
23 23
     x: 0,
24 24
     y: 0,
25 25
   }
26 26
 
27
-  const marign = 22.5;
28
-  const innerMargin = 15
29 27
 
30
-
31
-console.log(canvas,'canvas')
32 28
   // 小程序码
33 29
   const miniCode = {
34 30
     arc: true,
35
-    width: 125,
36
-    height: 125,
37
-    x: 30,  // 99 是宽度
38
-    y: canvas.height - 230,
31
+    width: canvas.width /3,
32
+    height:  canvas.width /3,
33
+    x: canvas.width / 3,  
34
+    y: canvas.height - canvas.width /3 - 100, //100是距离底部的位置
39 35
   }
40 36
 
41 37
 
42
-
43
-
44 38
   return {
45 39
     systemInfo,
46 40
     canvas,
47 41
     poster,
48 42
     miniCode,
49
-
50 43
   }
51 44
 }

+ 10
- 73
src/subpackages/pages/broker/invitation/poster/index.jsx 파일 보기

@@ -13,14 +13,14 @@ export default (props) => {
13 13
     dataSource,
14 14
     onClose,
15 15
     onSuccess,
16
-    title = "保存后分享图片",
17
-    btnText = "保存海报至相册",
18 16
   } = props;
19 17
 
20 18
   const [img, setImg] = useState();
21 19
   const [processing, setProcessing] = useState(false);
22
-  const [loading, setLoading] = useState(false);
20
+
23 21
   const [canvasInited, setCanvasInited] = useState(false);
22
+
23
+  
24 24
   const posterRender = useRef();
25 25
 
26 26
   useCanvas("canvas-broker-poster", (fn) => {
@@ -28,58 +28,6 @@ export default (props) => {
28 28
     setCanvasInited(true);
29 29
   });
30 30
 
31
-  // const handlePoster = (url, sdk) => {
32
-  //   setImg(url)
33
-  //   setProcessing(false)
34
-  //   sdkRef.current = sdk
35
-  // }
36
-
37
-  const handleSave = () => {
38
-    if (!img) {
39
-      Taro.showToast({
40
-        title: "海报未生成, 请稍后",
41
-        icon: "none",
42
-      });
43
-      return;
44
-    }
45
-
46
-    // 保存到相册
47
-    setLoading(true);
48
-    save2Album(img).then(
49
-      () => {
50
-        setLoading(false);
51
-        onSuccess();
52
-        Taro.showToast({ title: "保存成功", icon: "none" });
53
-      },
54
-      () => setLoading(false)
55
-    );
56
-
57
-    // sdkRef.current.download().then((tempPath) => {
58
-    //   console.log('------poster----tempPath---', tempPath, new Date().valueOf())
59
-
60
-    //   Taro.previewImage({
61
-    //     urls: [tempPath]
62
-    //   })
63
-
64
-    //   // save2Album(tempPath).then(() => {
65
-    //   //   setLoading(false)
66
-    //   //   onSuccess()
67
-    //   //   Taro.showToast({ title: '保存成功', icon: 'none' })
68
-    //   // }, () => setLoading(false))
69
-    // }).catch((err) => {
70
-    //   setLoading(false)
71
-    //   console.error(err)
72
-    //   const message = err.errMsg || err.message || err
73
-    //   Taro.showToast({
74
-    //     title: message,
75
-    //     icon: 'none',
76
-    //   })
77
-    // })
78
-  };
79
-
80
-  const handleImage = (e) => {
81
-    Taro.previewImage({ current: img, urls: [img], showmenu: true });
82
-  };
83 31
 
84 32
   useEffect(() => {
85 33
     if (dataSource && canvasInited) {
@@ -87,32 +35,21 @@ export default (props) => {
87 35
       setProcessing(true);
88 36
       getPoster(dataSource)
89 37
         .then((image) => {
90
-          // 生成临时文件
91
-          const base64 = image.split("base64,")[1];
92
-          base64ToFile(base64)
93
-            .then((tmpFile) => {
94
-              setImg(tmpFile);
95
-              setProcessing(false);
96
-            })
97
-            .catch((err) => {
98
-              setProcessing(false);
99
-              Taro.showToast({
100
-                title: err.errMsg,
101
-                icon: "none",
102
-              });
103
-            });
38
+        
39
+          setImg(image);
40
+
41
+          setProcessing(false);
42
+       
104 43
         })
105 44
         .catch(() => {
106 45
           setProcessing(false);
107 46
         });
108 47
     }
109 48
   }, [dataSource, canvasInited]);
110
-  console.log(show, "show");
49
+
111 50
   return (
112
-    // <Modal title={title} visible={show} onClose={onClose}>
113
-    // eslint-disable-next-line react/jsx-no-undef
114 51
     <>
115
-      {!show && (
52
+      {show && (
116 53
         <View className="container" onClick={() => onClose()}>
117 54
           <view className="centerLabel">
118 55
             <view>

+ 2
- 4
src/subpackages/pages/broker/invitation/poster/useCanvas.js 파일 보기

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

+ 20
- 26
src/subpackages/pages/broker/invitation/poster/usePoster.js 파일 보기

@@ -1,36 +1,30 @@
1
-import { useEffect, useState } from 'react'
2
-import { getMiniQrcode } from '@/services/common'
1
+import { useEffect, useState } from "react";
2
+import { getMiniQrcode } from "@/services/common";
3 3
 
4
-export default function usePoster( poster, page, params) {
5
-  const [posterData, setPosterData] = useState()
4
+export default function usePoster(poster, page, params) {
5
+  const [posterData, setPosterData] = useState();
6 6
 
7 7
   useEffect(() => {
8 8
     if (poster) {
9 9
       // const page = router.path.indexOf('/') === 0 ? router.path.substring(1) : router.path
10
-      const scene = params
10
+      const scene = params;
11 11
 
12
-         setPosterData({
13
-          poster,
14
-          miniCode: 'https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1635430528241-c9a8f2c8-8edb-4684-a39c-c83af007ec918733913667837026296.jpg',
15
-          
12
+      getMiniQrcode({ page, scene, is_hyaline: false })
13
+        .then((miniCode) => {
14
+          setPosterData({
15
+            poster,
16
+            miniCode,
17
+          });
16 18
         })
17
-     
18
-      // getMiniQrcode({ page, scene,is_hyaline :false}).then((miniCode) => {
19
-      //   setPosterData({
20
-      //     poster,
21
-      //     miniCode,
22
-          
23
-      //   })
24
-      // }).catch(() => {
25
-      //   setPosterData({
26
-      //     poster,
27
-      //     miniCode: undefined,
28
-        
29
-      //   })
30
-      // })
19
+        .catch(() => {
20
+          setPosterData({
21
+            poster,
22
+            miniCode: undefined,
23
+          });
24
+        });
31 25
     }
32
-  // eslint-disable-next-line react-hooks/exhaustive-deps
33
-  }, [ poster])
26
+    // eslint-disable-next-line react-hooks/exhaustive-deps
27
+  }, [poster]);
34 28
 
35
-  return posterData
29
+  return posterData;
36 30
 }

+ 101
- 41
src/subpackages/pages/broker/invitationlist/index.jsx 파일 보기

@@ -1,31 +1,73 @@
1 1
 import withLayout from "@/layout";
2 2
 import Taro from "@tarojs/taro";
3
-import { View, Image, Text } from "@tarojs/components";
3
+import { View, Image, Text, ScrollView } from "@tarojs/components";
4 4
 
5 5
 import "./index.scss";
6 6
 import { useState, useEffect } from "react";
7
-import { querybrokerList } from "@/services/broker";
7
+import { querybrokerList, queryBrokerRankMine } from "@/services/broker";
8 8
 import { formatDate } from "@/utils/chatDate";
9 9
 export default withLayout(() => {
10 10
   const [list, setList] = useState([]);
11
-  const [total, setTotal] = useState(0);
11
+  const [total, setTotal] = useState();
12
+
13
+  // useEffect(() => {
14
+  //   getList();
15
+  // }, []);
16
+
17
+  // const getList = () => {
18
+
19
+  // };
20
+
21
+  const [IsPull, setPull] = useState(false);
22
+
23
+  const [pageNumber, setPageNumber] = useState(1);
24
+  const [HasNextPage, setHasNextPage] = useState(true);
25
+
12 26
   useEffect(() => {
13
-    getList();
14
-  }, []);
27
+    if (pageNumber) {
28
+      GetPageList();
29
+    }
30
+  }, [pageNumber]);
15 31
 
16
-  const getList = () => {
17
-    querybrokerList().then((res) => {
18
-      setList([...res.records, ...res.records]);
32
+  const GetPageList = () => {
33
+    setHasNextPage(false);
34
+    //   querybrokerList().then((res) => {
35
+    //     setList([...res.records]);
36
+    //     setTotal(res.total);
37
+    //   });
38
+    querybrokerList({ pageNumber, pageSize: 10 }).then((res) => {
39
+      setList(
40
+        pageNumber === 1 ? res.records || [] : list.concat(res.records || [])
41
+      );
19 42
       setTotal(res.total);
43
+      setHasNextPage(res.current < res.pages);
44
+      setPull(false);
20 45
     });
21 46
   };
22 47
 
48
+  const PageLoadMore = () => {
49
+    // 页面上拉加载更多
50
+    if (HasNextPage) {
51
+      setPageNumber(pageNumber + 1);
52
+    }
53
+  };
54
+
55
+  useEffect(() => {
56
+    // 下拉刷新触发
57
+    if (IsPull) {
58
+      if (pageNumber === 1) {
59
+        GetPageList();
60
+      } else {
61
+        setPageNumber(1);
62
+      }
63
+    }
64
+  }, [IsPull]);
65
+
23 66
   const img1 =
24 67
     "https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/broker/%E9%82%80%E8%AF%B7%E5%A5%96%E5%8A%B1.png";
25 68
   const img2 =
26 69
     "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";
27
-  const defaultRuleImage =
28
-    "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";
70
+
29 71
   return (
30 72
     <View className="invitationlist-background">
31 73
       <View>
@@ -42,7 +84,7 @@ export default withLayout(() => {
42 84
           邀请奖励
43 85
         </View>
44 86
         <View className="invitationlist-background-2">
45
-          <View className="invitationlist-font-tl">{total}</View>
87
+          <View className="invitationlist-font-tl">{total || 0}</View>
46 88
           <View
47 89
             className="invitationlist-font-right-t"
48 90
             onClick={() => {
@@ -56,37 +98,55 @@ export default withLayout(() => {
56 98
           </View>
57 99
         </View>
58 100
       </View>
59
-      <View className="invitationlist-view-list">
60
-        {list.map((item) => {
61
-          return (
62
-            <View key={item.personId} className="invitationlist-view-item">
63
-              <View className="invitationlist-img-frame">
64
-                <Image
65
-                  className="invitationlist-img-head"
66
-                  src={item.avatarurl}
67
-                />
68
-              </View>
69
-              <View className="invitationlist-view-list-ifr">
70
-                <Text className="invitationlist-text-1">{item.name}</Text>
71
-                <Text className="invitationlist-text">
72
-                  {item.customerNum || 0}
73
-                </Text>
74
-                <Text className="invitationlist-text">
75
-                  {item.brokerNum || 0}
76
-                </Text>
77
-                <Text className="invitationlist-time">2022/07/26</Text>
101
+      <ScrollView
102
+        scroll-y
103
+        refresher-triggered={IsPull}
104
+        onscrolltolower={PageLoadMore}
105
+        refresher-background="#fff"
106
+      >
107
+        <View className="invitationlist-view-list">
108
+          {list?.map((item) => {
109
+            return (
110
+              <View key={item.personId} className="invitationlist-view-item">
111
+                <View className="invitationlist-img-frame">
112
+                  <Image
113
+                    className="invitationlist-img-head"
114
+                    src={item.avatarurl}
115
+                  />
116
+                </View>
117
+                <View className="invitationlist-view-list-ifr">
118
+                  <Text className="invitationlist-text-1">{item.name}</Text>
119
+                  <Text className="invitationlist-text">
120
+                    {item.customerNum || 0}
121
+                  </Text>
122
+                  <Text className="invitationlist-text">
123
+                    {item.brokerNum || 0}
124
+                  </Text>
125
+                  <Text className="invitationlist-time">2022/07/26</Text>
126
+                </View>
127
+                <View className="invitationlist-view-list-ifr-t">
128
+                  <Text className="invitationlist-text-t1">{item.phone}</Text>
129
+                  <Text className="invitationlist-text-t">客户(组)</Text>
130
+                  <Text className="invitationlist-text-t">成交(组)</Text>
131
+                  <Text className="invitationlist-time-t">12:00</Text>
132
+                </View>
133
+                <View className="invitationlist-border"></View>
78 134
               </View>
79
-              <View className="invitationlist-view-list-ifr-t">
80
-                <Text className="invitationlist-text-t1">{item.phone}</Text>
81
-                <Text className="invitationlist-text-t">客户(组)</Text>
82
-                <Text className="invitationlist-text-t">成交(组)</Text>
83
-                <Text className="invitationlist-time-t">12:00</Text>
84
-              </View>
85
-              <View className="invitationlist-border"></View>
86
-            </View>
87
-          );
88
-        })}
89
-      </View>
135
+            );
136
+          })}
137
+          {total > 0 && (
138
+            <view className="PageBottom">
139
+              <text>已经到底了~</text>
140
+            </view>
141
+          )}
142
+          {total === 0 && (
143
+            <view className="NoData centerLabel">
144
+              <text className="iconfont icon-nodata"></text>
145
+              <text>暂无数据~</text>
146
+            </view>
147
+          )}
148
+        </View>
149
+      </ScrollView>
90 150
     </View>
91 151
   );
92 152
 });

+ 25
- 2
src/subpackages/pages/broker/invitationlist/index.scss 파일 보기

@@ -65,7 +65,7 @@
65 65
   }
66 66
   .invitationlist-view-list{
67 67
     flex: 1;
68
-    height: 150rpx;
68
+    height: calc(100vh - 350px);
69 69
     width: 100%;
70 70
     display: inline-block;
71 71
     margin-top: 52rpx;
@@ -139,5 +139,28 @@
139 139
       border-bottom: 1rpx solid rgba(25, 60, 131, 0.2);
140 140
     }
141 141
   }
142
-  
142
+  .NoData {
143
+    >text {
144
+      display: block;
145
+      text-align: center;
146
+      font-size: 28px;
147
+      color: #ccc;
148
+      &.iconfont {
149
+        font-size: 160px;
150
+        margin-bottom: 40px;
151
+      }
152
+    }
153
+  }
154
+  .PageBottom {
155
+    text-align: center;
156
+    font-size: 0;
157
+    white-space: nowrap;
158
+    > text {
159
+      display: inline-block;
160
+      font-size: 28px;
161
+      color: #666;
162
+      line-height: 40px;
163
+      margin: 20px auto;
164
+    }
165
+  }
143 166
 }

+ 29
- 36
src/subpackages/pages/broker/myMessage/index.jsx 파일 보기

@@ -5,14 +5,14 @@ import { ScrollView } from "@tarojs/components";
5 5
 import "@/assets/css/iconfont.css";
6 6
 import { fetch } from "@/utils/request";
7 7
 import { API_NEWS_LIST } from "@/constants/api";
8
+import { getbkNotice } from "@/services/broker";
8 9
 import MessageTime from "./components/messageTime";
9 10
 import MessageItem from "./components/messageItem";
10 11
 import "./index.scss";
11 12
 
12 13
 export default withLayout((props) => {
13 14
   const [PageList, setPageList] = useState([]);
14
-  const [IsPull, setPull] = useState(false);
15
-  const [PersonId, setPersonId] = useState(null);
15
+
16 16
   const [pageNumber, setPageNumber] = useState(1);
17 17
   const [HasNextPage, setHasNextPage] = useState(true);
18 18
 
@@ -20,56 +20,49 @@ export default withLayout((props) => {
20 20
     GetPageList();
21 21
   }, [pageNumber]);
22 22
 
23
-  const PageRefresh = () => {
24
-    // 页面下拉刷新回调
25
-    setPull(true);
26
-  };
27
-
28 23
   const GetPageList = () => {
29 24
     setHasNextPage(false);
30
-    // fetch({ url: API_NEWS_LIST, method: 'get', payload: { pageNumber, pageSize: 10, cityId: city.id } }).then((res) => {
31
-    //   setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
32
-    //   setHasNextPage(res.current < res.pages)
33
-    //   setPull(false)
34
-    // })
25
+    getbkNotice({
26
+      pageNumber,
27
+      pageSize: 10,
28
+      noticeType: "status-change",
29
+      mine: true,
30
+    })
31
+      .then((res) => {
32
+        setPageList(
33
+          pageNumber === 1
34
+            ? res.records || []
35
+            : PageList.concat(res.records || [])
36
+        );
37
+        setHasNextPage(res.current < res.pages);
38
+      })
39
+      .catch(() => {
40
+        change(0);
41
+      });
35 42
   };
36 43
 
37 44
   const PageLoadMore = () => {
38 45
     // 页面上拉加载更多
39
-    // if(HasNextPage) {
40
-    //   setPageNumber(pageNumber + 1)
41
-    // }
46
+    if (HasNextPage) {
47
+      setPageNumber(pageNumber + 1);
48
+    }
42 49
   };
43 50
 
44
-  useEffect(() => {
45
-    // 下拉刷新触发
46
-    // if (IsPull) {
47
-    //   if(pageNumber === 1) {
48
-    //     GetPageList()
49
-    //   } else {
50
-    //     setPageNumber(1)
51
-    //   }
52
-    // }
53
-  }, [IsPull]);
54
-
55 51
   return (
56 52
     <view className="Page myMessage">
57 53
       <ScrollView
58 54
         scroll-y
59
-        refresher-enabled
60
-        refresher-triggered={IsPull}
61
-        onrefresherrefresh={PageRefresh}
62 55
         refresher-background="#F8F8F8"
63 56
         onscrolltolower={PageLoadMore}
64 57
       >
65 58
         <view className="PageContent">
66
-          {/* {PageList.map((item, index) => (
67
-            <NewsListItem data={item} key={`ListItem-${index}`}></NewsListItem>
68
-          ))} */}
69
-          <MessageTime time="2022-07-31 9:52:14" />
70
-          <MessageItem
71
-            message="尊贵的李先生,您好!衷心的感谢您对xx地产的 关注和支持!经确认,您于2022年7月22日签署了.尊贵的李先生,您好!衷心的感谢您对xx地产的 关注和支持!经确认,您于2022年7月22日签署了"
72
-          />
59
+          {PageList.map((item, index) => (
60
+            <view>
61
+              <MessageTime time="2022-07-31 9:52:14" />
62
+              <MessageItem message="尊贵的李先生,您好!衷心的感谢您对xx地产的 关注和支持!经确认,您于2022年7月22日签署了.尊贵的李先生,您好!衷心的感谢您对xx地产的 关注和支持!经确认,您于2022年7月22日签署了" />
63
+            </view>
64
+          ))}
65
+
73 66
           {/* bottom */}
74 67
           <view className="PageBottom">
75 68
             <text>已经到底了~</text>

+ 2
- 76
src/subpackages/pages/broker/rankingList/components/list/index.jsx 파일 보기

@@ -90,84 +90,10 @@ export default withLayout((props) => {
90 90
           })}
91 91
         </view>
92 92
 
93
-        {/* <view className="PageBottom">
93
+        <view className="PageBottom">
94 94
           <text>已经到底了~</text>
95
-        </view> */}
95
+        </view>
96 96
       </ScrollView>
97 97
     </view>
98 98
   );
99 99
 });
100
-
101
-// import { useState, useEffect } from 'react'
102
-// import { useSelector } from 'react-redux'
103
-// import { useRouter } from '@tarojs/taro'
104
-// import { ScrollView } from '@tarojs/components'
105
-
106
-// import Item from './Item'
107
-
108
-// import './index.scss'
109
-
110
-// export default function MyCollectForActivity () {
111
-
112
-//  const router=useRouter()
113
-//    const { type,buildingId } = router.params;
114
-
115
-//   const [PageList, setPageList] = useState([{},{},{},{},{},{},{},{},{},{}])
116
-//   const [IsPull, setPull] = useState(false)
117
-
118
-//   const [pageNumber, setPageNumber] = useState(1)
119
-//   const [HasNextPage, setHasNextPage] = useState(true)
120
-
121
-//   useEffect(() => {
122
-//     if(pageNumber) {
123
-//     //   GetPageList()
124
-//     }
125
-//   }, [pageNumber])
126
-
127
-//   const PageRefresh = () => { // 页面下拉刷新回调
128
-//     // setPull(true)
129
-//   }
130
-
131
-//   const GetPageList = () => {
132
-//     setHasNextPage(false)
133
-
134
-//   }
135
-
136
-//   const PageLoadMore = () => { // 页面上拉加载更多
137
-//     if(HasNextPage) {
138
-//       setPageNumber(pageNumber + 1)
139
-//     }
140
-//   }
141
-
142
-//   useEffect(() => { // 下拉刷新触发
143
-//     // if (IsPull) {
144
-//     //   if(pageNumber === 1) {
145
-//     //     GetPageList()
146
-//     //   } else {
147
-//     //     setPageNumber(1)
148
-//     //   }
149
-//     // }
150
-//   }, [IsPull])
151
-
152
-//   return (
153
-//     <view className='components myWalletList'>
154
-//       <ScrollView scroll-y  refresher-triggered={IsPull}  onscrolltolower={PageLoadMore} refresher-background='#fff'>
155
-//         <view className='PageContent'>
156
-//           <view className='List'>
157
-//             {
158
-//               PageList.map((item, index) => (
159
-//                 <Item data={item} key={`myWalletList-${index}`}></Item>
160
-//               ))
161
-//             }
162
-//           </view>
163
-
164
-//           {/* bottom */}
165
-//           <view className='PageBottom'>
166
-//             <text>已经到底了~</text>
167
-//           </view>
168
-//         </view>
169
-
170
-//       </ScrollView>
171
-//     </view>
172
-//   )
173
-// }

+ 13
- 0
src/subpackages/pages/broker/rankingList/components/list/index.scss 파일 보기

@@ -14,6 +14,19 @@
14 14
       justify-content: space-around;
15 15
       align-items: center;
16 16
       padding: 16px 0;
17
+      border-bottom: 1px solid rgba(0, 0, 0, 0.0800);
18
+    }
19
+  }
20
+   .PageBottom {
21
+    text-align: center;
22
+    font-size: 0;
23
+    white-space: nowrap;
24
+    > text {
25
+      display: inline-block;
26
+      font-size: 28px;
27
+      color: #666;
28
+      line-height: 40px;
29
+      margin: 20px auto;
17 30
     }
18 31
   }
19 32
 }

+ 0
- 0
src/subpackages/pages/broker/rankingList/components/list/item.jsx 파일 보기


+ 1
- 1
src/subpackages/pages/broker/rankingList/components/myAchievement/index.jsx 파일 보기

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

+ 10
- 2
src/subpackages/pages/broker/rankingList/index.jsx 파일 보기

@@ -10,11 +10,19 @@ import { API_EDIT_AGENT, API_UPDATE_PHOTO } from "@/constants/api";
10 10
 import store from "@/store";
11 11
 import InvitationList from "./invitationList";
12 12
 import TransactionList from "./transactionList";
13
+import {queryBrokerRankMine} from '@/services/broker'
13 14
 import "@/assets/css/iconfont.css";
14 15
 import "./index.scss";
15 16
 
16 17
 export default withLayout(() => {
17 18
   const [activeKey, setActiveKey] = useState(1);
19
+  const [myRank,setMyRank] = useState({})
20
+
21
+  useEffect(()=>{
22
+    queryBrokerRankMine().then(res=>{
23
+      setMyRank(res)
24
+    })
25
+  },[])
18 26
   return (
19 27
     <view className="rankingList">
20 28
       <view className="rankingList-backimage">
@@ -42,11 +50,11 @@ export default withLayout(() => {
42 50
         </view>
43 51
         <view className="bottom">
44 52
           <view style={{display:activeKey==1?'block':'none'}}>
45
-            <InvitationList />
53
+            <InvitationList myRank={myRank}/>
46 54
           </view>
47 55
           <view style={{display:activeKey==2?'block':'none'}}>
48 56
 
49
-            <TransactionList />
57
+            <TransactionList myRank={myRank}/>
50 58
           </view>
51 59
 
52 60
           {/* <view></view> */}

+ 31
- 26
src/subpackages/pages/broker/rankingList/invitationList/index.jsx 파일 보기

@@ -10,33 +10,45 @@ import store from "@/store";
10 10
 import "@/assets/css/iconfont.css";
11 11
 import "./index.scss";
12 12
 
13
-export default withLayout(() => {
14
-
13
+export default withLayout((props) => {
14
+  const { myRank } = props;
15 15
 
16 16
   const columns = [
17 17
     {
18 18
       title: "排名",
19
-      width: "30%",
19
+      width: "20%",
20 20
       dataIndex: "a",
21
+      style: {
22
+        textAlign: "left",
23
+      },
24
+      myRankRender:'*',
21 25
       render: (x, index) => {
22
-        if (index >= 3) {
23
-          return index + 1;
24
-        } else {
25
-          return (
26
-            <image
27
-              className="rank-image"
28
-              src={`${OSS_FAST_PATH}/miniapp/broker/${index + 1}.png`}
29
-              alt=""
30
-              srcset=""
31
-            />
32
-          );
33
-        }
26
+        return (
27
+          <view>
28
+            {index <= 3 ? (
29
+              <image
30
+                className="rank-image"
31
+                src={`${OSS_FAST_PATH}/miniapp/broker/${index + 1}.png`}
32
+                alt=""
33
+                srcset=""
34
+              />
35
+            ) : (
36
+              index + 1
37
+            )}
38
+          </view>
39
+        );
34 40
       },
35 41
     },
36 42
     {
37 43
       title: "经纪人",
38
-      width: "30%",
44
+      width: "50%",
39 45
       dataIndex: "name",
46
+      myRankRender: (
47
+        <view>
48
+          <image className="list-image" src={myRank.avatarurl} alt="" srcset="" />
49
+          {myRank.name}
50
+        </view>
51
+      ),
40 52
       render: (x) => (
41 53
         <view>
42 54
           <image className="list-image" src={x.avatarurl} alt="" srcset="" />
@@ -46,8 +58,9 @@ export default withLayout(() => {
46 58
     },
47 59
     {
48 60
       title: "邀请人(个)",
49
-      width: "40%",
61
+      width: "30%",
50 62
       dataIndex: "brokerNum",
63
+      myRankRender:`${myRank.brokerNum||0}个`,
51 64
     },
52 65
   ];
53 66
 
@@ -74,15 +87,7 @@ export default withLayout(() => {
74 87
 
75 88
   return (
76 89
     <view className="invitationList">
77
-      <MyAchievement
78
-        columns={columns}
79
-        data={{
80
-          a: 3,
81
-          name: "张三",
82
-          number: 4433,
83
-          key: 3,
84
-        }}
85
-      />
90
+      <MyAchievement columns={columns} data={{ ...myRank, a: "*" }} />
86 91
       <AchievementList
87 92
         columns={columns}
88 93
         params={{ rankType: "person" }}

+ 18
- 10
src/subpackages/pages/broker/rankingList/transactionList/index.jsx 파일 보기

@@ -12,12 +12,14 @@ import store from "@/store";
12 12
 import "@/assets/css/iconfont.css";
13 13
 import "./index.scss";
14 14
 
15
-export default withLayout(() => {
15
+export default withLayout((props) => {
16
+  const {myRank} = props
16 17
   const columns = [
17 18
     {
18 19
       title: "排名",
19
-      width: "15%",
20
+      width: "20%",
20 21
       dataIndex: "a",
22
+      myRankRender:'*',
21 23
       render: (x, index) => {
22 24
         if (index >= 3) {
23 25
           return index + 1;
@@ -37,11 +39,20 @@ export default withLayout(() => {
37 39
       title: "姓名",
38 40
       width: "30%",
39 41
       dataIndex: "name",
42
+      myRankRender: <view>
43
+      <image
44
+        className="list-image"
45
+        src={myRank.avatarurl}
46
+        alt=""
47
+        srcset=""
48
+      />
49
+      {myRank.name}
50
+    </view>,
40 51
       render: (x) => (
41 52
         <view>
42 53
           <image
43 54
             className="list-image"
44
-            src={`${OSS_FAST_PATH}/miniapp/broker/消息.png`}
55
+            src={x.avatarurl}
45 56
             alt=""
46 57
             srcset=""
47 58
           />
@@ -53,11 +64,13 @@ export default withLayout(() => {
53 64
       title: "数量(组)",
54 65
       width: "25%",
55 66
       dataIndex: "customerNum",
67
+      myRankRender:`${myRank.customerNum||0}组`,
56 68
     },
57 69
     {
58 70
       title: "佣金(元)",
59
-      width: "30%",
71
+      width: "25%",
60 72
       dataIndex: "totalCommission",
73
+      myRankRender:`${myRank.totalCommission||0}元`
61 74
     },
62 75
   ];
63 76
 
@@ -86,12 +99,7 @@ export default withLayout(() => {
86 99
     <view className="invitationList">
87 100
       <MyAchievement
88 101
         columns={columns}
89
-        data={{
90
-          a: 3,
91
-          name: "张三",
92
-          number: 4433,
93
-          key: 3,
94
-        }}
102
+        data={{...myRank,a:'*'}}
95 103
       />
96 104
       <AchievementList
97 105
         columns={columns}

+ 5
- 2
src/subpackages/pages/broker/toBeBroker/index.jsx 파일 보기

@@ -14,8 +14,11 @@ import { querybkBankCard } from "@/services/broker";
14 14
 import "@/assets/css/iconfont.css";
15 15
 import "./index.scss";
16 16
 
17
-export default withLayout(() => {
17
+export default withLayout((props) => {
18 18
   const { dispatch } = store;
19
+  const {router} = props
20
+  const recommendAgent =  router?.params?.recommendAgent
21
+ console.log(recommendAgent,'==')
19 22
 
20 23
   const user = useSelector((state) => state.user);
21 24
   const [UserInfo, setUserInfo] = useState({});
@@ -68,7 +71,7 @@ export default withLayout(() => {
68 71
     fetch({
69 72
       url: `${API_BIND_BROKER}`,
70 73
       method: "put",
71
-      payload: { ...FormData, bankCardList: bankCard },
74
+      payload: { ...FormData, bankCardList: bankCard, recommendAgent  },
72 75
     }).then(() => {
73 76
       Taro.showToast({
74 77
         title: "修改成功",