feats

src/components/Wangedit/Wangedit/WangEditor.jsx

@@ -19,6 +19,7 @@ export default (props) => {
       }
     },
     height: props.height || 300,
+    menus: props.menus
   })
 
   useEffect(() => {

src/components/Wangedit/Wangedit/initEditor.js

@@ -1,6 +1,16 @@
 import E from 'wangeditor';
 import { fetch, apis } from '@/utils/request';
 
+function assign(targ = {}, src = {}) {
+  return Object.keys(src).reduce((acc, key) => {
+    const val = src[key]
+    if (val === undefined || val === null) return acc;
+
+    acc[key] = val;
+    return acc;
+  }, targ);
+}
+
 export default (elm, config) => {
   const editor = new E(elm);
 
@@ -41,6 +51,8 @@ export default (elm, config) => {
     'italic', // 斜体
     'underline', // 下划线
     // 'strikeThrough', // 删除线
+    'indent', // 缩进
+    'lineHeight', // 行高
     // 'foreColor', // 文字颜色
     'backColor', // 背景颜色
     'list', // 列表
@@ -68,7 +80,8 @@ export default (elm, config) => {
     }, ctt);
   };
 
-  Object.assign(editor.config, config || {})
+  // Object.assign(editor.config, config || {})
+  assign(editor.config, config)
 
   editor.create();
   // editor.$textElem.attr('contenteditable', props.contenteditable !== false);

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

@@ -26,7 +26,7 @@ const fullWidth= { width: '100%' }
 const Item = Form.Item
 
 const BuildingBasic = React.forwardRef((props, ref) => {
-  const { form, history, setMarketingCode,institutionIdChange, user ,isPublish,setIsPublish} = props;
+  const { form, history, setMarketingCode,institutionIdChange, user , isPublish, setIsPublish, onBuilding } = props;
   const { getFieldDecorator, getFieldValue, setFieldsValue } = form;
   const { query } = history.location;
   const { id } = query;
@@ -58,7 +58,7 @@ const BuildingBasic = React.forwardRef((props, ref) => {
     setMarketingCode(res.marketingCode)
     setCityId(res.cityId)
     institutionIdChange(res.institutionId)
-  
+    onBuilding(res)
 
     setIsPublish(res.status=== 1)
   })
@@ -131,6 +131,7 @@ const BuildingBasic = React.forwardRef((props, ref) => {
         updateFormLoading(true)
         saveData({
           ...values,
+          isBorker: undefined,  // 这个字段在全民经纪人页面更新
           pois,
           arrounds,
         }).then((res) => {

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

@@ -0,0 +1,126 @@
+
+import React, { useEffect, useRef, useState } from 'react'
+import { Button, Spin, Radio, Form, Input, Row, Col, notification } from 'antd'
+import { fetch, apis } from '@/utils/request';
+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 updateAgreement = fetch(apis.borker.updateBkAgreement)
+
+const editorMenus = [
+  'head', // 标题
+  'bold', // 粗体
+  'italic', // 斜体
+  'underline', // 下划线
+  'strikeThrough', // 删除线
+  'indent', // 缩进
+  'lineHeight', // 行高
+  'foreColor', // 文字颜色
+  'list', // 列表
+  'justify', // 对齐方式
+  'quote', // 引用
+  'undo', // 撤销
+];
+
+const Borker = React.forwardRef((props, ref) => {
+  const { form, buildingInfo = {} } = props
+  const buildingId = buildingInfo.buildingId
+
+  const [loading, setLoading] = useState(false)
+  const [isBorker, setIsBorker] = useState('false')
+  const [bkAgreement, setBkAgreement] = useState()
+
+  const canEdit = isBorker === 'true'
+
+  const handleBorkerChange = (e) => {
+    const { value } = e.target
+    setLoading(true)
+    updateBorker({ urlData: { id: buildingId }, params: { on: value } }).then(() => {
+      setLoading(false)
+      setIsBorker(value)
+    }).catch(() => {
+      setLoading(false)
+    })
+  }
+
+  const handelSubmit = () => {
+    form.validateFieldsAndScroll((err, values) => {
+      if (err) return;
+
+      const data = {
+        ...values || {},
+        buildingId,
+        buildingName: buildingInfo.name,
+        cityId: buildingInfo.cityId,
+      }
+
+      setLoading(true)
+      const p = data.ruleId ? updateAgreement({ urlData: { id: data.ruleId }, data }) : saveAgreement({ data })
+      p.then(res => {
+        setLoading(false)
+        // setBkAgreement(res)
+        form.setFieldsValue(res || {});
+        notification.success({ message: "操作成功" })
+      }).catch((err) => {
+        setLoading(false)
+      })
+    })
+  }
+
+  useEffect(() => {
+    if (buildingId) {
+      setLoading(true)
+      getAgreementList({ params: { buildingId } }).then(res => {
+        setLoading(false)
+        const { records = [] } = res
+        // setBkAgreement(records[0])
+        form.setFieldsValue(records[0] || {});
+      }).catch(() => {
+        setLoading(false)
+      })
+    }
+  }, [buildingId])
+
+  return (
+    <Spin spinning={loading}>
+      <div style={{ padding: '1.2em', paddingTop: 0 }}>
+        <Row type="flex" align="middle">
+          <Col span={2}>
+            <div style={{ textAlign: 'right', marginRight: '1em' }}>全民经纪人</div>
+          </Col>
+          <Col span={12}>
+            <Radio.Group value={isBorker} onChange={handleBorkerChange} buttonStyle="solid">
+              <Radio.Button value="true">开启</Radio.Button>
+              <Radio.Button value="false">关闭</Radio.Button>
+            </Radio.Group>
+          </Col>
+        </Row>
+      </div>
+      <div style={{ maxWidth: canEdit ? '100%' : '0', maxHeight: canEdit ? '100%' : '0',  overflow: 'hidden' }}>
+        <Form {...formItemLayout} onSubmit={handelSubmit} >
+          <FormItem label="有效期">
+            {form.getFieldDecorator('expirationDays', {
+              rules: [{ required: true, message: '请填写有效期' }],
+            })(<Input suffix="天" />)}          
+          </FormItem>
+          <FormItem label="佣金规则">
+            {form.getFieldDecorator('content', {
+              rules: [{ required: true, message: '请填写佣金规则' }],
+            })(<Wangedit menus={editorMenus} />)}          
+          </FormItem>
+          <FormItem colon={false} label=" ">
+            <Button type="primary" loading={loading} onClick={handelSubmit}>
+              提交
+            </Button>
+          </FormItem>
+        </Form>
+      </div>
+    </Spin>
+  )
+})
+
+export default Form.create()(Borker)

src/pages/building/Edit/index.jsx

@@ -5,6 +5,7 @@ import Share from '@/components/Share'
 import Basic from './Basic'
 import Apartment from './Apartment'
 import AlbumList from './AlbumList'
+import Borker from './Borker'
 import Panorama from './Panorama'
 import Channel from './Channel'
 import News from './News'
@@ -18,6 +19,7 @@ export default (props) => {
   const { history } = props
   const { query } = history.location
   const { id } = query
+  const [buildingInfo, setBuildingInfo] = useState()
   const [institutionId, setInstitutionId] = useState()
   const [marketingCode, setMarketingCode] = useState('')
   const [isPublish, setIsPublish] = useState(false)
@@ -28,7 +30,14 @@ export default (props) => {
       <Tabs defaultActiveKey="1">
         <TabPane tab="基础信息" key="1">
           <div className={styles['tab-wrapper']} style={{ maxWidth: 1000 }}>
-            <Basic {...props} setMarketingCode={(e) => setMarketingCode(e)} institutionIdChange={(e) => setInstitutionId(e)} isPublish={isPublish} setIsPublish={(e) => setIsPublish(e)} />
+            <Basic
+              {...props}
+              setMarketingCode={(e) => setMarketingCode(e)}
+              institutionIdChange={(e) => setInstitutionId(e)}
+              isPublish={isPublish}
+              setIsPublish={(e) => setIsPublish(e)}
+              onBuilding={setBuildingInfo}
+            />
           </div>
         </TabPane>
         <TabPane tab="户型设置" key="2">
@@ -66,6 +75,11 @@ export default (props) => {
             <OnSiteService {...props} marketingCode={marketingCode} isPublish={isPublish} />
           </div>
         </TabPane>
+        <TabPane tab="全民经纪人" key="11">
+          <div className={styles['tab-wrapper']} style={{ maxWidth: '1200px' }}>
+            <Borker buildingInfo={buildingInfo} />
+          </div>
+        </TabPane>
         <TabPane tab="海报图片" key="5">
           <Poster target={target} rights="building.poster.save" {...props} submitBtn={!isPublish} />
         </TabPane>

src/services/apis.js

@@ -2400,4 +2400,28 @@ export default {
     },
 
   },
+
+  // 全民经纪人
+  borker: {
+    // 开启功能
+    updateBuildingBorker: {
+      method: 'PUT',
+      url: `${prefix}/building/:id/borker`,
+    },
+    // 获取规则
+    getBkAgreementList: {
+      method: 'GET',
+      url: `${prefix}/bkAgreement`,
+    },
+    // 新增规则
+    saveBkAgreement: {
+      method: 'POST',
+      url: `${prefix}/bkAgreement`,
+    },
+    // 更新规则
+    updateBkAgreement: {
+      method: 'PUT',
+      url: `${prefix}/bkAgreement/:id`,
+    },
+  }
 };