fix

config/dev.js

@@ -3,18 +3,10 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-<<<<<<< HEAD
-    // HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"https://www.newhousehold.cn"',
-    HOST: '"http://192.168.89.147:8081"',
-
-=======
     HOST: '"https://xlk.njyz.tech"',
     // HOST: '"https://www.newhousehold.cn"',
     // HOST: '"http://192.168.89.147:8081"',
-    // HOST: '"http://localhost:8081"',
-   
->>>>>>> 081381f11d051ff0fcc56e6285fe77388694e23c
+
     // WSS_HOST: '"wss://www.newhousehold.cn"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',

src/components/ProjectListItem/index.jsx

@@ -2,7 +2,7 @@ import "@/assets/css/iconfont.css";
 import Taro from "@tarojs/taro";
 import { Image } from "@tarojs/components";
 import { getImgURL } from "@/utils/image";
-import BorkerShare from "@/components/borkerShare";
+import BrokerShare from "@/components/brokerShare";
 import "./index.scss";
 
 export default function ProjectListItem(props) {
@@ -95,7 +95,7 @@ export default function ProjectListItem(props) {
           </view>
         </view>
       </view>
-      {Data?.isBorker&&<BorkerShare></BorkerShare>}
+      {Data?.isBroker&&<BrokerShare buildingId={Data.buildingId}></BrokerShare>}
       
     </view>
   );

src/components/borkerShare/index.jsx → src/components/brokerShare/index.jsx

@@ -5,12 +5,15 @@ import { getImgURL } from "@/utils/image";
 import "./index.scss";
 
 export default function ProjectListItem(props) {
+  const onClick =()=>{
+    Taro.navigateTo({ url: `/pages/mine/addCustomer/index?buildingId=${props.buildingId}` })
+  }
   return (
-    <view className='borkerShare flex-h'>
+    <view className='brokerShare flex-h' onClick={()=>onClick()}>
       <view className='left'>
         <image
           className='image'
-          src={`${OSS_FAST_PATH}/miniapp/borker/钱袋.png`}
+          src={`${OSS_FAST_PATH}/miniapp/broker/钱袋.png`}
           alt=''
           srcset=''
         />
@@ -21,7 +24,7 @@ export default function ProjectListItem(props) {
       
         <image
           className='image'
-          src={`${OSS_FAST_PATH}/miniapp/borker/分享.png`}
+          src={`${OSS_FAST_PATH}/miniapp/broker/分享.png`}
           alt=''
           srcset=''
         />

src/components/borkerShare/index.scss → src/components/brokerShare/index.scss

@@ -1,4 +1,4 @@
-.borkerShare {
+.brokerShare {
     width: 660px;
     height: 42px;
     background:rgba(254, 230, 204, 0.3);
@@ -6,6 +6,7 @@
     // opacity: ;
     justify-content: space-between;
     margin: 20px auto 0;
+    line-height: 36rpx;
     > .left {
       font-size: 22px;
       font-family: DengXian;

src/constants/api.js

@@ -51,6 +51,7 @@ export const API_HELP_FIND_HOUSE_SUBMIT = resolvePath('searchHouse') // 问卷
 export const API_PRELOAD = resolvePath('preload')
 export const API_QRCODE = resolvePath('qrcode')
 export const API_BANNER_LIST = resolvePath('extendContent')
+export const API_BROKER_SCREEN = resolvePath('bkFirstScreen') //全民经纪人开屏广告GET 
 export const API_QUERY_CODE_SCENE = resolvePath('qrcode/scene')
 export const API_AREA_LIST = resolvePath('city/cascade')
 
@@ -255,6 +256,7 @@ export const API_AGENT_CHANNEL = resolvePath('customer/recommend/becomeChannel')
 export const API_AGENT_CURRENT = resolvePath('user/current')
 
 export const API_EDIT_AGENT = resolvePath('editPerson')
+export const API_BIND_BROKER = resolvePath('bindBroker')
 
 // 活动列表-新
 export const API_ACTNEW_LIST = resolvePath('activity/list')

src/constants/borker.js

@@ -1,9 +0,0 @@
-import { resolvePath } from "./api";
-
-// 全民经纪人
-
-// 佣金规则
-export const API_BK_AGREEMENT = resolvePath('bkAgreement')
-
-// 经纪人规则
-export const API_BK_AGENT_RULE = resolvePath('bkAgentRule')

src/constants/broker.js

@@ -0,0 +1,15 @@
+import { resolvePath } from "./api";
+
+// 全民经纪人
+
+// 佣金规则
+export const API_BK_AGREEMENT = resolvePath('bkAgreement')
+
+// 经纪人规则
+export const API_BK_AGENT_RULE = resolvePath('bkAgentRule')
+
+//银行卡
+export const API_BK_BANk_CARD = resolvePath('bkBankCard')
+
+//我邀请的经纪人列表
+export const API_BROKER_LIST = resolvePath('broker')

src/constants/user.js

@@ -16,7 +16,7 @@ export const ROLE_CODE = {
   DRIFT: 'drift', // 游客
   CUSTOMER: 'customer', // 客户
   MARKETING: 'marketing', // 驻场
-  BORKER: 'borker', // 全民经纪人(新联家)
+  BROKER: 'broker', // 全民经纪人(新联家)
 }
 
 // 客户流转状态

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

@@ -2,7 +2,7 @@
 import Taro from '@tarojs/taro'
 import { ScrollView, Image } from '@tarojs/components'
 import AuthRole from '@/components/Auth/AuthRole'
-import BorkerShare from '@/components/borkerShare'
+import BrokerShare from '@/components/brokerShare'
 import { ROLE_CODE } from '@/constants/user'
 import classNames from 'classnames'
 import useFavor from '@/utils/hooks/useFavor'
@@ -52,7 +52,7 @@ export default function BasicInfo (props) {
         }
       </view>
 
-      {Info?.isBorker&&<BorkerShare></BorkerShare>}
+      {Info?.isBroker&&<BrokerShare buildingId={buildingId}></BrokerShare>}
 
       {/* 项目列表 */}
       {

src/pages/index/index.jsx

@@ -13,6 +13,7 @@ import useShare from '@/utils/hooks/useShare'
 import useScreen from '@/utils/hooks/useScreen'
 import nav2Target from '@/utils/nav2Target'
 import ChatIcon from '@/components/ChatIcon/index'
+import {  ROLE_CODE } from "@/constants/user";
 import Location from './components/Location/index'
 import Banner from './components/Banner/index'
 import Menu from './components/Menu/index'
@@ -70,7 +71,12 @@ export default withLayout((props) => {
   
   const handleScreen = () => {
     toggleShowScreen()
-    nav2Target(screenInfo)
+    if(person.personType ===ROLE_CODE.BROKER){
+      Taro.navigateTo({ url: screenInfo.linkPage })
+    }else{
+      nav2Target(screenInfo)
+    }
+    
   }
 
 

src/pages/mine/index.jsx

@@ -1,90 +1,124 @@
-import { useState, useEffect } from 'react'
-import { useSelector } from 'react-redux'
-import withLayout from '@/layout'
-import { ScrollView, Image } from '@tarojs/components'
-import Taro from '@tarojs/taro'
-import '@/assets/css/iconfont.css'
-import { fetch } from '@/utils/request'
-import { API_PUT_REGISTERCONSULTANT } from '@/constants/api'
-import { getImgURL } from '@/utils/image'
-import { UPDATE_USER_INFO, ROLE_CODE } from '@/constants/user'
-import store from '@/store'
-import './index.scss'
-import MineMenuList from './tabData'
+import { useState, useEffect } from "react";
+import { useSelector } from "react-redux";
+import withLayout from "@/layout";
+import { ScrollView, Image } from "@tarojs/components";
+import Taro from "@tarojs/taro";
+import "@/assets/css/iconfont.css";
+import { fetch } from "@/utils/request";
+import { API_PUT_REGISTERCONSULTANT } from "@/constants/api";
+import { getImgURL } from "@/utils/image";
+import { UPDATE_USER_INFO, ROLE_CODE } from "@/constants/user";
+import store from "@/store";
+import "./index.scss";
+import MineMenuList from "./tabData";
 
-const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon18.jpg'
+const defaultRuleImage =
+  "https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon18.jpg";
 
-const version = `版本: ${Version}`
-const copyRight = `技术支持: 云致科技 @ ${(new Date()).getFullYear()}`
+const version = `版本: ${Version}`;
+const copyRight = `技术支持: 云致科技 @ ${new Date().getFullYear()}`;
 
 export default withLayout(() => {
-
-  const user = useSelector(state => state.user)
-  const city = useSelector(state => state.city)
-  const [UserRole, setUserRole] = useState(null) // 1-普通用户 2-经纪人 3-置业顾问 4-驻场管理
-  const [MenuList, setMenuList] = useState([])
-  const { dispatch } = store
+  const user = useSelector((state) => state.user);
+  const city = useSelector((state) => state.city);
+  const [UserRole, setUserRole] = useState(null); // 1-普通用户 2-经纪人 3-置业顾问 4-驻场管理
+  const [MenuList, setMenuList] = useState([]);
+  const { dispatch } = store;
 
   useEffect(() => {
     if (user?.userInfo?.person?.personId) {
-      console.log(city)
-      const person = user.userInfo.person
-      setUserRole(person.personType === ROLE_CODE.CHANNEL_AGENT ? 2 : person.personType === ROLE_CODE.CONSULTANT ? 3 : person.personType === ROLE_CODE.MARKETING ? 4 :ROLE_CODE.BORKER ? 5 : 1)
+      console.log(city);
+      const person = user.userInfo.person;
+      setUserRole(
+        person.personType === ROLE_CODE.CHANNEL_AGENT
+          ? 2
+          : person.personType === ROLE_CODE.CONSULTANT
+          ? 3
+          : person.personType === ROLE_CODE.MARKETING
+          ? 4
+          : person.personType == ROLE_CODE.BROKER
+          ? 5
+          : 1
+      );
     }
-  }, [user])
+  }, [user]);
 
   useEffect(() => {
     if (UserRole !== null) {
-      setMenuList(UserRole === 1 ? MineMenuList.User : UserRole === 2 ? MineMenuList.Broker : UserRole === 3 ? MineMenuList.Adviser : UserRole === 5? MineMenuList.Broker: MineMenuList.Resident)
+      setMenuList(
+        UserRole === 1
+          ? MineMenuList.User
+          : UserRole === 2
+          ? MineMenuList.Broker
+          : UserRole === 3
+          ? MineMenuList.Adviser
+          : UserRole === 5
+          ? MineMenuList.Broker
+          : MineMenuList.Resident
+      );
     }
-  }, [UserRole])
+  }, [UserRole]);
 
   const MenuClick = (router) => {
     return () => {
-      if (router === 'propertyConsultant') {
-        fetch({ url: API_PUT_REGISTERCONSULTANT, method: 'put' }).then(() => {
-          Taro.showToast({
-            title: '匹配成功',
-            icon: 'none',
-            duration: 2000
-          })
-          dispatch({ type: UPDATE_USER_INFO, payload: { personType: 'Realty Consultant' } })
-          setTimeout(() => {
-            Taro.navigateBack({ delta: 1 })
-          }, 2000)
-        }).catch(() => {
-          Taro.showToast({
-            title: '匹配失败，请联系相关管理人员',
-            icon: 'none'
+      if (router === "propertyConsultant") {
+        fetch({ url: API_PUT_REGISTERCONSULTANT, method: "put" })
+          .then(() => {
+            Taro.showToast({
+              title: "匹配成功",
+              icon: "none",
+              duration: 2000,
+            });
+            dispatch({
+              type: UPDATE_USER_INFO,
+              payload: { personType: "Realty Consultant" },
+            });
+            setTimeout(() => {
+              Taro.navigateBack({ delta: 1 });
+            }, 2000);
           })
-        })
+          .catch(() => {
+            Taro.showToast({
+              title: "匹配失败，请联系相关管理人员",
+              icon: "none",
+            });
+          });
       } else if (router) {
-        Taro.navigateTo({ url: router })
+        Taro.navigateTo({ url: router });
       }
-    }
-  }
+    };
+  };
 
   return (
-    <view className='Page Mine'>
-
+    <view className="Page Mine">
       <ScrollView scroll-y>
-        <view className='PageContent'>
-          <view className='Content'>
-
+        <view className="PageContent">
+          <view className="Content">
             {/* 用户信息 */}
-            <view className='UserInfo'>
-              <view className='UserIcon'>
-                <Image mode='aspectFill' className='centerLabel' src={getImgURL(user?.userInfo?.person?.userPhoto || user?.userInfo?.person?.avatarurl) || defaultRuleImage} />
+            <view className="UserInfo">
+              <view className="UserIcon">
+                <Image
+                  mode="aspectFill"
+                  className="centerLabel"
+                  src={
+                    getImgURL(
+                      user?.userInfo?.person?.userPhoto ||
+                        user?.userInfo?.person?.avatarurl
+                    ) || defaultRuleImage
+                  }
+                />
               </view>
-              <view className='OtherInfo'>
-                <view className='Name'>
+              <view className="OtherInfo">
+                <view className="Name">
                   <view>
                     <text>{user?.userInfo?.person?.nickname}</text>
                     <view>
-                      <text className='iconfont icon-bianji' onClick={() => {  
-                        if (UserRole === 5) {
+                      <text
+                        className="iconfont icon-bianji"
+                        onClick={() => {
+                          if (UserRole === 5) {
                             Taro.navigateTo({
-                              url: `/subpackages/pages/borker/toBeBorker/index`,
+                              url: `/subpackages/pages/broker/toBeBroker/index`,
                             });
                           } else {
                             Taro.navigateTo({
@@ -93,10 +127,11 @@ export default withLayout(() => {
                           }
                         }}
                       ></text>
-                      <text onClick={() => {
+                      <text
+                        onClick={() => {
                           if (UserRole === 5) {
                             Taro.navigateTo({
-                              url: `/subpackages/pages/borker/toBeBorker/index`,
+                              url: `/subpackages/pages/broker/toBeBroker/index`,
                             });
                           } else {
                             Taro.navigateTo({
@@ -104,48 +139,66 @@ export default withLayout(() => {
                             });
                           }
                         }}
-                      >个人信息资料修改</text>
+                      >
+                        个人信息资料修改
+                      </text>
                     </view>
                   </view>
-                  <text className='Role'>{UserRole === 1 ? '客户' : UserRole === 2 ? '合伙人' : UserRole === 3 ? '置业顾问' :UserRole === 5 ?'全民经纪人' :'驻场管理'}</text>
+                  <text className="Role">
+                    {UserRole === 1
+                      ? "客户"
+                      : UserRole === 2
+                      ? "合伙人"
+                      : UserRole === 3
+                      ? "置业顾问"
+                      : UserRole === 5
+                      ? "全民经纪人"
+                      : "驻场管理"}
+                  </text>
                   {/* <text className='New'>NEW</text> */}
-                  <Image mode='heightFix' src={require('@/assets/mine-icon35.png')} className='New'></Image>
+                  <Image
+                    mode="heightFix"
+                    src={require("@/assets/mine-icon35.png")}
+                    className="New"
+                  ></Image>
                 </view>
               </view>
             </view>
 
             {/* 用户菜单 */}
-            <view className='MenuList'>
-              {
-                MenuList.map((item, index) => (
-                  <view>
-                    {
-                      item.map((subItem, subIndex) => (
-                        <view key={`MenuItem-${index}-${subIndex}`} className='flex-h' onClick={MenuClick(subItem.router)}>
-                          <view className='Icon'>
-                            <Image mode='aspectFit' className='centerLabel' src={subItem.icon} />
-                          </view>
-                          <view className='flex-item flex-h'>
-                            <text className='flex-item'>{subItem.name}</text>
-                            <text className='iconfont icon-jiantouright'></text>
-                          </view>
-                        </view>
-                      ))
-                    }
-                  </view>
-                ))
-              }
+            <view className="MenuList">
+              {MenuList.map((item, index) => (
+                <view>
+                  {item.map((subItem, subIndex) => (
+                    <view
+                      key={`MenuItem-${index}-${subIndex}`}
+                      className="flex-h"
+                      onClick={MenuClick(subItem.router)}
+                    >
+                      <view className="Icon">
+                        <Image
+                          mode="aspectFit"
+                          className="centerLabel"
+                          src={subItem.icon}
+                        />
+                      </view>
+                      <view className="flex-item flex-h">
+                        <text className="flex-item">{subItem.name}</text>
+                        <text className="iconfont icon-jiantouright"></text>
+                      </view>
+                    </view>
+                  ))}
+                </view>
+              ))}
             </view>
-
           </view>
         </view>
 
-        <view className='copyright'>
+        <view className="copyright">
           <view>{version}</view>
           <view>{copyRight}</view>
         </view>
       </ScrollView>
-
     </view>
-  )
-})
+  );
+});

src/pages/mine/tabData.js

@@ -20,15 +20,15 @@ const MineMenuList = {
       { name: '成为驻场管理', icon: require('@/assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
       { name: '成为置业顾问', icon: require('@/assets/mine-icon4.png'), router: 'propertyConsultant' },
       { name: '成为合伙人', icon: require('@/assets/mine-icon2.png'), router: '/pages/mine/toBeAgent/index' },
-      { name: '成为全民经纪人', icon: require('@/assets/mine-icon2.png'), router: '/subpackages/pages/borker/toBeBorker/index' }
+      { name: '成为全民经纪人', icon: require('@/assets/mine-icon2.png'), router: '/subpackages/pages/broker/toBeBroker/index' }
     ]
   ],
   Broker: [ // 经纪人
     [
-      { name: '我的钱包', icon: require('@/assets/mine-icon1.png'), router: '/subpackages/pages/borker/myWallet/index' },
+      { name: '我的钱包', icon: require('@/assets/mine-icon1.png'), router: '/subpackages/pages/broker/myWallet/index' },
       { name: '我的客户', icon: require('@/assets/mine-icon1.png'), router: '/pages/mine/myCustomer/index' },
-      { name: '我的资料', icon: require('@/assets/mine-icon1.png'), router: '/subpackages/pages/borker/toBeBorker/index' },
-      { name: '我的消息', icon: require('@/assets/mine-icon1.png'), router: '/subpackages/pages/borker/myMessage/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' },
     ],
     [

src/routes.js

@@ -417,76 +417,69 @@ const routes = [
   },
   {
     name: "全民经纪人",
-    page: "pages/borker/toBeBorker/index",
+    page: "pages/broker/toBeBroker/index",
     pkg: "subpackages",
     type: "other",
   },
   {
     name: "我的钱包",
-    page: "pages/borker/myWallet/index",
+    page: "pages/broker/myWallet/index",
     pkg: "subpackages",
     type: "other",
   },
   {
     name: "我的消息",
-    page: "pages/borker/myMessage/index",
+    page: "pages/broker/myMessage/index",
     pkg: "subpackages",
     type: "other",
   },
   {
     name: "排行榜",
-    page: "pages/borker/rankingList/index",
+    page: "pages/broker/rankingList/index",
     pkg: "subpackages",
     type: "other",
   },
   {
     name: "佣金结算",
-    page: "pages/borker/commissionSettlement/index",
+    page: "pages/broker/commissionSettlement/index",
     pkg: "subpackages",
     type: "other",
   },
 
- {
-    name: '经纪人',
-    page: 'pages/borker/agentRule/index',
-    pkg: 'subpackages',
-    type: 'other',
-    auth: ['phone', 'avatar'],
-  },
   {
-    name: '佣金规则',
-    page: 'pages/borker/agreement/index',
-    pkg: 'subpackages',
-    type: 'other',
-    auth: ['phone', 'avatar'],
+    name: "经纪人",
+    page: "pages/broker/agentRule/index",
+    pkg: "subpackages",
+    type: "other",
+    // auth: ['phone', 'avatar'],
   },
   {
-    name: '我的邀请',
-    page: 'pages/borker/invitation/index',
-    pkg: 'subpackages',
-    type: 'other',
-    auth: ['phone', 'avatar'],
+    name: "佣金规则",
+    page: "pages/broker/agreement/index",
+    pkg: "subpackages",
+    type: "other",
+    // auth: ['phone', 'avatar'],
   },
   {
-    name: '邀请列表',
-    page: 'pages/borker/invitationlist/index',
-    pkg: 'subpackages',
-    type: 'other',
-    auth: ['phone', 'avatar'],
+    name: "我的邀请",
+    page: "pages/broker/invitation/index",
+    pkg: "subpackages",
+    type: "other",
+    // auth: ['phone', 'avatar'],
   },
   {
-    name: '全民经纪人',
-    page: 'pages/borker/toBeBorker/index',
-    pkg: 'subpackages',
-    type: 'other',
+    name: "邀请列表",
+    page: "pages/broker/invitationlist/index",
+    pkg: "subpackages",
+    type: "other",
+    // auth: ['phone', 'avatar'],
   },
-  
-]
+];
 
 /**
  * 获取 app pages 列表
  */
-function getPages () {
+function getPages() {
   const grp = routes.reduce((g, r) => {
     const { pkg, page } = r;
     const pg = g[pkg] || [];

src/services/borker.js

@@ -1,12 +0,0 @@
-import { fetch } from '@/utils/request'
-
-import {
-  API_BK_AGREEMENT,
-} from '@/constants/borker'
-
-
-/**
- * 获取佣金数据
- * @param {*} id
- */
-export const queryBkAgreement = (payload) => fetch({ url: `${API_BK_AGREEMENT}`, payload })

src/services/broker.js

@@ -0,0 +1,28 @@
+import { fetch } from '@/utils/request'
+
+import {
+  API_BK_AGREEMENT,
+  API_BK_BANk_CARD,
+  API_BROKER_LIST
+} from '@/constants/broker'
+
+
+/**
+ * 获取佣金数据
+ * @param {*} id
+ */
+export const queryBkAgreement = (payload) => fetch({ url: `${API_BK_AGREEMENT}`, payload })
+
+
+/**
+ * 获取银行卡
+ * @param {*} 
+ */
+ export const querybkBankCard = (payload) => fetch({ url: `${API_BK_BANk_CARD}`, payload })
+
+
+/**
+ * 邀请的经纪人列表
+ * @param {*} 
+ */
+ export const querybrokerList = (payload) => fetch({ url: `${API_BROKER_LIST}`, payload })

src/services/common.js

@@ -3,6 +3,7 @@ import {
   API_PRELOAD,
   API_QRCODE,
   API_BANNER_LIST,
+  API_BROKER_SCREEN,
   API_QUERY_CODE_SCENE,
   API_BURIED_POINT,
   API_CITY_LIST,
@@ -18,7 +19,7 @@ import {
  *  @param {*} payload
  *
  */
-export const getPreloadData = payload =>
+export const getPreloadData = (payload) =>
   fetch({ url: API_PRELOAD, payload, method: "GET" });
 
 /**
@@ -26,7 +27,7 @@ export const getPreloadData = payload =>
  *  @param {*} payload
  *
  */
-export const getMiniQrcode = payload =>
+export const getMiniQrcode = (payload) =>
   fetch({ url: API_QRCODE, payload, method: "POST", showToast: false });
 
 /**
@@ -34,7 +35,7 @@ export const getMiniQrcode = payload =>
  *  @param {*} scene
  *
  */
-export const getCodeScene = scene =>
+export const getCodeScene = (scene) =>
   fetch({ url: `${API_QUERY_CODE_SCENE}/${scene}` });
 
 /**
@@ -51,21 +52,28 @@ export const queryBanners = (type, payload) =>
  * 获取 banner , 首屏等一些信息
  * @param {*} payload
  */
-export const queryExtContents = payload =>
+export const queryExtContents = (payload) =>
   fetch({ url: API_BANNER_LIST, payload });
 
+/**
+ * 获取 banner , 首屏等一些信息
+ * @param {*} payload
+ */
+export const queryBrokerScreen = (payload) =>
+  fetch({ url: API_BROKER_SCREEN, payload });
+
 /**
  * 获取 首页图标
  * @param {*} payload
  */
-export const queryIndexIcons = payload =>
+export const queryIndexIcons = (payload) =>
   fetch({ url: API_INDEX_ICONS, payload });
 
 /**
  * 新增埋点
  * @param {*} payload
  */
-export const savePoint = payload =>
+export const savePoint = (payload) =>
   fetch(
     { url: API_BURIED_POINT, payload, method: "POST", showToast: false },
     2
@@ -89,25 +97,26 @@ export const queryCityList = () => fetch({ url: API_CITY_LIST });
  * 获取消息模板
  * @param {*}
  */
-export const queryMessageTPL = type =>
+export const queryMessageTPL = (type) =>
   fetch({ url: `${API_TEMPLATE_TYPE}/${type}` });
 
-
 /**
  * 获取品牌房企列表
  * @param {*}
  */
-export const queryBrandList = (payload) => fetch({ url: API_BRAND_LIST, payload });
+export const queryBrandList = (payload) =>
+  fetch({ url: API_BRAND_LIST, payload });
 
 /**
  * 获取品牌房企列表
  * @param {*}
  */
-export const queryBrandInfo = (id) => fetch({ url: `${API_BRAND_INFO}/${id}`});
+export const queryBrandInfo = (id) => fetch({ url: `${API_BRAND_INFO}/${id}` });
 
 /**
  * 获取系统参数
- * @param {*} code 
- * @returns 
+ * @param {*} code
+ * @returns
  */
-export const getSystemParsm = (code) => fetch({ url: `${API_SYSTEM_PARAM}/${code}` })
+export const getSystemParsm = (code) =>
+  fetch({ url: `${API_SYSTEM_PARAM}/${code}` });

src/subpackages/pages/borker/components/CardItem/index.jsx

@@ -1,22 +0,0 @@
-import { useState, useEffect } from "react";
-import Taro from "@tarojs/taro";
-
-import "./index.scss";
-
-export default (props) => {
-  const { title,addCard } = props;
-
-  return (
-    <view className="CardItem">
-      <view>
-        <text>{title}</text>
-        <view className="FormLine flex-h">
-          <view className="flex-item">12321312312</view>
-        </view>
-        <view className="FormLine flex-additem-h">
-          <view className="flex-additem" onClick={()=>addCard()} >添加证件</view>
-        </view>
-      </view>
-    </view>
-  );
-};

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

@@ -1,26 +0,0 @@
-import withLayout from '@/layout'
-import Taro from '@tarojs/taro'
-import { View, Image, Text } from '@tarojs/components'
-
-import './index.scss'
-
-export default withLayout(() => {
-  const img1 = 'https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/borker/%E9%82%80%E8%AF%B7%E5%A5%96%E5%8A%B1.png';
-  const img2 = 'https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/borker/%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/borker/%E5%85%A8%E6%B0%91%E7%BB%8F%E7%BA%AA%E4%BA%BA.png'
-  return (
-    <View className='invitationlist-background'>
-      <View className='invitationlist-font'>总邀请人数</View><View className='invitationlist-font-right'><Image className='invitationlist-img' mode='widthFix' src={img1} />邀请奖励</View>
-      <View className='invitationlist-background-2'>
-        <View className='invitationlist-font-tl'>240</View><View className='invitationlist-font-right-t'><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 className='invitationlist-view-list'>
-        <View className='invitationlist-img-frame'><Image className='invitationlist-img-head' src={defaultRuleImage} /></View>
-        <View className='invitationlist-view-list-ifr'><Text className='invitationlist-text-1'>阿三三</Text><Text className='invitationlist-text'>0</Text><Text className='invitationlist-text'>0</Text><Text className='invitationlist-time'>2022/07/26</Text></View>
-        <View className='invitationlist-view-list-ifr-t'><Text className='invitationlist-text-t1'>16787659987</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>
-  )
-})

src/subpackages/pages/borker/toBeBorker/AddBankCard/index.jsx

@@ -1,52 +0,0 @@
-import { useState, useEffect } from "react";
-import Taro from "@tarojs/taro";
-import { ScrollView, Input, Image, Block, Textarea } from '@tarojs/components'
-import "./index.scss";
-
-export default (props) => {
-  const { title,onChanel } = props;
-
-  const [FormData, setFormData] = useState({
-    name: '',
-    phone: '',
-    description: ''
-  })
-
-  const FormChange = (key, e) => {
-    let Data = { ...FormData }
-    Data[key] = e.detail.value
-    setFormData(Data)
-  }
-
-  return (
-    <view className="AddIdentityCard">
-    
-
-          <text>持卡人</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入用户名' value={FormData.name} onInput={FormChange.bind(this, 'name')}></Input>
-            </view>
-          </view>
-
-          <text>开户行</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入开户行' value={FormData.phone} onInput={FormChange.bind(this, 'phone')}></Input>
-            </view>
-          </view>
-
-          <text>银行卡号</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入银行卡号' value={FormData.phone} onInput={FormChange.bind(this, 'phone')}></Input>
-            </view>
-          </view>
-
-          <view className='Btn'>
-          <text >确定</text>
-          <text onClick={()=>onChanel()} >取消</text>
-        </view>
-    </view>
-  );
-};

src/subpackages/pages/borker/toBeBorker/index.jsx

@@ -1,145 +0,0 @@
-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 store from '@/store'
-import CardItem from '../components/CardItem'
-import AddBankCard from './AddBankCard'
-
-import '@/assets/css/iconfont.css'
-import './index.scss'
-
-export default withLayout(() => {
-
-  const { dispatch } = store
-
-  const user = useSelector(state => state.user)
-  const [UserInfo, setUserInfo] = useState({})
-  const [UserRole, setUserRole] = useState(null) // 1-普通用户 2-经纪人 3-置业顾问 4-驻场管理 5-
-  const [FormData, setFormData] = useState({
-    name: '',
-    phone: '',
-    description: ''
-  })
-  const [showAddIdentityCard, setShowAddIdentityCard] = useState(false)
-  
-
-  useEffect(() => {
-    if (user?.userInfo?.person?.personId) {
-      const person = user.userInfo.person
-      setUserRole(person.personType === ROLE_CODE.CHANNEL_AGENT ? 2 : person.personType === ROLE_CODE.CONSULTANT ? 3 : person.personType === ROLE_CODE.MARKETING ? 4 : 1)
-    }
-  }, [user])
-
-  useEffect(() => {
-    setUserInfo(user?.userInfo?.person)
-    setFormData({ name: user?.userInfo?.person.name, phone: user?.userInfo?.person.phone, description: user?.userInfo?.person.description })
-  }, [user])
-
-  const Save = () => {
-    let params = ''
-    if(UserRole === 3) {
-      params = `name=${FormData.name}&phone=${FormData.phone}&description=${FormData.description}`
-    } else {
-      params = `name=${FormData.name}&phone=${FormData.phone}`
-    }
-    fetch({ url: `${API_EDIT_AGENT}?${params}`, method: 'put' }).then(() => {
-      Taro.showToast({
-        title: '修改成功',
-        icon: 'none'
-      })
-      dispatch({ type: UPDATE_USER_INFO, payload: { name: FormData.name, phone: FormData.phone, description: FormData.description } })
-      // login({ path: '', scene: '' })
-    })
-  }
-
-  const FormChange = (key, e) => {
-    let Data = { ...FormData }
-    Data[key] = e.detail.value
-    setFormData(Data)
-  }
-
-  const ToUploadImg = () => {
-    if (UserRole - 0 === 3) {
-      Taro.chooseImage({
-        count: 1,
-        success: function (res) {
-          if (res.errMsg === 'chooseImage:ok') {
-            Taro.showToast({ title: '正在上传...', icon: 'loading', mask: true, duration: 10000 })
-            uploadFiles(res.tempFilePaths).then((subRes) => {
-              fetch({ url: API_UPDATE_PHOTO, payload: { photoUrl: subRes[0] }, method: 'put' }).then(() => {
-                Taro.hideToast()
-                Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
-                dispatch({ type: UPDATE_USER_INFO, payload: { userPhoto: subRes[0] } })
-              })
-            })
-          }
-        }
-      })
-    }
-  }
-
-  return (
-    <view className='Page UserInfo'>
-
-      <ScrollView scroll-y>
-        <view className='PageContent'>
-
-          <text>头像</text>
-          <view className='FormLine flex-h' onClick={ToUploadImg}>
-            <view className='flex-item'>
-              <view className='Icon'>
-                <Image mode='aspectFill' src={getImgURL(UserInfo.userPhoto || UserInfo.avatarurl)}></Image>
-              </view>
-            </view>
-            {/* <text className='iconfont icon-jiantouright'></text> */}
-          </view>
-
-          <text>用户名</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入用户名' value={FormData.name} onInput={FormChange.bind(this, 'name')}></Input>
-            </view>
-          </view>
-
-          <text>手机号码</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入手机号码' value={FormData.phone} onInput={FormChange.bind(this, 'phone')}></Input>
-            </view>
-          </view>
-
-          <text>证件号码</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入证件号码' value={FormData.phone} onInput={FormChange.bind(this, 'phone')}></Input>
-            </view>
-          </view>
-
-
-          <CardItem title='银行卡号' addCard={()=>setShowAddIdentityCard(true)}></CardItem>
-          {/* <text>证件号码</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入手机号码' value={FormData.phone} onInput={FormChange.bind(this, 'phone')}></Input>
-            </view>
-          </view> */}
-
-        </view>
-
-        <view className='Btn'>
-          <text onClick={Save}>保存</text>
-        </view>
-      </ScrollView>
-
-
-{showAddIdentityCard&&  <AddBankCard onChange={(e)=>console.log(e)} onChanel={()=>setShowAddIdentityCard(false)}></AddBankCard>}
-
-    </view>
-  )
-})

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

@@ -2,13 +2,13 @@ import withLayout from '@/layout'
 import { ScrollView, View, Image, Text, RichText } from '@tarojs/components'
 import './index.scss'
 
-const defaultRuleImage = 'https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/borker/%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>';
   return (
-    <ScrollView className='Page borker-page' style={{ height: '100vh' }} scrollY>
+    <ScrollView className='Page broker-page' style={{ height: '100vh' }} scrollY>
       <Image mode='heightFix' className='img-set' src={defaultRuleImage} />
-      <View className='borker-padding'>
+      <View className='broker-padding'>
         <View>
           <Text>邀请奖励说明</Text>
           <View>

src/subpackages/pages/borker/agentRule/index.scss → src/subpackages/pages/broker/agentRule/index.scss

@@ -1,9 +1,9 @@
-.Page.borker-page{
+.Page.broker-page{
   .img-set{
      width: 100vw;
      display:block;
     }
-  .borker-padding{
+  .broker-padding{
     background-color: #49A8C1;
     padding: 6rpx 30rpx 24rpx 30rpx;
     >view{

src/subpackages/pages/borker/agreement/index.jsx → src/subpackages/pages/broker/agreement/index.jsx

@@ -2,7 +2,7 @@ import withLayout from '@/layout'
 import Taro from '@tarojs/taro'
 import { ScrollView, View, RichText } from '@tarojs/components'
 import { useEffect, useState } from 'react'
-import { queryBkAgreement } from "@/services/borker";
+import { queryBkAgreement } from "@/services/broker";
 
 import './index.scss'
 

src/subpackages/pages/borker/agreement/index.scss → src/subpackages/pages/broker/agreement/index.scss

@@ -1,7 +1,7 @@
 .agreement-wrapper {
   height: 100%;
   background-color: #FF7F5F;
-  background-image: url(https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/borker/%E4%BD%A3%E9%87%91%E8%A7%84%E5%88%991.png), url(https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/borker/%E4%BD%A3%E9%87%91%E8%A7%84%E5%88%992.png);
+  background-image: url(https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/broker/%E4%BD%A3%E9%87%91%E8%A7%84%E5%88%991.png), url(https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/broker/%E4%BD%A3%E9%87%91%E8%A7%84%E5%88%992.png);
   background-size: contain, contain;
   background-position: center top, center bottom;
   background-repeat: no-repeat, no-repeat;

src/subpackages/pages/broker/components/CardItem/index.jsx

@@ -0,0 +1,44 @@
+import { useState, useEffect } from "react";
+import Taro from "@tarojs/taro";
+
+import "./index.scss";
+
+export default (props) => {
+  const { title, addCard, bankCard = [], onDelete = {} } = props;
+
+  return (
+    <view className="CardItem">
+      <view>
+        <text>{title}</text>
+        <view className="FormLine flex-h">
+          {bankCard.map((x) => {
+            return (
+              <view key={x.cardNo} className="flex-item">
+                {x.cardNo}{" "}
+                <image
+                  className="image"
+                  src={`${OSS_FAST_PATH}/miniapp/broker/添加.png`}
+                  alt=""
+                  srcset=""
+                  style={{ transform: "rotate(45deg)",float:'right' }}
+                  onClick={()=>onDelete(x)}
+                />
+              </view>
+            );
+          })}
+        </view>
+        <view className="FormLine flex-additem-h">
+          <view className="flex-additem" onClick={() => addCard()}>
+            <image
+              className="image"
+              src={`${OSS_FAST_PATH}/miniapp/broker/添加.png`}
+              alt=""
+              srcset=""
+            />
+            添加证件
+          </view>
+        </view>
+      </view>
+    </view>
+  );
+};

src/subpackages/pages/borker/components/CardItem/index.scss → src/subpackages/pages/broker/components/CardItem/index.scss

@@ -3,7 +3,7 @@
   display: grid;
   > view {
     background: #fff;
-margin-top: 20px;
+    margin-top: 20px;
     > text {
       font-size: 34px;
       font-weight: bold;
@@ -15,11 +15,14 @@ margin-top: 20px;
     }
     > .flex-h {
       box-sizing: border-box;
-      padding: 20px 40px;
+      padding: 0 40px 20px;
       border-bottom: 2px solid rgba(0, 0, 0, 0.12);
       margin-top: 10px;
       align-items: center;
+      flex-direction: column;
       > view {
+        margin-top: 20px;
+        width: 100%;
         > .Icon {
           width: 92px;
           height: 92px;
@@ -32,19 +35,7 @@ margin-top: 20px;
             height: 100%;
           }
         }
-        > input {
-          display: block;
-          width: 100%;
-          background: none;
-          font-size: 26px;
-          line-height: 40px;
-          height: 40px;
-        }
-        > textarea {
-          font-size: 26px;
-          display: block;
-          width: 100%;
-        }
+       
         > text {
           display: block;
           width: 100%;
@@ -54,7 +45,7 @@ margin-top: 20px;
           height: 40px;
         }
       }
-      >.flex-additem{
+      > .flex-additem {
         text-align: center;
       }
       > text {
@@ -81,15 +72,19 @@ margin-top: 20px;
             height: 100%;
           }
         }
-      
-      
       }
-      >.flex-additem{
+      > .flex-additem {
         text-align: center;
       }
       > text {
         font-size: 30px;
       }
     }
+    .image {
+      width: 27px;
+      height: 27px;
+      vertical-align: middle;
+      margin-right: 14px;
+    }
   }
 }

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

@@ -5,7 +5,7 @@ import './index.scss'
 
 import BottomAction from './BottomAction'
 
-const defaultImage = 'https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/borker/%E6%B5%B7%E6%8A%A5.png'
+const defaultImage = 'https://xlk-assets.oss-cn-shanghai.aliyuncs.com/miniapp/broker/%E6%B5%B7%E6%8A%A5.png'
 
 export default withLayout(() => {
   return (

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

@@ -0,0 +1,78 @@
+import withLayout from "@/layout";
+import Taro from "@tarojs/taro";
+import { View, Image, Text } from "@tarojs/components";
+
+import "./index.scss";
+import { useState, useEffect } from "react";
+import { querybrokerList } from "@/services/broker";
+
+export default withLayout(() => {
+  const [list, setList] = useState([]);
+  const [total, setTotal] = useState(0);
+  useEffect(() => {
+    getList();
+  }, []);
+
+  const getList = () => {
+    querybrokerList().then((res) => {
+      setList([...res.records,...res.records]);
+      setTotal(res.total);
+    });
+  };
+
+  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>
+        <View className="invitationlist-font">总邀请人数</View>
+        <View className="invitationlist-font-right">
+          <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">
+            <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) => {
+          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>
+    </View>
+  );
+});

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

@@ -4,6 +4,8 @@
   background-color: #4A2FA0;
   padding-top: 80rpx;
   box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
   .invitationlist-font{
     letter-spacing:4rpx;
     padding-left: 60rpx;
@@ -16,6 +18,7 @@
     width: 28rpx;
     margin-right:16rpx;
     display: inline-block;
+    vertical-align: middle;
   }
   .invitationlist-font-right{
     letter-spacing:4rpx;
@@ -46,6 +49,7 @@
     }
   }
   .invitationlist-view-1{
+   
     letter-spacing:4rpx;
     padding-left: 60rpx;
     box-sizing: border-box;
@@ -60,6 +64,7 @@
     }
   }
   .invitationlist-view-list{
+    flex: 1;
     height: 150rpx;
     width: 100%;
     display: inline-block;
@@ -69,6 +74,9 @@
     padding: 20rpx 30rpx 0;
     box-sizing: border-box;
     border-bottom: 1rpx solid rgba(25, 60, 131, 0.2);
+    .invitationlist-view-item{
+
+    }
     .invitationlist-img-frame{
       margin: 30rpx 14rpx 0 2rpx;
       width: 66rpx;

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

@@ -9,7 +9,7 @@ export default (props) => {
   return (
     <view className="Item messageItem">
      <view className="messageItem-top">
-      <image className="image" src={`${OSS_FAST_PATH}/miniapp/borker/消息.png`} alt="" srcset="" />
+      <image className="image" src={`${OSS_FAST_PATH}/miniapp/broker/消息.png`} alt="" srcset="" />
       消息提醒
      </view>
      <view className="messageItem-bottom"></view>

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

@@ -20,7 +20,7 @@ export default withLayout(() => {
       <view className="rankingList-backimage">
         <image
           className="image"
-          src={`${OSS_FAST_PATH}/miniapp/borker/全民排行榜.png`}
+          src={`${OSS_FAST_PATH}/miniapp/broker/全民排行榜.png`}
           alt=""
           srcset=""
         />

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

@@ -29,7 +29,7 @@ export default withLayout(() => {
         <view>
           <image
             className="list-image"
-            src={`${OSS_FAST_PATH}/miniapp/borker/消息.png`}
+            src={`${OSS_FAST_PATH}/miniapp/broker/消息.png`}
             alt=""
             srcset=""
           />

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

@@ -29,7 +29,7 @@ export default withLayout(() => {
         <view>
           <image
             className="list-image"
-            src={`${OSS_FAST_PATH}/miniapp/borker/消息.png`}
+            src={`${OSS_FAST_PATH}/miniapp/broker/消息.png`}
             alt=""
             srcset=""
           />

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

@@ -0,0 +1,74 @@
+import { useState, useEffect } from "react";
+import Taro from "@tarojs/taro";
+import { ScrollView, Input, Image, Block, Textarea } from "@tarojs/components";
+import "./index.scss";
+
+export default (props) => {
+  const { title, onChanel,onChange=()=>{} } = props;
+
+  const [FormData, setFormData] = useState({
+    ownerName: "",
+    bankName: "",
+    cardNo: "",
+  });
+
+  const FormChange = (key, e) => {
+    let Data = { ...FormData };
+    Data[key] = e.detail.value;
+    setFormData(Data);
+  };
+  
+
+  const onsubmit = () => {
+    if(FormData.ownerName&&FormData.bankName&&FormData.cardNo){
+      onChange(FormData)
+    }else{
+      Taro.showToast({
+        title: "请补全银行卡信息",
+        icon: "none",
+        duration: 2000,
+      });
+    }
+  };
+  return (
+    <view className="AddIdentityCard">
+      <text>持卡人</text>
+      <view className="FormLine flex-h">
+        <view className="flex-item">
+          <Input
+            placeholder="请输入用户名"
+            value={FormData.ownerName}
+            onInput={FormChange.bind(this, "ownerName")}
+          ></Input>
+        </view>
+      </view>
+
+      <text>开户行</text>
+      <view className="FormLine flex-h">
+        <view className="flex-item">
+          <Input
+            placeholder="请输入开户行"
+            value={FormData.bankName}
+            onInput={FormChange.bind(this, "bankName")}
+          ></Input>
+        </view>
+      </view>
+
+      <text>银行卡号</text>
+      <view className="FormLine flex-h">
+        <view className="flex-item">
+          <Input
+            placeholder="请输入银行卡号"
+            value={FormData.cardNo}
+            onInput={FormChange.bind(this, "cardNo")}
+          ></Input>
+        </view>
+      </view>
+
+      <view className="Btn">
+        <text onClick={() => onChanel()}>取消</text>
+        <text onClick={()=>onsubmit(FormData)}>确定</text>
+      </view>
+    </view>
+  );
+};

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

@@ -0,0 +1,235 @@
+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_BIND_BROKER, API_UPDATE_PHOTO } from "@/constants/api";
+import store from "@/store";
+import CardItem from "../components/CardItem";
+import AddBankCard from "./AddBankCard";
+import { querybkBankCard } from "@/services/broker";
+import "@/assets/css/iconfont.css";
+import "./index.scss";
+
+export default withLayout(() => {
+  const { dispatch } = store;
+
+  const user = useSelector((state) => state.user);
+  const [UserInfo, setUserInfo] = useState({});
+  const [UserRole, setUserRole] = useState(null); // 1-普通用户 2-经纪人 3-置业顾问 4-驻场管理 5-
+  const [FormData, setFormData] = useState({
+    name: "",
+    phone: "",
+    idNo: "",
+  });
+  const [showAddIdentityCard, setShowAddIdentityCard] = useState(false);
+  const [bankCard, setBankCard] = useState([]);
+
+  // 获取银行卡列表
+  useEffect(() => {
+    Taro.showLoading();
+
+    querybkBankCard().then((res) => {
+      console.log(res, "queryBkAgreement");
+      setBankCard(res?.records || []);
+      Taro.hideLoading();
+    });
+  }, []);
+
+  useEffect(() => {
+    if (user?.userInfo?.person?.personId) {
+      const person = user.userInfo.person;
+      setUserRole(
+        person.personType === ROLE_CODE.CHANNEL_AGENT
+          ? 2
+          : person.personType === ROLE_CODE.CONSULTANT
+          ? 3
+          : person.personType === ROLE_CODE.MARKETING
+          ? 4
+          : 1
+      );
+    }
+  }, [user]);
+
+  useEffect(() => {
+    setUserInfo(user?.userInfo?.person);
+    console.log(user?.userInfo?.person, "=22==");
+    setFormData({
+      name: user?.userInfo?.person.name,
+      phone: user?.userInfo?.person.phone,
+      idNo: user?.userInfo?.person.idNo,
+
+    });
+  }, [user]);
+
+  const Save = () => {
+    let params = "";
+   
+      params = `name=${FormData.name}&phone=${FormData.phone}&idNo=${FormData.idNo}`;
+    console.log(params)
+    fetch({ url: `${API_BIND_BROKER}`, method: "put",payload:{...FormData} }).then(() => {
+      Taro.showToast({
+        title: "修改成功",
+        icon: "none",
+      });
+      dispatch({
+        type: UPDATE_USER_INFO,
+        payload: {
+          name: FormData.name,
+          phone: FormData.phone,
+          idNo: FormData.idNo,
+        },
+
+      
+      });
+      Taro.navigateBack({ delta: 1 })
+      // login({ path: '', scene: '' })
+    });
+  };
+
+  const hangDeleteBankCard = (e) => {
+    setBankCard((data) => {
+      return data.filter((x) => x.cardNo !== e.cardNo);
+    });
+  };
+
+  const handAddBankCard = (e) => {
+    console.log(bankCard,e,bankCard.find((x) => x.cardNo === e.cardNo),'333')
+    if (bankCard.find((x) => x.cardNo === e.cardNo)) {
+      console.log('333')
+      Taro.showToast({
+        title: "存在相同银行卡",
+        icon: "none",
+        duration: 2000,
+      });
+    } else {
+      setShowAddIdentityCard(false);
+      setBankCard((data) => {
+        return [...data, e];
+      });
+    }
+  };
+
+  const FormChange = (key, e) => {
+    let Data = { ...FormData };
+    Data[key] = e.detail.value;
+    setFormData(Data);
+  };
+
+  const ToUploadImg = () => {
+    if (UserRole - 0 === 3) {
+      Taro.chooseImage({
+        count: 1,
+        success: function (res) {
+          if (res.errMsg === "chooseImage:ok") {
+            Taro.showToast({
+              title: "正在上传...",
+              icon: "loading",
+              mask: true,
+              duration: 10000,
+            });
+            uploadFiles(res.tempFilePaths).then((subRes) => {
+              fetch({
+                url: API_UPDATE_PHOTO,
+                payload: { photoUrl: subRes[0] },
+                method: "put",
+              }).then(() => {
+                Taro.hideToast();
+                Taro.showToast({
+                  title: "修改成功",
+                  icon: "none",
+                  duration: 2000,
+                });
+                dispatch({
+                  type: UPDATE_USER_INFO,
+                  payload: { userPhoto: subRes[0] },
+                });
+              });
+            });
+          }
+        },
+      });
+    }
+  };
+  console.log(UserInfo, "UserInfo");
+  return (
+    <view className="Page UserInfo">
+      <ScrollView scroll-y>
+        <view className="PageContent">
+          <text>头像</text>
+          <view className="FormLine flex-h" onClick={ToUploadImg}>
+            <view className="flex-item">
+              <view className="Icon">
+                <Image
+                  mode="aspectFill"
+                  src={getImgURL(UserInfo.userPhoto || UserInfo.avatarurl)}
+                ></Image>
+              </view>
+            </view>
+            {/* <text className='iconfont icon-jiantouright'></text> */}
+          </view>
+
+          <text>用户名</text>
+          <view className="FormLine flex-h">
+            <view className="flex-item">
+              <Input
+                placeholder="请输入用户名"
+                value={FormData.name}
+                onInput={FormChange.bind(this, "name")}
+              ></Input>
+            </view>
+          </view>
+
+          <text>手机号码</text>
+          <view className="FormLine flex-h">
+            <view className="flex-item">
+              <Input
+                placeholder="请输入手机号码"
+                value={FormData.phone}
+                onInput={FormChange.bind(this, "phone")}
+              ></Input>
+            </view>
+          </view>
+
+          <text>证件号码</text>
+          <view className="FormLine flex-h">
+            <view className="flex-item">
+              <Input
+                placeholder="请输入证件号码"
+                value={FormData.idNo}
+                onInput={FormChange.bind(this, "idNo")}
+              ></Input>
+            </view>
+          </view>
+
+          <CardItem
+            title="银行卡号"
+            bankCard={bankCard}
+            onDelete={hangDeleteBankCard}
+            addCard={() => setShowAddIdentityCard(true)}
+          ></CardItem>
+          {/* <text>证件号码</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请输入手机号码' value={FormData.phone} onInput={FormChange.bind(this, 'phone')}></Input>
+            </view>
+          </view> */}
+        </view>
+
+        <view className="Btn">
+          <text onClick={Save}>保存</text>
+        </view>
+      </ScrollView>
+
+      {showAddIdentityCard && (
+        <AddBankCard
+          onChange={(e) => handAddBankCard(e)}
+          onChanel={() => setShowAddIdentityCard(false)}
+        ></AddBankCard>
+      )}
+    </view>
+  );
+});

src/subpackages/pages/borker/toBeBorker/index.scss → src/subpackages/pages/broker/toBeBroker/index.scss

@@ -9,7 +9,7 @@
     .PageContent {
       position: relative;
       overflow: hidden;
-      min-height: calc(100vh - 100px);
+      min-height: calc(100vh - 300px);
       z-index: 1;
       padding-bottom: 100px;
       > text {

src/utils/hooks/useScreen.js

@@ -4,32 +4,49 @@
  */
 import { useEffect, useState, useCallback } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import { queryExtContents } from '@/services/common'
+import { queryExtContents, queryBrokerScreen } from '@/services/common'
+import { ROLE_CODE } from "@/constants/user";
 
 export default function useScreen(cityId, person) {
   const dispatch = useDispatch()
-
   const [firstScreen, setFirstScreen] = useState()
   const cityShow = useSelector(s => s.system.firstScreen.filter(x => x.cityId === cityId)[0])
   const toggle = useCallback(
     () => dispatch({ type: 'TOGGLE_FIRSTSCREEN', payload: { cityId } }),
     [cityId, dispatch],
   )
-
+ 
   useEffect(() => {
     if (cityId && person?.personId) {
-      queryExtContents({cityId}).then((res) => {
-        const screen = (res || []).filter(x => x.showType === 'screen' && x.showPosition === 'index')[0]
-        if (!screen) {
-          return;
-        }
-
-        setFirstScreen(screen)
+      if(person.personType === ROLE_CODE.BROKER){
+        // 全民经纪人的开屏广告
+        queryBrokerScreen({cityId}).then((res) => {
+          const screen = res?.records?.map(x=>({...x,image:x.imageUrl}))[0]
+          if (!screen) {
+            return;
+          }
+  
+          setFirstScreen(screen)
+    
+          if (screen) {
+            toggle()
+          }
+        })
+      }else{
+        queryExtContents({cityId}).then((res) => {
+          const screen = (res || []).filter(x => x.showType === 'screen' && x.showPosition === 'index')[0]
+          if (!screen) {
+            return;
+          }
   
-        if (screen) {
-          toggle()
-        }
-      })
+          setFirstScreen(screen)
+    
+          if (screen) {
+            toggle()
+          }
+        })
+      }
+      
     }
   }, [cityId, toggle, person?.personId])