fix

project.config.json

@@ -95,28 +95,28 @@
 				{
 					"id": 5,
 					"name": "经纪人",
-					"pathName": "subpackages/pages/borker/agentRule/index",
+					"pathName": "subpackages/pages/broker/agentRule/index",
 					"query": "",
 					"scene": null
 				},
 				{
 					"id": 6,
 					"name": "佣金规则",
-					"pathName": "subpackages/pages/borker/agreement/index",
+					"pathName": "subpackages/pages/broker/agreement/index",
 					"query": "",
 					"scene": null
 				},
 				{
 					"id": 7,
 					"name": "我的邀请",
-					"pathName": "subpackages/pages/borker/invitation/index",
+					"pathName": "subpackages/pages/broker/invitation/index",
 					"query": "",
 					"scene": null
 				},
 				{
 					"id": 8,
 					"name": "邀请列表",
-					"pathName": "subpackages/pages/borker/invitationlist/index",
+					"pathName": "subpackages/pages/broker/invitationlist/index",
 					"query": "",
 					"scene": null
 				}

src/components/BuildingSelect/index.jsx

@@ -1,132 +1,178 @@
+import Taro from "@tarojs/taro";
+import { View, Button, RadioGroup, Label, Radio } from "@tarojs/components";
+import { API_GET_AGENT_BUILDINGS, API_ITEMS_LIST } from "@/constants/api";
+import { ROLE_CODE } from "@/constants/user";
+import { useSelector } from "react-redux";
+import { fetch } from "@/utils/request";
 
-import Taro from '@tarojs/taro'
-import { View, Button, RadioGroup, Label, Radio } from '@tarojs/components'
-import { API_GET_AGENT_BUILDINGS, API_ITEMS_LIST } from '@/constants/api'
-import { ROLE_CODE } from '@/constants/user'
-import { useSelector } from 'react-redux'
-import { fetch } from '@/utils/request'
+import { useState, useEffect, useMemo } from "react";
+import "./style.css";
 
