feats

config/routes.js

@@ -555,35 +555,35 @@ export default [
             ],
           },
           {
-            path: '/borker',
+            path: '/broker',
             name: '全民经纪人',
             component: '../layouts/BlankLayout',
-            menuCode: '/borker',
+            menuCode: '/broker',
             routes: [
               {
-                path: '/borker/announcement',
+                path: '/broker/announcement',
                 name: '通知公告',
-                component: './borker/announcement/index',
-                menuCode: '/borker/announcement',
+                component: './broker/announcement/index',
+                menuCode: '/broker/announcement',
               },
               {
-                path: '/borker/announcement/edit',
+                path: '/broker/announcement/edit',
                 name: '通知公告维护',
                 hideInMenu: true,
-                component: './borker/announcement/Edit/index',
-                menuCode: '/borker/announcement/edit',
+                component: './broker/announcement/Edit/index',
+                menuCode: '/broker/announcement/edit',
               },
               {
-                path: '/borker/list',
+                path: '/broker/list',
                 name: '经纪人管理',
-                component: './borker/list/index',
-                menuCode: '/borker/list',
+                component: './broker/list/index',
+                menuCode: '/broker/list',
               },
               {
-                path: '/borker/agentRule',
+                path: '/broker/agentRule',
                 name: '经纪人规则',
-                component: './borker/agentRule/index',
-                menuCode: '/borker/agentRule',
+                component: './broker/agentRule/index',
+                menuCode: '/broker/agentRule',
               },
             ],
           },

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

@@ -31,8 +31,8 @@ const editorMenus = [
   'undo', // 撤销
 ];
 