-import { useState, useEffect, useMemo } from 'react'
-import './style.css'
-
-const wrapAnimate = 'wrap wrapAnimate'
-const frameAnimate = 'frame-wrapper'
+const wrapAnimate = "wrap wrapAnimate";
+const frameAnimate = "frame-wrapper";
 
 export default (props) => {
-  const { value, onChange, role } = props
+  const { value, onChange, role } = props;
 
-  const city = useSelector(state => state.city)
+  const city = useSelector((state) => state.city);
 
-  const [dicts, setDicts] = useState([])
-  const [visible, setVisible] = useState(false)
-  const [loading, setLoading] = useState(false)
+  const [dicts, setDicts] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [loading, setLoading] = useState(false);
   // const [val, setVal] = useState({ buildingName: '意向楼盘' })
   // const [buildingTitle, setBuildingTitle] = useState({ buildingName: '意向楼盘' })
-  const [current, setCurrent] = useState({ buildingName: '意向楼盘' })
+  const [current, setCurrent] = useState({ buildingName: "意向楼盘" });
 
   const buildingProp = useMemo(
-    () => (dicts || []).filter(x => x.buildingId === value)[0] || { buildingName: '请选择' },
+    () =>
+      (dicts || []).filter((x) => x.buildingId === value)[0] || {
+        buildingName: "请选择",
+      },
     [value, dicts]
-  )
+  );
 
   useEffect(() => {
-    setCurrent(buildingProp)
-  }, [buildingProp])
+    setCurrent(buildingProp);
+  }, [buildingProp]);
 
   useEffect(() => {
-    setLoading(true)
-    if (role !== ROLE_CODE.CUSTOMER && role !== ROLE_CODE.DRIFT && role !== ROLE_CODE.CONSULTANT) {
-      fetch({ url: API_GET_AGENT_BUILDINGS }).then((res) => {
-        setDicts(res || [])
-        setLoading(false)
-      }).catch(() => setLoading(false))
+    setLoading(true);
+
+    if (
+      role !== ROLE_CODE.CUSTOMER &&
+      role !== ROLE_CODE.DRIFT &&
+      role !== ROLE_CODE.CONSULTANT &&
+      role !== ROLE_CODE.BROKER
+    ) {
+      fetch({ url: API_GET_AGENT_BUILDINGS })
+        .then((res) => {
+          setDicts(res || []);
+          setLoading(false);
+        })
+        .catch(() => setLoading(false));
     } else {
-      fetch({ url: API_ITEMS_LIST, payload: { pageNumber: 1, pageSize: 1000, cityId: city.curCity.id } }).then((res) => {
-        setDicts(res.records)
-        setLoading(false)
-      }).catch(() => setLoading(false))
+      fetch({
+        url: API_ITEMS_LIST,
+        payload: {
+          pageNumber: 1,
+          pageSize: 1000,
+          cityId: city.curCity.id,
+          isBroker: role === ROLE_CODE.BROKER,
+        },
+      })
+        .then((res) => {
+          setDicts(res.records);
+          setLoading(false);
+        })
+        .catch(() => setLoading(false));
     }
-  }, [city.curCity.id, role])
+  }, [city.curCity.id, role]);
 
   const handleSelect = (e) => {
-
-    const buildingId = e.detail.value
-    const building = dicts.filter(x => x.buildingId === buildingId)[0] || { buildingName: '意向楼盘' }
+    const buildingId = e.detail.value;
+    const building = dicts.filter((x) => x.buildingId === buildingId)[0] || {
+      buildingName: "意向楼盘",
+    };
 
     // setBuildingTitle(building)
-    setCurrent(building)
-  }
+    setCurrent(building);
+  };
   const handleSubmit = (e) => {
-    e.stopPropagation()
-    setVisible(false)
+    e.stopPropagation();
+    setVisible(false);
 
-    onChange(current.buildingId, current)
-  }
+    onChange(current.buildingId, current);
+  };
 
   const handleCancel = () => {
-    setVisible(false)
-    setCurrent(buildingProp)
-  }
+    setVisible(false);
+    setCurrent(buildingProp);
+  };
 
   return (
     <view>
-      {
-        visible ? (
-          < >
-            <view onClick={handleCancel} className={wrapAnimate}></view>
-            <view className={frameAnimate} catchMove>
-              <view className='frame'>
-                {/* 标题  */}
-                <view className='title-wrapper'>
-                  <view>{current.buildingName}</view>
-                </view>
-                {/* 内容 */}
-                <view style='overflow-x: hidden;'>
-                  <View className='page-section'>
-                    <View className='radio-list' >
-                      <scroll-view
-                        scrollY
-                        style={{ height: '40vh', overflow: 'hidden' }}
-                        catchMove
-                      >
-                        {loading && '加载中...'}
-                        {
-                          !loading && (
-                            <RadioGroup className='radio-list__RadioGroup' onChange={handleSelect} onClick={e => e.stopPropagation()}>
-                              {dicts.map((item, i) => {
-                                return (
-                                  <Label catchMove className='radio-list__label' for={`rdo-${i}`} key={i}>
-                                    <view className='radio-list__text'>{item.buildingName}</view>
-
-                                    <Radio id={`rdo-${i}`} catchMove className='radio-list__radio' value={item.buildingId} checked={item.buildingId === current.buildingId}></Radio>
-
-                                  </Label>
-                                )
-                              })}
-                            </RadioGroup>
-                          )
-                        }
-                      </scroll-view>
-                    </View>
+      {visible ? (
+        <>
+          <view onClick={handleCancel} className={wrapAnimate}></view>
+          <view className={frameAnimate} catchMove>
+            <view className="frame">
+              {/* 标题  */}
+              <view className="title-wrapper">
+                <view>{current.buildingName}</view>
+              </view>
+              {/* 内容 */}
+              <view style="overflow-x: hidden;">
+                <View className="page-section">
+                  <View className="radio-list">
+                    <scroll-view
+                      scrollY
+                      style={{ height: "40vh", overflow: "hidden" }}
+                      catchMove
+                    >
+                      {loading && "加载中..."}
+                      {!loading && (
+                        <RadioGroup
+                          className="radio-list__RadioGroup"
+                          onChange={handleSelect}
+                          onClick={(e) => e.stopPropagation()}
+                        >
+                          {dicts.map((item, i) => {
+                            return (
+                              <Label
+                                catchMove
+                                className="radio-list__label"
+                                for={`rdo-${i}`}
+                                key={i}
+                              >
+                                <view className="radio-list__text">
+                                  {item.buildingName}
+                                </view>
+
+                                <Radio
+                                  id={`rdo-${i}`}
+                                  catchMove
+                                  className="radio-list__radio"
+                                  value={item.buildingId}
+                                  checked={
+                                    item.buildingId === current.buildingId
+                                  }
+                                ></Radio>
+                              </Label>
+                            );
+                          })}
+                        </RadioGroup>
+                      )}
+                    </scroll-view>
                   </View>
-
-                  {/* <view className='bottom-text' onClick={handleTextNext}> */}
-                  <view style={{ display: 'flex', margin: '2em auto' }}>
-                    <Button className='checkBtn' onClick={handleCancel}  >取消</Button>
-                    <Button className='okBtn' disabled={!current.buildingId} onClick={handleSubmit}> 确定</Button>
-                  </view>
-                  {/* <view className='Btn'>
+                </View>
+
+                {/* <view className='bottom-text' onClick={handleTextNext}> */}
+                <view style={{ display: "flex", margin: "2em auto" }}>
+                  <Button className="checkBtn" onClick={handleCancel}>
+                    取消
+                  </Button>
+                  <Button
+                    className="okBtn"
+                    disabled={!current.buildingId}
+                    onClick={handleSubmit}
+                  >
+                    {" "}
+                    确定
+                  </Button>
+                </view>
+                {/* <view className='Btn'>
                     <Button onClick={handleCancel} >取消</Button>
                     <Button disabled={!val.buildingId} onClick={handleSubmit}>确定</Button>
                   </view> */}
-                </view>
               </view>
             </view>
-          </>
-        ) :
-          <View onClick={() => setVisible(true)}>{buildingProp.buildingName}</View>
-      }
+          </view>
+        </>
+      ) : (
+        <View onClick={() => setVisible(true)}>
+          {buildingProp.buildingName}
+        </View>
+      )}
     </view>
-
-  )
-}
+  );
+};

src/constants/broker.js

@@ -13,3 +13,6 @@ export const API_BK_BANk_CARD = resolvePath('bkBankCard')
 
 //我邀请的经纪人列表
 export const API_BROKER_LIST = resolvePath('broker')
+
+//经纪人榜单
+export const API_BROKER_RANK = resolvePath('broker/rank')

src/pages/mine/addCustomer/index.jsx

@@ -90,7 +90,7 @@ export default withLayout((props) => {
 
     setLoading(true)
     let url = null
-    if (personType === ROLE_CODE.CONSULTANT || personType === ROLE_CODE.CUSTOMER) {
+    if (personType === ROLE_CODE.CONSULTANT || personType === ROLE_CODE.CUSTOMER || personType === ROLE_CODE.BROKER) {
       // url = API_REPORT_CUETOMER
       url = API_USER_ADD_CUSTOMER
     } else if (personType === ROLE_CODE.CHANNEL_AGENT) {
@@ -122,7 +122,7 @@ export default withLayout((props) => {
     setBuildingId(bid)
     // setBuildingId(building.buildingId)
   }
-
+console.log(personType === ROLE_CODE.CONSULTANT || ROLE_CODE.CUSTOMER,'===')
   return (
     <view className='Page addCustomer'>
 

src/pages/mine/components/MyCustomerListItem/index.jsx

@@ -2,6 +2,7 @@
 import { Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import { BIZ_STATUS } from '@/constants/user'
+import { useSelector } from "react-redux";
 import './index.scss'
 
 const addDays = (dt, days) => {
@@ -14,10 +15,10 @@ const addDays = (dt, days) => {
 
 export default function MyCustomerListItem(props) {
   const { data = {} } = props
-
+  // const person = useSelector((state) => state.user.person);
   const { expirationDate, customerStatus, createDate } = data
   const expStr = expirationDate && customerStatus === '1' ? `${addDays(createDate, expirationDate)} 回收` : ''
-
+// console.log()
   const gotoDetail = () => {
     if (data.status - 0 !== 3) {
       if (!data.customerId) {

src/pages/mine/tabData.js

@@ -29,7 +29,7 @@ const MineMenuList = {
       { name: '我的客户', icon: require('@/assets/mine-icon1.png'), router: '/pages/mine/myCustomer/index' },
       { name: '我的资料', icon: require('@/assets/mine-icon1.png'), router: '/subpackages/pages/broker/toBeBroker/index' },
       { name: '我的消息', icon: require('@/assets/mine-icon1.png'), router: '/subpackages/pages/broker/myMessage/index' },
-      { name: '我邀请的全民经纪人', icon: require('@/assets/mine-icon1.png'), router: '/pages/mine/addCustomer/index?type=estateAgent' },
+      { name: '我邀请的全民经纪人', icon: require('@/assets/mine-icon1.png'), router: '/subpackages/pages/broker/invitationlist/index' },
     ],
     [
 

src/routes.js

@@ -447,7 +447,7 @@ const routes = [
   },
 
   {
-    name: "经纪人",
+    name: "邀请奖励",
     page: "pages/broker/agentRule/index",
     pkg: "subpackages",
     type: "other",

src/services/broker.js

@@ -3,7 +3,9 @@ import { fetch } from '@/utils/request'
 import {
   API_BK_AGREEMENT,
   API_BK_BANk_CARD,
-  API_BROKER_LIST
+  API_BROKER_LIST,
+  API_BROKER_RANK,
+  API_BK_AGENT_RULE
 } from '@/constants/broker'
 
 
@@ -26,3 +28,16 @@ export const queryBkAgreement = (payload) => fetch({ url: `${API_BK_AGREEMENT}`,
  * @param {*} 
  */
  export const querybrokerList = (payload) => fetch({ url: `${API_BROKER_LIST}`, payload })
+
+ /**
+ * 经纪人排行榜
+ * @param {*} 
+ */
+  export const queryBrokerRank = (payload) => fetch({ url: `${API_BROKER_RANK}`, payload })
+
+
+   /**
+ * 经纪人规则
+ * @param {*} 
+ */
+    export const getbkAgentRule = (payload) => fetch({ url: `${API_BK_AGENT_RULE}`, payload })

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

@@ -1,14 +1,27 @@
-import withLayout from '@/layout'
-import { ScrollView, View, Image, Text, RichText } from '@tarojs/components'
-import './index.scss'
+import withLayout from "@/layout";
+import { ScrollView, View, Image, Text, RichText } from "@tarojs/components";
+import { useState, useEffect } from "react";
+import { getbkAgentRule } from "@/services/broker";
+import "./index.scss";
 
-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'
+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";
 export default withLayout(() => {
-  const value = '<p>一、给钱</p ><p>二、还是给钱</p ><p>三、就问你要不要？<br/></p>';
+  const [value, setValue] = useState("");
+  useEffect(() => {
+    getbkAgentRule().then((res) => {
+      setValue(res.content);
+    });
+  }, []);
+
   return (
-    <ScrollView className='Page broker-page' style={{ height: '100vh' }} scrollY>
-      <Image mode='heightFix' className='img-set' src={defaultRuleImage} />
-      <View className='broker-padding'>
+    <ScrollView
+      className="Page broker-page"
+      style={{ height: "100vh" }}
+      scrollY
+    >
+      <Image mode="heightFix" className="img-set" src={defaultRuleImage} />
+      <View className="broker-padding">
         <View>
           <Text>邀请奖励说明</Text>
           <View>
@@ -17,5 +30,5 @@ export default withLayout(() => {
         </View>
       </View>
     </ScrollView>
-  )
-})
+  );
+});

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

@@ -5,7 +5,7 @@ import { View, Image, Text } from "@tarojs/components";
 import "./index.scss";
 import { useState, useEffect } from "react";
 import { querybrokerList } from "@/services/broker";
-
+import { formatDate } from "@/utils/chatDate";
 export default withLayout(() => {
   const [list, setList] = useState([]);
   const [total, setTotal] = useState(0);
@@ -15,7 +15,7 @@ export default withLayout(() => {
 
   const getList = () => {
     querybrokerList().then((res) => {
-      setList([...res.records,...res.records]);
+      setList([...res.records, ...res.records]);
       setTotal(res.total);
     });
   };
@@ -30,21 +30,31 @@ export default withLayout(() => {
     <View className="invitationlist-background">
       <View>
         <View className="invitationlist-font">总邀请人数</View>
-        <View className="invitationlist-font-right">
+        <View
+          className="invitationlist-font-right"
+          onClick={() => {
+            Taro.navigateTo({
+              url: "/subpackages/pages/broker/agentRule/index",
+            });
+          }}
+        >
           <Image className="invitationlist-img" mode="widthFix" src={img1} />
           邀请奖励
         </View>
         <View className="invitationlist-background-2">
           <View className="invitationlist-font-tl">{total}</View>
-          <View className="invitationlist-font-right-t">
+          <View
+            className="invitationlist-font-right-t"
+            onClick={() => {
+              Taro.navigateTo({
+                url: "/subpackages/pages/broker/rankingList/index",
+              });
+            }}
+          >
             <Image className="invitationlist-img" mode="widthFix" src={img2} />
             邀请注册榜
           </View>
         </View>
-        <View className="invitationlist-view-1">
-          更新时间:&nbsp;<View className="invitationlist-view">2022-07-22</View>
-          &nbsp;<View className="invitationlist-view">12:00:00</View>
-        </View>
       </View>
       <View className="invitationlist-view-list">
         {list.map((item) => {
@@ -58,8 +68,12 @@ export default withLayout(() => {
               </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-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">

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

@@ -8,12 +8,53 @@ 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 { isEmpty } from "@/utils/tools";
 import "@/assets/css/iconfont.css";
 import "./index.scss";
 
 export default withLayout((props) => {
-  const { columns, dataSource } = props;
+  const { columns, params, getList = () => {} } = props;
+
+  const [list, setList] = useState([]);
+  const [IsPull, setPull] = useState(false);
+
+  const [pageNumber, setPageNumber] = useState(1);
+  const [HasNextPage, setHasNextPage] = useState(true);
+
+  useEffect(() => {
+    if (pageNumber) {
+      GetPageList();
+    }
+  }, [pageNumber]);
+
+  const GetPageList = () => {
+    setHasNextPage(false);
+    getList({ ...params, pageNumber, pageSize: 10 }).then((res) => {
+      setList(
+        pageNumber === 1 ? res.records || [] : list.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="component rankingListList">
@@ -24,22 +65,109 @@ export default withLayout((props) => {
           </view>
         ))}
       </view>
-      <view className="list-tbody">
-        {dataSource?.map((item, index) => {
-          return (
-            <view className="list-tbody-row" key={index}>
-              {columns?.map((x) => (
-                <view
-                  key={x.key}
-                  style={{ width: x.width, textAlign: "center" }}
-                >
-                  {(x?.render && x?.render(item)) || item[x.dataIndex] || ""}
-                </view>
-              ))}
-            </view>
-          );
-        })}
-      </view>
+      <ScrollView
+        scroll-y
+        refresher-triggered={IsPull}
+        onscrolltolower={PageLoadMore}
+        refresher-background="#fff"
+      >
+        <view className="list-tbody">
+          {list?.map((item, index) => {
+            return (
+              <view className="list-tbody-row" key={index}>
+                {columns?.map((x, index) => (
+                  <view
+                    key={x.key}
+                    style={{ width: x.width, textAlign: "center" }}
+                  >
+                    
+                    {(x?.render && x?.render(item,index)) ||
+                      (!isEmpty(item[x.dataIndex]) ? item[x.dataIndex] : 0)}
+                  </view>
+                ))}
+              </view>
+            );
+          })}
+        </view>
+
+        {/* <view className="PageBottom">
+          <text>已经到底了~</text>
+        </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/index.jsx

@@ -24,20 +24,6 @@ export default withLayout(() => {
           alt=""
           srcset=""
         />
-        {/* <view className="tabs">
-          <view
-            className={`tab ${activeKey === 1 ? "active" : ""}`}
-            onClick={() => setActiveKey(1)}
-          >
-            我的佣金
-          </view>
-          <view
-            className={`tab ${activeKey === 2 ? "active" : ""}`}
-            onClick={() => setActiveKey(2)}
-          >
-            我的奖励
-          </view>
-        </view> */}
       </view>
       <view className="content">
         <view className="tabs">

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

@@ -2,11 +2,7 @@ import { useState, useEffect } from "react";
 import Taro from "@tarojs/taro";
 import { useSelector } from "react-redux";
 import withLayout from "@/layout";
-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 { queryBrokerRank } from "@/services/broker";
 import MyAchievement from "../components/myAchievement";
 import AchievementList from "../components/list";
 import store from "@/store";
@@ -15,11 +11,27 @@ import "@/assets/css/iconfont.css";
 import "./index.scss";
 
 export default withLayout(() => {
+
+
   const columns = [
     {
       title: "排名",
       width: "30%",
       dataIndex: "a",
+      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=""
+            />
+          );
+        }
+      },
     },
     {
       title: "经纪人",
@@ -27,12 +39,7 @@ export default withLayout(() => {
       dataIndex: "name",
       render: (x) => (
         <view>
-          <image
-            className="list-image"
-            src={`${OSS_FAST_PATH}/miniapp/broker/消息.png`}
-            alt=""
-            srcset=""
-          />
+          <image className="list-image" src={x.avatarurl} alt="" srcset="" />
           {x.name}
         </view>
       ),
@@ -40,30 +47,30 @@ export default withLayout(() => {
     {
       title: "邀请人（个）",
       width: "40%",
-      dataIndex: "number",
+      dataIndex: "brokerNum",
     },
   ];
 
-  const list = [
-    {
-      a: 1,
-      name: "张三",
-      number: 4433,
-      key: 1,
-    },
-    {
-      a: 2,
-      name: "李四",
-      number: 4433,
-      key: 2,
-    },
-    {
-      a: 3,
-      name: "张三",
-      number: 4433,
-      key: 3,
-    },
-  ];
+  // const list = [
+  //   {
+  //     a: 1,
+  //     name: "张三",
+  //     number: 4433,
+  //     key: 1,
+  //   },
+  //   {
+  //     a: 2,
+  //     name: "李四",
+  //     number: 4433,
+  //     key: 2,
+  //   },
+  //   {
+  //     a: 3,
+  //     name: "张三",
+  //     number: 4433,
+  //     key: 3,
+  //   },
+  // ];
 
   return (
     <view className="invitationList">
@@ -76,7 +83,11 @@ export default withLayout(() => {
           key: 3,
         }}
       />
-      <AchievementList columns={columns} dataSource={list} />
+      <AchievementList
+        columns={columns}
+        params={{ rankType: "person" }}
+        getList={queryBrokerRank}
+      />
     </view>
   );
 });

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

@@ -12,4 +12,11 @@
     vertical-align: middle;
     margin-right: 14px;
   }
+  .rank-image {
+    width: 60px;
+    height:60px;
+
+    vertical-align: middle;
+    margin-right: 14px;
+  }
 }

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

@@ -4,9 +4,7 @@ import { useSelector } from "react-redux";
 import withLayout from "@/layout";
 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 { queryBrokerRank } from "@/services/broker";
 import MyAchievement from "../components/myAchievement";
 import AchievementList from "../components/list";
 import store from "@/store";
@@ -20,10 +18,24 @@ export default withLayout(() => {
       title: "排名",
       width: "15%",
       dataIndex: "a",
+      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=""
+            />
+          );
+        }
+      },
     },
     {
       title: "姓名",
-      width: "20%",
+      width: "30%",
       dataIndex: "name",
       render: (x) => (
         <view>
@@ -39,36 +51,36 @@ export default withLayout(() => {
     },
     {
       title: "数量（组）",
-      width: "35%",
-      dataIndex: "number",
+      width: "25%",
+      dataIndex: "customerNum",
     },
     {
       title: "佣金（元）",
       width: "30%",
-      dataIndex: "money",
+      dataIndex: "totalCommission",
     },
   ];
 
-  const list = [
-    {
-      a: 1,
-      name: "张三",
-      number: 4433,
-      key: 1,
-    },
-    {
-      a: 2,
-      name: "李四",
-      number: 4433,
-      key: 2,
-    },
-    {
-      a: 3,
-      name: "张三",
-      number: 4433,
-      key: 3,
-    },
-  ];
+  // const list = [
+  //   {
+  //     a: 1,
+  //     name: "张三",
+  //     number: 4433,
+  //     key: 1,
+  //   },
+  //   {
+  //     a: 2,
+  //     name: "李四",
+  //     number: 4433,
+  //     key: 2,
+  //   },
+  //   {
+  //     a: 3,
+  //     name: "张三",
+  //     number: 4433,
+  //     key: 3,
+  //   },
+  // ];
 
   return (
     <view className="invitationList">
@@ -81,7 +93,11 @@ export default withLayout(() => {
           key: 3,
         }}
       />
-      <AchievementList columns={columns} dataSource={list} />
+      <AchievementList
+        columns={columns}
+        params={{ rankType: "money" }}
+        getList={queryBrokerRank}
+      />
     </view>
   );
 });

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

@@ -1,55 +1,59 @@
-import React, { useState, useEffect } from 'react'
-import Taro from '@tarojs/taro'
-import withLayout from '@/layout'
-import { ScrollView, Input, Image } from '@tarojs/components'
-import Picker from '@/components/Picker'
-import { getChannelCustomerDetail } from '@/services/person'
-import { getCardList } from '@/services/card'
-import { uploadFiles, fetch } from '@/utils/request'
-import { API_MARKETING_VISIT } from '@/constants/api'
-import { formatDate } from '@/utils/chatDate'
-import '@/assets/css/iconfont.css'
-import './index.scss'
+import React, { useState, useEffect } from "react";
+import Taro from "@tarojs/taro";
+import withLayout from "@/layout";
+import { ScrollView, Input, Image } from "@tarojs/components";
+import Picker from "@/components/Picker";
+import { getChannelCustomerDetail } from "@/services/person";
+import { getCardList } from "@/services/card";
+import { uploadFiles, fetch } from "@/utils/request";
+import { API_MARKETING_VISIT } from "@/constants/api";
+import { formatDate } from "@/utils/chatDate";
+import "@/assets/css/iconfont.css";
+import "./index.scss";
+import { ROLE_CODE } from "@/constants/user";
 
 export default withLayout((props) => {
-  const { router } = props
-  const { id } = router.params
-
-  const [loading, setLoading] = useState(false)
-  const [channelCustomer, setChannelCustomer] = useState({})
-  const [consultantList, setConsultantList] = useState([])
-  const [consultant, setConsultant] = useState()
-  const [visitDate, setVisitDate] = useState(formatDate(Date.now(), 'yyyy-MM-dd'))
-  const [imageUrl, setImageUrl] = useState()
-  const [remark, setRemark] = useState()
-  const [channelCustomerId, setChannelCustomerId] = useState(null)
+  const { router, person } = props;
+  const { id } = router.params;
+  console.log(props, "==");
+  const [loading, setLoading] = useState(false);
+  const [channelCustomer, setChannelCustomer] = useState({});
+  const [consultantList, setConsultantList] = useState([]);
+  const [consultant, setConsultant] = useState();
+  const [visitDate, setVisitDate] = useState(
+    formatDate(Date.now(), "yyyy-MM-dd")
+  );
+  const [imageUrl, setImageUrl] = useState();
+  const [remark, setRemark] = useState();
+  const [channelCustomerId, setChannelCustomerId] = useState(null);
 
   const openAlbum = (e) => {
-    e.stopPropagation()
+    e.stopPropagation();
 
     Taro.chooseImage({
       count: 1,
-      sizeType: ['original', 'compressed'],  //可选择原图或压缩后的图片
-      sourceType: ['album', 'camera'], //可选择性开放访问相册、相机
-      success: res => {
+      sizeType: ["original", "compressed"], //可选择原图或压缩后的图片
+      sourceType: ["album", "camera"], //可选择性开放访问相册、相机
+      success: (res) => {
         Taro.showLoading({
-          title: '加载中',
-        })
-        uploadFiles(res.tempFilePaths).then(data => {
-          setImageUrl(data[0])
-          Taro.hideLoading()
-        }).catch(() => {
-          Taro.hideLoading()
-        })
-      }
-    })
-  }
+          title: "加载中",
+        });
+        uploadFiles(res.tempFilePaths)
+          .then((data) => {
+            setImageUrl(data[0]);
+            Taro.hideLoading();
+          })
+          .catch(() => {
+            Taro.hideLoading();
+          });
+      },
+    });
+  };
 
   const handleSubmit = (e) => {
-
     const payload = {
       id,
-      type: 'report',
+      type: "report",
       realtyConsultant: consultant,
       customerVisit: {
         buildingId: channelCustomer.buildingId,
@@ -58,37 +62,38 @@ export default withLayout((props) => {
         realtyConsultant: consultant,
         imageUrl,
 
-        visitDate: `${visitDate}T12:00:00.000Z`,  // 随便造了一个时刻
+        visitDate: `${visitDate}T12:00:00.000Z`, // 随便造了一个时刻
         remark,
         channelId: channelCustomer.channelId,
         channelCustomerId,
       },
-
-    }
-
-    setLoading(true)
-    fetch({ url: API_MARKETING_VISIT, payload, method: 'PUT' }).then((res) => {
-      setLoading(false)
-      Taro.showToast({
-        title: '操作成功',
-        icon: 'none'
+    };
+
+    setLoading(true);
+    fetch({ url: API_MARKETING_VISIT, payload, method: "PUT" })
+      .then((res) => {
+        setLoading(false);
+        Taro.showToast({
+          title: "操作成功",
+          icon: "none",
+        });
+        const t = setTimeout(() => {
+          Taro.navigateBack({ delta: 1 });
+          clearTimeout(t);
+        }, 1500);
       })
-      const t = setTimeout(() => {
-        Taro.navigateBack({ delta: 1 })
-        clearTimeout(t)
-      }, 1500)
-    }).catch((e) => {
-      setLoading(false)
-    })
-  }
+      .catch((e) => {
+        setLoading(false);
+      });
+  };
 
   useEffect(() => {
     if (id) {
       getChannelCustomerDetail(id).then((res) => {
-        setChannelCustomer(res || {})
+        setChannelCustomer(res || {});
 
-        setConsultant(res?.realtyConsultant)
-        setChannelCustomerId(res?.channelCustomerId)
+        setConsultant(res?.realtyConsultant);
+        setChannelCustomerId(res?.channelCustomerId);
 
         if (res?.buildingId) {
           getCardList({
@@ -96,79 +101,105 @@ export default withLayout((props) => {
             pageSize: 50,
             buildingId: res.buildingId,
           }).then((x) => {
-            const { records } = x || {}
-            setConsultantList(records || [])
-          })
+            const { records } = x || {};
+            setConsultantList(records || []);
+          });
         }
-      })
+      });
     }
-  }, [id])
+  }, [id]);
 
   // const [PageProps] = useState(props)
 
   return (
-    <view className='Page sureVisit'>
-
+    <view className="Page sureVisit">
       <ScrollView scrollY>
-        <view className='PageContent'>
-
+        <view className="PageContent">
           <text>客户姓名</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
+          <view className="FormLine flex-h">
+            <view className="flex-item">
               <text>{channelCustomer.name}</text>
               {/* <Input placeholder='请输入姓名' value={channelCustomer.name}></Input> */}
             </view>
           </view>
-
-          <text>归属渠道</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <text>{channelCustomer.channelName}</text>
-              {/* <Input placeholder='请输入渠道' value={channelCustomer.channelName}></Input> */}
-            </view>
-          </view>
+          {channelCustomer.recommendPersonType === ROLE_CODE.BROKER ? (
+            <>
+              <text>报备经纪人</text>
+              <view className="FormLine flex-h">
+                <view className="flex-item">
+                  <text>{channelCustomer.recommendPersonName}</text>
+                  {/* <Input placeholder='请输入渠道' value={channelCustomer.channelName}></Input> */}
+                </view>
+              </view>
+            </>
+          ) : (
+            <>
+              <text>归属渠道</text>
+              <view className="FormLine flex-h">
+                <view className="flex-item">
+                  <text>{channelCustomer.channelName}</text>
+                  {/* <Input placeholder='请输入渠道' value={channelCustomer.channelName}></Input> */}
+                </view>
+              </view>
+            </>
+          )}
 
           <text>内场接待（选填）</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
+          <view className="FormLine flex-h">
+            <view className="flex-item">
               {/* <Input placeholder='请输入内场接待'></Input> */}
-              <Picker kv={['name', 'id']} value={consultant} placeholder='请输入内场接待' dicts={consultantList} onChange={setConsultant} />
+              <Picker
+                kv={["name", "id"]}
+                value={consultant}
+                placeholder="请输入内场接待"
+                dicts={consultantList}
+                onChange={setConsultant}
+              />
             </view>
           </view>
 
           <text>到访时间</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
+          <view className="FormLine flex-h">
+            <view className="flex-item">
               {/* <text>请选择</text> */}
-              <Picker mode='date' value={visitDate} onChange={setVisitDate} />
+              <Picker mode="date" value={visitDate} onChange={setVisitDate} />
             </view>
             {/* <text className='iconfont icon-jiantoudown'></text> */}
           </view>
 
           <text>到访照片（选填）</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
+          <view className="FormLine flex-h">
+            <view className="flex-item">
               {/* <view className='UploadImg'>
                 <text className='iconfont icon-xiangji centerLabel'></text>
               </view> */}
-              <Image src={imageUrl} className='UploadImg' onClick={openAlbum} mode="aspectFill"></Image>
+              <Image
+                src={imageUrl}
+                className="UploadImg"
+                onClick={openAlbum}
+                mode="aspectFill"
+              ></Image>
             </view>
           </view>
 
           <text>备注</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <textarea placeholder='补充说明（选填）' value={remark} onInput={(e) => setRemark(e.detail.value)} ></textarea>
+          <view className="FormLine flex-h">
+            <view className="flex-item">
+              <textarea
+                placeholder="补充说明（选填）"
+                value={remark}
+                onInput={(e) => setRemark(e.detail.value)}
+              ></textarea>
             </view>
           </view>
 
-          <view className='Btn'>
-            <button loading={loading} onClick={handleSubmit}>提交</button>
+          <view className="Btn">
+            <button loading={loading} onClick={handleSubmit}>
+              提交
+            </button>
           </view>
-
         </view>
       </ScrollView>
-
     </view>
-  )
-})
+  );
+});

src/utils/tools.js

@@ -15,6 +15,10 @@ export function isEmpty(o) {
     }
   }
 
+  if (o === null || o === undefined) {
+    return true;
+  }
+
   if (typeof o === "object") {
     return !Object.keys(o).length;
   }
@@ -23,9 +27,7 @@ export function isEmpty(o) {
     return !o.length;
   }
 
-  if (o === null || o === undefined) {
-    return true;
-  }
+  
 
   return false;
 }