-const getAgentRule = fetch(apis.borker.getAgentRule)
-const saveAgentRule = fetch(apis.borker.saveAgentRule)
+const getAgentRule = fetch(apis.broker.getAgentRule)
+const saveAgentRule = fetch(apis.broker.saveAgentRule)
 
 const AgentRule = React.forwardRef((props, ref) => {
   const { getFieldDecorator, validateFieldsAndScroll, setFieldsValue } = props.form

src/pages/borker/announcement/Edit/index.jsx → src/pages/broker/announcement/Edit/index.jsx

@@ -26,9 +26,9 @@ const editorMenus = [
 ];
 const fullWidth = { width: '100%' }
 
-const getFirstScreenDetail = fetch(apis.borker.getFirstScreenDetail)
-const saveFirstScreen = fetch(apis.borker.saveFirstScreen)
-const updateFirstScreen = fetch(apis.borker.updateFirstScreen)
+const getFirstScreenDetail = fetch(apis.broker.getFirstScreenDetail)
+const saveFirstScreen = fetch(apis.broker.saveFirstScreen)
+const updateFirstScreen = fetch(apis.broker.updateFirstScreen)
 
 const AnnouncementEdit = React.forwardRef((props, ref) => {
   const { history, form } = props

src/pages/borker/announcement/index.jsx → src/pages/broker/announcement/index.jsx

@@ -18,10 +18,10 @@ const searchFields = [
   },
 ]
 
-const updateFirstScreen = fetch(apis.borker.updateFirstScreen)
+const updateFirstScreen = fetch(apis.broker.updateFirstScreen)
 
 const actionRender = () => {
-  const gotoAdd = () => router.push('/borker/announcement/edit')
+  const gotoAdd = () => router.push('/broker/announcement/edit')
   return (
     <Button type="primary" icon="plus" onClick={gotoAdd}>新增</Button>
   )
@@ -46,7 +46,7 @@ export default (props) => {
       title: '标题',
       dataIndex: 'title',
       key: 'title',
-      render: (t, row) => <Button type="link" onClick={() => router.push(`/borker/announcement/edit?id=${row.screenId}`)}>{t}</Button>
+      render: (t, row) => <Button type="link" onClick={() => router.push(`/broker/announcement/edit?id=${row.screenId}`)}>{t}</Button>
     },
     {
       title: '跳转页面',
@@ -74,7 +74,7 @@ export default (props) => {
       align: 'center',
       render: (_, row) => (
         <>
-          <OperButton onClick={() => router.push(`/borker/announcement/edit?id=${row.screenId}`)}>详情</OperButton>
+          <OperButton onClick={() => router.push(`/broker/announcement/edit?id=${row.screenId}`)}>详情</OperButton>
           <OperButton.Confirm title="确认进行操作?" color="#1890ff" onClick={() => onPublish(row)}>{row.status === 1 ? '取消发布' : '发布'}</OperButton.Confirm>
         </>
       )
@@ -109,7 +109,7 @@ export default (props) => {
       <QueryTable
         ref={ref}
         rowKey="screenId"
-        api={apis.borker.getFirstScreenList}
+        api={apis.broker.getFirstScreenList}
         searchFields={searchFields}
         columns={tableColumns}
         actionRender={actionRender}

src/pages/borker/announcement/util.js → src/pages/broker/announcement/util.js

@@ -6,7 +6,7 @@ export const showTypeList = [
 export const pages = [
   {
     title: '页面1',
-    page: '/subpackages/pages/borker',
+    page: '/subpackages/pages/broker',
   }
 ]
 

src/pages/borker/list/index.jsx → src/pages/broker/list/index.jsx

@@ -114,7 +114,7 @@ export default (props) => {
     //   align: 'center',
     //   render: (_, row) => (
     //     <>
-    //       <OperButton onClick={() => router.push(`/borker/announcement/edit?id=${row.screenId}`)}>详情</OperButton>
+    //       <OperButton onClick={() => router.push(`/broker/announcement/edit?id=${row.screenId}`)}>详情</OperButton>
     //       <OperButton.Confirm title="确认进行操作?" color="#1890ff" onClick={() => onPublish(row)}>{row.status === 1 ? '取消发布' : '发布'}</OperButton.Confirm>
     //     </>
     //   )
@@ -125,7 +125,7 @@ export default (props) => {
     <QueryTable
       ref={ref}
       rowKey="personId"
-      api={apis.borker.getBorkerList}
+      api={apis.broker.getBrokerList}
       searchFields={searchFields}
       columns={tableColumns}
     />

src/pages/building/Edit/Basic/index.jsx

@@ -131,7 +131,7 @@ const BuildingBasic = React.forwardRef((props, ref) => {
         updateFormLoading(true)
         saveData({
           ...values,
-          isBorker: undefined,  // 这个字段在全民经纪人页面更新
+          isBroker: undefined,  // 这个字段在全民经纪人页面更新
           pois,
           arrounds,
         }).then((res) => {

src/pages/building/Edit/Borker/index.jsx → src/pages/building/Edit/Broker/index.jsx

@@ -6,9 +6,9 @@ import Wangedit from '@/components/Wangedit/Wangedit';
 import { formItemLayout } from '../utils'
 
 const FormItem = Form.Item
-const updateBorker = fetch(apis.borker.updateBuildingBorker)
-const getAgreementList = fetch(apis.borker.getBkAgreementList)
-const saveAgreement = fetch(apis.borker.saveBkAgreement)
+const updateBroker = fetch(apis.broker.updateBuildingBroker)
+const getAgreementList = fetch(apis.broker.getBkAgreementList)
+const saveAgreement = fetch(apis.broker.saveBkAgreement)
 
 const editorMenus = [
   'head', // 标题
@@ -25,22 +25,22 @@ const editorMenus = [
   'undo', // 撤销
 ];
 
-const Borker = React.forwardRef((props, ref) => {
+const Broker = React.forwardRef((props, ref) => {
   const { form, buildingInfo = {} } = props
   const buildingId = buildingInfo.buildingId
 
   const [loading, setLoading] = useState(false)
-  const [isBorker, setIsBorker] = useState('false')
+  const [isBroker, setIsBroker] = useState('false')
   const [bkAgreement, setBkAgreement] = useState()
 
-  const canEdit = isBorker === 'true'
+  const canEdit = isBroker === 'true'
 
-  const handleBorkerChange = (e) => {
+  const handleBrokerChange = (e) => {
     const { value } = e.target
     setLoading(true)
-    updateBorker({ urlData: { id: buildingId }, params: { on: value } }).then(() => {
+    updateBroker({ urlData: { id: buildingId }, params: { on: value } }).then(() => {
       setLoading(false)
-      setIsBorker(value)
+      setIsBroker(value)
     }).catch(() => {
       setLoading(false)
     })
@@ -81,7 +81,7 @@ const Borker = React.forwardRef((props, ref) => {
         setLoading(false)
       })
 
-      setIsBorker(buildingInfo.isBorker ? 'true' : 'false')
+      setIsBroker(buildingInfo.isBroker ? 'true' : 'false')
     }
   }, [buildingId])
 
@@ -93,7 +93,7 @@ const Borker = React.forwardRef((props, ref) => {
             <div style={{ textAlign: 'right', marginRight: '1em' }}>全民经纪人</div>
           </Col>
           <Col span={12}>
-            <Radio.Group value={isBorker} onChange={handleBorkerChange} buttonStyle="solid">
+            <Radio.Group value={isBroker} onChange={handleBrokerChange} buttonStyle="solid">
               <Radio.Button value="true">开启</Radio.Button>
               <Radio.Button value="false">关闭</Radio.Button>
             </Radio.Group>
@@ -123,4 +123,4 @@ const Borker = React.forwardRef((props, ref) => {
   )
 })
 
-export default Form.create()(Borker)
+export default Form.create()(Broker)

src/pages/building/Edit/OnSiteService.jsx

@@ -1,15 +1,21 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Popconfirm, Table, Typography,notification } from 'antd';
+import { Modal, Popconfirm, Table, Typography, Radio, notification } from 'antd';
 import request from '@/utils/request';
 import apis from '@/services/apis';
+import withActions from '@/components/ActionList'
 import AuthButton from '@/components/AuthButton'
 import { getImgURL } from '@/utils/image';
 import Styles from './style.less';
 
 const { Text } = Typography;
 
+const options = [
+  { label: '是', value: true },
+  { label: '否', value: false },
+];
+
 export default props => {
-  const { history,marketingCode,isPublish } = props;
+  const { history,marketingCode, isPublish, buildingInfo } = props;
   const { query } = history.location;
   const { id } = query;
 
@@ -46,18 +52,17 @@ export default props => {
   const handleCancel = row => {
     request({
       ...apis.building.deleteMarketing,
-      urlData:{id:row.id},
+      urlData:{id: row.id},
       // params: { id },
     })
       .then(res => {
-        notification.error({
+        notification.success({
           message: '成功取消绑定',
           description: '',
         });
         getList()
       })
       .catch(err => {
-       
         notification.error({
           message: err.message,
           description: '',
@@ -66,6 +71,34 @@ export default props => {
 
   };
 
+  const onBrokerManager = (row) => {
+    Modal.confirm({
+      title: '确定进行当前操作?',
+      onOk() {
+        const data = {
+          personId: row.personId,
+          brokerManager: !row.brokerManager,
+        }
+
+        setLoading(true)
+        request({
+          ...apis.broker.updateManager,
+          urlData:{ id },
+          data
+        }).then(() => {
+          notification.success({
+            message: '操作成功',
+            description: '',
+          });
+          setLoading(false);
+          getList();
+        }).catch(() => {
+          setLoading(false)
+        })
+      }
+    })
+  }
+
   const columns = [
     {
       title: '头像',
@@ -90,7 +123,21 @@ export default props => {
       dataIndex: 'sex',
       key: 'sex',
       render: t => <span>{t==1?'男':t==2?'女':'未知'}</span>
-      
+    },
+    buildingInfo && buildingInfo.isBroker && {
+      title: '佣金管理员',
+      dataIndex: 'brokerManager',
+      key: 'brokerManager',
+      render: (_, row) => {
+
+        return (
+          <Radio.Group
+            options={options}
+            onChange={() => onBrokerManager(row)}
+            value={row.brokerManager || false}
+          />
+        )
+      }
     },
     {
       title: '操作',
@@ -105,7 +152,7 @@ export default props => {
         </AuthButton>
       ),
     },
-  ];
+  ].filter(Boolean);
 
   return (
     <div className={Styles['on-site-box']}>

src/pages/building/Edit/index.jsx

@@ -5,7 +5,7 @@ import Share from '@/components/Share'
 import Basic from './Basic'
 import Apartment from './Apartment'
 import AlbumList from './AlbumList'
-import Borker from './Borker'
+import Broker from './Broker'
 import Panorama from './Panorama'
 import Channel from './Channel'
 import News from './News'
@@ -72,12 +72,12 @@ export default (props) => {
         </TabPane>
         <TabPane tab="驻场设置" key="10">
           <div className={styles['tab-wrapper']} style={{ maxWidth: '1200px' }}>
-            <OnSiteService {...props} marketingCode={marketingCode} isPublish={isPublish} />
+            <OnSiteService {...props} marketingCode={marketingCode} isPublish={isPublish} buildingInfo={buildingInfo} />
           </div>
         </TabPane>
         <TabPane tab="全民经纪人" key="11">
           <div className={styles['tab-wrapper']} style={{ maxWidth: '1200px' }}>
-            <Borker buildingInfo={buildingInfo} />
+            <Broker buildingInfo={buildingInfo} />
           </div>
         </TabPane>
         <TabPane tab="海报图片" key="5">

src/services/apis.js

@@ -2403,11 +2403,11 @@ export default {
 
   // 全民经纪人
   // 因为懒, 没有写权限相关
-  borker: {
+  broker: {
     // 开启功能
-    updateBuildingBorker: {
+    updateBuildingBroker: {
       method: 'PUT',
-      url: `${prefix}/building/:id/borker`,
+      url: `${prefix}/building/:id/broker`,
     },
     // 获取规则
     getBkAgreementList: {
@@ -2445,9 +2445,9 @@ export default {
       url: `${prefix}/bkFirstScreen/:id`,
     },
     // 获取经纪人列表
-    getBorkerList: {
+    getBrokerList: {
       method: 'GET',
-      url: `${prefix}/borker`,
+      url: `${prefix}/broker`,
     },
     // 获取经纪人规则
     getAgentRule: {
@@ -2459,5 +2459,10 @@ export default {
       method: 'POST',
       url: `${prefix}/bkAgentRule`,
     },
+    // 更新佣金管理人员
+    updateManager: {
+      method: 'PUT',
+      url: `${prefix}/building/:id/broker-manager`,
+    },
   }
 };