合并

config/config.js

@@ -479,7 +479,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://192.168.0.11:8080/',
+      target: 'http://192.168.0.84:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

package.json

@@ -55,6 +55,7 @@
     "path-to-regexp": "^3.0.0",
     "qs": "^6.7.0",
     "react": "^16.8.6",
+    "react-amap": "^1.2.8",
     "react-copy-to-clipboard": "^5.0.1",
     "react-document-title": "^2.0.3",
     "react-dom": "^16.8.6",

src/app.js

@@ -1,3 +1,21 @@
+// (function (doc, win) {
+//   var docEl = doc.documentElement,
+//     resizeEvt = 'onorientationchange' in window ? 'onorientationchange' : 'resize',
+//     recalc = function () {
+//       var clientWidth = docEl.clientWidth;
+//       if (!clientWidth) return;
+//       if (clientWidth >= 750) {
+//         docEl.style.fontSize = '100px';
+//       } else {
+//         docEl.style.fontSize = 100 * (clientWidth / 750) + 'px';
+//       }
+//     };
+
+//   if (!doc.addEventListener) return;
+//   win.addEventListener(resizeEvt, recalc, false);
+//   doc.addEventListener('DOMContentLoaded', recalc, false);
+// })(document, window);
+
 export const dva = {
   config: {
     onError(e) {

src/components/SelectButton/BuildSelect.jsx

@@ -1,10 +1,18 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Select } from 'antd';
 
 import request from '../../utils/request'
 
 const { Option } = Select;
 
+function usePrevious(props) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current;
+}
+
 /**
  *
  *
@@ -13,7 +21,12 @@ const { Option } = Select;
  */
 const BuildingSelect = (props) => {
   const [ data, setData ] = useState([])
-  const [ value, setValue ] = useState(props.value)
+  const [ value, setValue ] = useState('')
+  const preProps = usePrevious(props)
+  
+  if ((!preProps || !preProps.value) && props.value && !value) {
+    setValue(props.value)
+  }
 
   useEffect(() => {
     getCityList();

src/global.less

@@ -79,9 +79,12 @@ ol {
 .ant-menu-vertical-left .ant-menu-submenu-title,
 .ant-menu-vertical-right .ant-menu-submenu-title,
 .ant-menu-inline .ant-menu-submenu-title,
-.ant-input ,.ant-btn{
+.ant-input ,.ant-btn,.ant-select,.ant-table,.ant-form-item,.ant-form label,.ant-tabs-nav-container {
   font-size: 16px;
 }
+.ant-row.ant-form-item .ant-form-item-label.ant-col-sm-3{
+  min-width: 100px;
+}
 .ant-breadcrumb{
   font-size: 16px;
   .anticon {

src/models/login.js

@@ -50,7 +50,7 @@ const Model = {
     *logout(_, { put, call }) {
       const { redirect } = getPageQuery(); // redirect
 
-      yield call(signout, { logout: true });
+      yield call(signout);
 
       if (window.location.pathname !== '/user/login' && !redirect) {
         yield put(

src/pages/activity/editActivity.jsx

@@ -245,7 +245,7 @@ const Edit = (props) => {
               textOverflow: 'ellipsis'
             }}>{inputValue ? inputValue : '海报标题'}</p>
 
-            <img src={yinhao} style={{ width: '30px', marginLeft: '10px' }} alt="" />
+            <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
             <p style={{
               margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
               display: '-webkit-box', lineClamp: '3', height: '76px',

src/pages/building/list/add/components/amap.jsx

@@ -0,0 +1,20 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Map } from 'react-amap';
+
+class Amap extends React.Component {
+  constructor(props) {
+    super(props)
+    this.state = { coordinates: [] }
+  }
+
+  render() {
+    return (
+      <div style={{ width: '100%', height: '400px' }}>
+        <Map amapkey="f0d1d4f82432504003ebf46e5e36ff03"/>
+      </div>
+    )
+  }
+}
+
+export default Amap

src/pages/building/list/add/components/base.jsx

@@ -9,6 +9,7 @@ import ImageUpload from '../../../../../components/XForm/ImageUpload'
 import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
 import Wangedit from '../../../../../components/Wangedit/Wangedit'
 import TagGroup from './tags'
+import Amap from './amap'
 import BudildingProjectType from './buildingProjectType'
 
 const { Option } = Select
@@ -79,6 +80,7 @@ function AddBuilding(props) {
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
     request({ ...api, data: { ...data } }).then(() => {
       openNotificationWithIcon('success', '操作成功')
+      router.go(-1)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
     })
@@ -104,7 +106,7 @@ function AddBuilding(props) {
           <Form.Item label="均价" hasFeedback>
             {getFieldDecorator('price')(<Input />)}
           </Form.Item>
-          <Form.Item label="开盘时间" hasFeedback>
+          <Form.Item label="开盘时间"  hasFeedback>
             {getFieldDecorator('openingDate')(<DatePicker format="YYYY/MM/DD" />)}
           </Form.Item>
           <Form.Item label="电话" hasFeedback>
@@ -176,7 +178,7 @@ function AddBuilding(props) {
             {getFieldDecorator('coordinate')(<Input disabled />)}
           </Form.Item>
           <Form.Item label="地图位置" hasFeedback>
-            {(<Input />)}
+            {(<Amap />)}
           </Form.Item>
           <Form.Item label="周边交通" hasFeedback>
             {getFieldDecorator('buildingTransport')(

src/pages/building/list/add/components/buildingProjectType.jsx

@@ -51,35 +51,33 @@ class TypeForm extends React.Component {
 
     return (
       <>
-        <div>
-          <Row>
-            <Col span={8}>{ this.props.type.buildingTypeName || ''}</Col>
-            <Col span={1}>
-              <Button type="link" icon="close" onClick={() => this.close()} />
-            </Col>
-          </Row>
-          <Row>
-            <Col span={12}>
-              <Form {...formItemLayout}>
-                <Form.Item label="类型编号" style={{ display: 'none' }}>
-                  {getFieldDecorator('buildingTypeId')(<Input disabled />)}
-                </Form.Item>
-                <Form.Item label="状态" style={{ display: 'none' }}>
-                  {getFieldDecorator('status')(<Input disabled />)}
-                </Form.Item>
-                <Form.Item label="价格">
-                  {getFieldDecorator('price')(<Input type="number" placeholder="元/㎡" onChange={e => this.onChange(e, 'price')}/>)}
-                </Form.Item>
-                <Form.Item label="装修标准">
-                  {getFieldDecorator('decoration')(<Input onChange={e => this.onChange(e, 'decoration')}/>)}
-                </Form.Item>
-                <Form.Item label="产权年限">
-                  {getFieldDecorator('rightsYear')(<Input onChange={e => this.onChange(e, 'rightsYear')}/>)}
-                </Form.Item>
-              </Form>
-            </Col>
-          </Row>
-        </div>
+        <Col span={11} style={{
+          position: 'relative',
+          border: '1px solid #eee',
+          borderRadius: '4px',
+          marginTop:'16px'
+        }}>
+
+          <p style={{ padding: '20px', borderBottom: '1px solid #eee' }}>{this.props.type.buildingTypeName || ''}  <Button type="link" style={{ position: 'absolute', right: '16px' }} icon="close" onClick={() => this.close()} /></p>
+
+          <Form {...formItemLayout} style={{ padding: '10px 0px 10px 10px' }}>
+            <Form.Item label="类型编号" style={{ display: 'none' }}>
+              {getFieldDecorator('buildingTypeId')(<Input disabled />)}
+            </Form.Item>
+            <Form.Item label="状态" style={{ display: 'none' }}>
+              {getFieldDecorator('status')(<Input disabled />)}
+            </Form.Item>
+            <Form.Item label="价格">
+              {getFieldDecorator('price')(<Input type="number" placeholder="元/㎡" onChange={e => this.onChange(e, 'price')} />)}
+            </Form.Item>
+            <Form.Item label="装修标准">
+              {getFieldDecorator('decoration')(<Input onChange={e => this.onChange(e, 'decoration')} />)}
+            </Form.Item>
+            <Form.Item label="产权年限">
+              {getFieldDecorator('rightsYear')(<Input onChange={e => this.onChange(e, 'rightsYear')} />)}
+            </Form.Item>
+          </Form>
+        </Col>
       </>
     )
   }
@@ -119,10 +117,7 @@ class ProjectTypeBody extends React.Component {
   }
 
   onSuccess = (values, item) => {
-    console.log('values: ', values)
-    console.log('data: ', this.state.data, 'item: ', item)
     const newData = this.getNewProjectType(values)
-    console.log('newData: ', newData)
     this.setState({ data: newData })
     if (typeof this.props.onChange === 'function') {
       this.props.onChange(newData)
@@ -130,22 +125,20 @@ class ProjectTypeBody extends React.Component {
   }
 
   onCheckboxChange = checkedValues => {
-      const checked = (`${checkedValues}` || '').split(',')
-      const { projectType } = this.state
-      const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
+    // console.log('checkedValues: ', checkedValues)
+    const checked = (`${checkedValues}` || '').split(',')
+    const { projectType } = this.state
+    const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
 
-      // 这里会把值替换掉
-
-      const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: '', decoration: '', rightsYear: '', status: '1' }))
-      const updateProjectDate = this.updateProjectType(checkedValues)
-      console.log('updateProjectDate: ', updateProjectDate)
-      this.setState({ data: updateProjectDate })
+    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: '', decoration: '', rightsYear: '', status: '1' }))
+    const updateProjectDate = this.updateProjectType(tempDate)
+    console.log('updateProjectDate: ', updateProjectDate)
+    this.setState({ data: updateProjectDate })
   }
 
   onClose = e => {
     const { data } = this.state
     const buildingType = data.filter(item => e.buildingTypeId !== item.buildingTypeId)
-    console.log('buildingType: ', buildingType)
     this.setState({ data: buildingType })
     this.setState({ defaultCheckboxValue: buildingType.map(item => item.buildingTypeId) })
   }
@@ -153,7 +146,6 @@ class ProjectTypeBody extends React.Component {
   getNewProjectType = values => {
     const data = []
     this.state.data.map(item => {
-      console.log('item: ', item)
       if (item.buildingTypeId === values.buildingTypeId) {
         data.push(values)
       } else {
@@ -165,18 +157,22 @@ class ProjectTypeBody extends React.Component {
   }
 
   updateProjectType = values => {
-    const data = []
-    this.state.data.map(item => {
-      values.map(va => {
-        if (item.buildingTypeId === va.buildingTypeId) {
-          data.push(va)
-        } else {
-          data.push(item)
-        }
-      })
-    })
+    // 获取所有复选框选中的id
+    const valueIdArray = values.map(item => item.buildingTypeId)
+    // console.log('valueIdArray: ', valueIdArray)
 
-    return data
+    // 获取 data 中已经赋值的数据  交集
+    const valueData = this.state.data.filter(item => valueIdArray.includes(item.buildingTypeId))
+    // console.log('valueData: ', valueData)
+
+    // 获取 非 data中数据(也就是没有赋值)，交集
+    const trueValueArr = valueData.map(item => item.buildingTypeId)
+    const trueValueData = values.filter(item => !trueValueArr.includes(item.buildingTypeId))
+
+    // console.log('trueValueData: ', trueValueData)
+
+    // 把两个 数组的值，合并返回
+    return valueData.concat(trueValueData)
   }
 
   getList = params => {
@@ -196,11 +192,7 @@ class ProjectTypeBody extends React.Component {
       tempData = value
       tempCheckboxValue = tempData.map(item => item.buildingTypeId)
       this.setState({ defaultCheckboxValue: tempCheckboxValue })
-      this.setState({ data: tempData }, () => {
-        console.log("state: ", this.state.data)
-      })
-
-      console.log("tempData: ", tempData, "tempCheckboxValue: ", tempCheckboxValue, "value: ", value)
+      this.setState({ data: tempData })
     }
   }
 
@@ -228,18 +220,7 @@ class ProjectTypeBody extends React.Component {
     this.getList({ pageNum: 1, pageSize: 999 })
   }
 
-  render () {
-
-    // let tempData = []
-    // let tempCheckboxValue = []
-    // const { value } = this.props
-    // if (value !== undefined && value !== null) {
-    //   tempData = value
-    // } else {
-    //   tempData = this.state.data
-    // }
-
-    // tempCheckboxValue = tempData.map(item => item.buildingTypeId)
+  render() {
     return (
       <>
         <Button type="primary" icon="plus" size="large" onClick={() => this.showMadel()} />
@@ -251,9 +232,11 @@ class ProjectTypeBody extends React.Component {
         >
           <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} defaultValue={this.state.defaultCheckboxValue} onChange={e => this.onCheckboxChange(e)} />
         </Modal>
-        {
-          this.state.data.map(item => <WrappedTypeForm type={item} key={item.id} onSuccess={(e) => this.onSuccess(e, item)} onClose={(e) => this.onClose(e)} />)
-        }
+        <Row type="flex" justify="space-between">
+          {
+            this.state.data.map(item => <WrappedTypeForm type={item} key={item.id} onSuccess={(e) => this.onSuccess(e, item)} onClose={(e) => this.onClose(e)} />)
+          }
+        </Row>
       </>
     )
   }

src/pages/building/list/add/components/imageSet.jsx

@@ -61,6 +61,15 @@ function imageSet(props) {
     })
   }
 
+  /**
+   *回调事件
+   *
+   */
+  function onModalChange() {
+    getList()
+    setVisibleData({ visible: false, apartmentId: '', buildingId: '' })
+  }
+
   /**
    *打开编辑页
    *
@@ -138,7 +147,7 @@ function imageSet(props) {
 
       {/* 编辑页 */}
       {/*  onSuccess是子组件传递事件信息  */}
-      <ModalImage visibleData={visibleData} key={1} onSuccess={getList}/>
+      <ModalImage visibleData={visibleData} key={1} onSuccess={() => onModalChange()}/>
     </>
   )
 }

src/pages/building/list/add/components/modalImage.jsx

@@ -5,6 +5,7 @@ import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
 import Styles from '../style.less';
 import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
 import Wangedit from '../../../../../components/Wangedit/Wangedit'
 
 
@@ -61,8 +62,8 @@ class ModalImage extends React.Component {
   // }
 
   componentDidUpdate(preProps, preState) {
-    console.log(this.props.visibleData)
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      console.log(this.props.visibleData)
       this.getById()
       this.setState({ visibleData: this.props.visibleData });
     }
@@ -91,7 +92,7 @@ class ModalImage extends React.Component {
 
     request({ url: tempUrl, method, params: { ...params } }).then(res => {
       // res.img = res.buildingImgList.map((item, _) => item.url)
-      res.img = res.buildingImgList[0].url
+      res.img = res.buildingImgList.map(item => item.url)
       this.props.form.setFieldsValue(res)
     }).catch(err => {
      this.openNotificationWithIcon('error', err)
@@ -118,7 +119,7 @@ class ModalImage extends React.Component {
 
   submitData(data) {
     // TODO 这里应该是要支持多图，但是封装的控件没有
-    data.img = [{ imgType: 'aparment', url: data.img, orderNo: 1 }]
+    data.img = data.img.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
     data.buildingId = this.props.visibleData.buildingId;
     const api = data.apartmentId !== undefined ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
 
@@ -131,7 +132,7 @@ class ModalImage extends React.Component {
       // onSuccess() 是自定义
       this.props.onSuccess()
 
-      this.handleCancel()
+      // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } }, () => console.log('回调：', this.state.visibleData))
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
       this.openNotificationWithIcon('error', err)
@@ -186,7 +187,7 @@ class ModalImage extends React.Component {
               </Form.Item>
               <Form.Item label="图片">
               {getFieldDecorator('img')(
-                <ImageUpload />,
+                <ImageListUpload />,
               )}
               </Form.Item>
               <Form.Item label="面积">

src/pages/building/list/add/components/poster.jsx

@@ -0,0 +1,129 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../../../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../../../../components/XForm';
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+import request from '../../../../../utils/request'
+import PosterBottom from '../../../../../assets/bottom.png'
+import yinhao from '../../../../../assets/yinhao.png'
+import ImageUploader from '../../../../../components/XForm/ImageUpload';
+import poster1 from '../../../../../assets/poster1.png';
+import poster2 from '../../../../../assets/poster2.png';
+import Styles from '../style.less';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const Poster = props => {
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
+
+  const { buildingId } = props.building
+
+  if (buildingId) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      request({
+        url: '/api/admin/poster',
+        method: 'GET',
+        params: { targetId: buildingId, targetType: 'building' },
+      }).then(data => {
+        console.log(data, '2222')
+        if (data.length > 0) {
+          setPosterId(data[0].posterId)
+          changeImg(data[0].posterImg)
+          changeTextArea(data[0].posterDescription)
+          changeInput(data[0].posterTitle)
+        }
+      }).catch(err => {
+        message.info(err.msg || err.message)
+      })
+    }, [])
+  }
+
+  const submitPoster = () => {
+    if (buildingId) {
+      if (posterId) {
+        request({
+          url: `/api/admin/poster/${posterId}`,
+          method: 'PUT',
+          data: { targetId: buildingId, targetType: 'building', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
+        }).then(() => {
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+      } else {
+        request({
+          url: '/api/admin/poster',
+          method: 'POST',
+          data: { targetId: buildingId, targetType: 'building', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
+        }).then(data => {
+          setPosterId(data.posterId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+      }
+    } else {
+      message.warn('请先保存基本信息数据')
+    }
+  }
+
+  return <div>
+    <div style={{ display: 'flex' }}>
+      <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+        <div style={{ width: '375px', height: '785px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+          <img style={{ width: '100%', height: '300px' }} src={imgValue || poster1} alt="" />
+
+          <p className={Styles.tagLabel}><span>全朝南</span><span>品牌开发商</span><span>轨交房</span></p>
+          <p style={{
+            margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
+            display: '-webkit-box', lineClamp: '3', height: '36px',lineHeight:'36px',
+            WebkitLineClamp: '1',
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}>{inputValue || '海报标题'}</p>
+          <p style={{ color: '#999',padding:' 0 20px' }}>约<span style={{ color: '#fd0d0c', fontSize: '24px',marginLeft:'6px' }}>41505</span><span style={{ color: '#fd0d0c', fontSize: '20px' }}>元/m²</span></p>
+
+          <img src={yinhao} style={{ width: '30px', marginLeft: '22px' }} alt="" />
+          <p style={{
+            margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
+            display: '-webkit-box', lineClamp: '3', height: '76px',
+            WebkitLineClamp: '3',
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}>{textAreaValue || '海报描述'}</p>
+          <img src={PosterBottom} style={{ width: '100%' }} alt="" />
+        </div>
+        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+      </div>
+      <div >
+        <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
+          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+        </div>
+        <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
+          <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+        </div>
+        <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
+          <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+        </div>
+
+      </div>
+    </div>
+    <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+    <Button onClick={() => router.go(-1)}>取消</Button>
+  </div>
+}
+
+export default Poster

src/pages/building/list/add/components/share.jsx

@@ -0,0 +1,97 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../../../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../../../../components/XForm';
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+import request from '../../../../../utils/request'
+import PosterBottom from '../../../../../assets/bottom.png'
+import yinhao from '../../../../../assets/yinhao.png'
+import ImageUploader from '../../../../../components/XForm/ImageUpload';
+import logo from '../../../../../assets/logo.png';
+import touxiang from '../../../../../assets/touxiang.jpg';
+import poster1 from '../../../../../assets/poster1.png';
+import poster2 from '../../../../../assets/poster2.png';
+
+const Share = props => {
+  const [inputValue, changeInput] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [shareContentId, setShareContentId] = useState('')
+
+  const { buildingId } = props.building
+  if (buildingId) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      request({
+        url: '/api/admin/shareContent',
+        method: 'GET',
+        params: { targetId: buildingId, targetType: 'building' },
+      }).then(data => {
+        if (data.length > 0) {
+          setShareContentId(data[0].shareContentId)
+          changeImg(data[0].shareContentImg)
+          changeInput(data[0].shareContentTitle)
+        }
+      }).catch(err => {
+        message.info(err.msg || err.message)
+      })
+    }, [])
+  }
+
+  const submitShare = () => {
+    if (buildingId) {
+      if (shareContentId) {
+        request({
+          url: `/api/admin/shareContent/${shareContentId}`,
+          method: 'PUT',
+          data: { targetId: buildingId, shareContentType: 'building',shareContentImg: imgValue,shareContentTitle: inputValue },
+        }).then(data => {
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+       } else {
+        request({
+          url: '/api/admin/shareContent',
+          method: 'POST',
+          data: { targetId: buildingId, shareContentType: 'building',shareContentImg: imgValue,shareContentTitle: inputValue },
+        }).then(data => {
+          setShareContentId(data.shareContentId)
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+       }
+     } else {
+      message.warn('请先保存基本信息数据')
+     }
+  }
+
+  return <div style={{ padding: '20px' }}>
+    <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
+      <div>
+        <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
+          <img src={logo} style={{ width: '22px', marginRight: '10px' }} />
+          知与行互动
+        </p>
+        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
+        <img style={{ width: '200px', height: '140px' }} src={imgValue ? imgValue : poster2} alt="" />
+      </div>
+    </div>
+    <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
+      <Input placeholder="请输入海报标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+    </div>
+    <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
+      <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+    </div>
+    <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+    <Button onClick={() => router.go(-1)}>取消</Button>
+  </div>
+}
+
+export default Share

src/pages/building/list/add/index.jsx

@@ -12,6 +12,8 @@ import Wangedit from '../../../../components/Wangedit/Wangedit'
 import TagGroup from './components/tags'
 import Base from './components/base'
 import ImageSet from './components/imageSet'
+import Poster from './components/poster'
+import Share from './components/share'
 
 
 const { Option } = Select
@@ -29,25 +31,50 @@ const formItemLayout = {
 };
 
 function AddBuilding(props) {
-  function tabsCallback(key) {
-    console.log(key);
+
+  const [tab, setTab] = useState('base')
+
+  function tabsCallback(e) {
+    console.log(e);
+    setTab(e.target.value)
   }
 
-  console.log(props.location)
+  // console.log(props.location)
 
   return (
-    <Tabs defaultActiveKey="1" onChange={tabsCallback}>
-      <TabPane tab="基本信息" key="1">
-        <Base building={{ buildingId: props.location.query && props.location.query.id }} />
-      </TabPane>
-      {
-        props.location.query.id &&
-        <TabPane tab="图片" key="2">
-          {/* '159fd19bb973b6972c10fbebf07ddeb1' */}
-          <ImageSet building={{ buildingId: props.location.query && props.location.query.id }} />
-        </TabPane>
-      }
-    </Tabs>
+    <>
+      <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
+        <Radio.Button value="base">基本信息</Radio.Button>
+        {
+          props.location.query.id &&
+          (
+            <>
+              <Radio.Button value="image">图片</Radio.Button>
+              <Radio.Button value="poster">海报图片</Radio.Button>
+              <Radio.Button value="share">分享设置</Radio.Button>
+            </>
+          )
+        }
+      </Radio.Group>
+      <div style={{ marginTop: '20px' }}>
+        { tab === 'base' && <Base building={{ buildingId: props.location.query && props.location.query.id }} /> }
+        { props.location.query.id && (tab === 'image' && <ImageSet building={{ buildingId: props.location.query && props.location.query.id }} />)}
+        { props.location.query.id && (tab === 'poster' && <Poster building={{ buildingId: props.location.query && props.location.query.id }} />)}
+        { props.location.query.id && (tab === 'share' && <Share building={{ buildingId: props.location.query && props.location.query.id }} />)}
+      </div>
+    </>
+    // <Tabs defaultActiveKey="1" onChange={tabsCallback}>
+    //   <TabPane tab="基本信息" key="1">
+    //     <Base building={{ buildingId: props.location.query && props.location.query.id }} />
+    //   </TabPane>
+    //   {
+    //     props.location.query.id &&
+    //     <TabPane tab="图片" key="2">
+    //       {/* '159fd19bb973b6972c10fbebf07ddeb1' */}
+    //       <ImageSet building={{ buildingId: props.location.query && props.location.query.id }} />
+    //     </TabPane>
+    //   }
+    // </Tabs>
   )
 }
 

src/pages/building/list/add/style.less

@@ -0,0 +1,20 @@
+.tagLabel{
+  padding: 14px 20px 0 20px;
+  margin: 0 0 5px 0;
+  span{
+    padding: 2px 8px;
+    font-size: 10px;
+    background-color: #e1f7eb;
+    color: #3de180;
+    border-radius: 2px;
+    margin-right: 10px;
+  }
+  span:nth-child(3n+2){
+    color: #72a0d1;
+    background-color: #eaeff5;
+  }
+  span:nth-child(3n+3){
+    color: #ff5858;
+    background-color: #fff0f1;
+  }
+}

src/pages/building/type/index.jsx

@@ -20,7 +20,7 @@ function body() {
       title: '类型名称',
       dataIndex: 'buildingTypeName',
       key: 'buildingTypeName',
-      render: (_, record) => <Tag color="blue" onClick={() => toEdi(record.buildingTypeId)}>{ record.buildingTypeName }</Tag>,
+      render: (_, record) => <Tag color="blue" onClick={() => toEdi(record.buildingTypeId)}>{record.buildingTypeName}</Tag>,
     },
     {
       title: '创建时间',
@@ -35,9 +35,9 @@ function body() {
       render: (_, record) => (
         <span onClick={() => deleteType(record)}>
           <span style={{
-              color: '#FF4A4A', right: '0',
+            color: '#FF4A4A', right: '0',
           }} >
-              删除
+            删除
           <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
           </span>
         </span>
@@ -97,7 +97,7 @@ function body() {
   return (
     <>
       <Button type="danger" onClick={() => toEdi()}>新增类型</Button>
-      <Table style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false}/>
+      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} />
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={onChange} />

src/pages/staff/list/StaffList.jsx

@@ -29,16 +29,16 @@ const toEditStaff = (userId) => () => {
  */
 const CartBody = (props) => {
   const { data } = props
-    
+
   const confirm = () => {
     Modal.confirm({
       title: '确认停用该角色？',
       okText: '确认',
       cancelText: '取消',
-      onOk () {
+      onOk() {
         console.log('OK');
       },
-      onCancel () {
+      onCancel() {
         console.log('Cancel');
       },
     });
@@ -49,14 +49,18 @@ const CartBody = (props) => {
       <div>
 
         <Avatar src={data.avatar} style={{ width: 94, height: 94 }} />
-        <span className={Styles.ediText} style={{ marginLeft: '20px' }} onClick={toEditStaff(data.userId)}>
+        <Button type="link" style={{ marginLeft: '10px', color: '#FF925C', fontSize: '18px' }} onClick={toEditStaff(data.userId)}>
           编辑
-                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-        </span>
-        <span className={Styles.ediText} style={{ marginLeft: '50px' }} onClick={confirm}>
+                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+        </Button>
+        <Button type="link" style={{ fontSize: '18px', color: '#cacaca', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
           停用
-                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-        </span>
+                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+        </Button>
+        <Button type="link" style={{ fontSize: '18px', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
+          启用
+                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+        </Button>
 
       </div>
       <div>
@@ -69,14 +73,11 @@ const CartBody = (props) => {
           }
         </span>
 
-        <p className={Styles.cardText} style={{ width: '300px' }}>
-          <span>姓名:{data.userName}</span>
-
-          <span style={{ float: "right" }}>状态:{data.status === '1' ? '启用' : '停用'}</span>
-
+        <p className={Styles.cardText} >姓名 : {data.userName}
         </p>
-        <p className={Styles.cardText} style={{ width: '300px' }}>
-          <span>电话:{data.phone}</span>
+        <p className={Styles.statusText} > 状态 : {data.status === '1' ? '启用' : '停用'} </p>
+        <p className={Styles.phoneText} >
+          电话 : {data.phone}
         </p>
       </div>
 
@@ -86,10 +87,10 @@ const CartBody = (props) => {
 
 
 const header = (props) => {
-  const [tempData,setTempData] = useState([])
+  const [tempData, setTempData] = useState([])
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
-  },[])
+  }, [])
 
   const getList = (params) => {
     request({
@@ -97,8 +98,8 @@ const header = (props) => {
       method: 'GET',
       params: { ...params },
     }).then((data) => {
-        console.log(data,"listData")
-        setTempData(data.records)
+      console.log(data, "listData")
+      setTempData(data.records)
     })
   }
 
@@ -108,15 +109,15 @@ const header = (props) => {
   }
 
   // 提交事件
-const handleSubmit = (e, props) => {
-  e.preventDefault();
-  props.form.validateFields((err, values) => {
-    if (!err) {
-      console.log('提交数据: ', values)
-      getList({ pageNum: 1, pageSize: 10, ...values })
-    }
-  });
-}
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
 
   const { getFieldDecorator } = props.form
   return (
@@ -156,8 +157,7 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="danger" className={styles.addBtn} onClick={toEditStaff()}>新增</Button>
-
+      <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>
       <Row style={{ padding: ' 0 10px' }}>
         {
           tempData.map((item, index) => (

src/pages/staff/list/editStaff.jsx

@@ -26,8 +26,6 @@ const Edit = (props) => {
   const [userData, setUserData] = useState({})
   const [tagData, setTagData] = useState([])
 
-  console.log(userData,"user----》")
-
   const getTagList = () => {
     request({
       url: '/api/admin/taTags',
@@ -61,7 +59,6 @@ const Edit = (props) => {
   }
 
   const handleSubmit = val => {
-    window.console.log('submit data --->', val)
     if(userId){
       request({
         url: '/api/admin/taUser/' + userId,
@@ -148,10 +145,7 @@ const Edit = (props) => {
       label: '授权项目',
       name: 'buildingId',
       render: <BuildSelect />,
-      value: userData.buildingId,
-      rules: [
-        { required: true, message: '请选择所属项目' },
-      ],
+      value: userData.buildingId
     },
     {
       label: '图片',
@@ -180,11 +174,9 @@ const Edit = (props) => {
     },
   ]
 
-  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
-
-
-
+  console.log('--------->', fields)
 
+  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
 }
 
 

src/pages/staff/list/style.less

@@ -11,33 +11,37 @@
   border: 1px solid #dbdbdb;
 }
 
-.addButton {
-  // background: #50be00;
-  border-radius: 4px;
-  border: 0px;
-  margin: 10px 0px;
-}
 
 .card {
-  width: 348px;
+  min-width: 330px;
+  margin-right: 2vw;
   height: 244px;
   background: rgba(255, 255, 255, 1);
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
   margin-bottom: 40px;
-
+  position: relative;
 }
 
-.cardText {
 
-  height: 28px;
+.cardText {
   font-size: 20px;
-  font-weight: 400;
   color: rgba(102, 102, 102, 1);
-  line-height: 28px;
-  margin-top: 10px;
-  margin-bottom: 0;
-
+  position: absolute;
+  bottom:36px;
+}
+.statusText {
+  font-size: 20px;
+  color: rgba(102, 102, 102, 1);
+  position: absolute;
+  bottom:36px;
+  right: 20px;
+}
+.phoneText{
+  font-size: 20px;
+  color: rgba(102, 102, 102, 1);
+  position: absolute;
+  bottom:0px;
 }
 
 .cardItem {
@@ -49,26 +53,15 @@
   align-items: center;
 }
 
-.ediText {
-  width: 36px;
-  height: 25px;
-  font-size: 18px;
-
-  font-weight: 400;
-  color: rgba(255, 146, 92, 1);
-  line-height: 25px;
-
-}
 
 .cardTag {
-  height: 18px;
   font-size: 10px;
-  // background: #fdce22;
   border-radius: 4px;
   color: #ffffff;
-  line-height: 14px;
+  line-height: 16px;
   margin-top: 10px;
   padding: 1px 3px;
+
 }
 
 .title {
@@ -76,13 +69,12 @@
   width: 84px;
   justify-content: space-between;
   text-align: justify;
-  text-align-last: justify
+  text-align-last: justify;
 }
 
 
 .roletext {
   font-size: 20px;
-
   font-weight: 400;
   color: rgba(51, 51, 51, 1);
   line-height: 28px;

src/services/apis.js

@@ -19,10 +19,12 @@ export default {
     signin: {
       method: 'POST',
       url: `${prefix}/taUser/signin`,
+      login: true
     },
     signout: {
       method: 'POST',
       url: `${prefix}/taUser/signout`,
+      logout: true
     },
   },
   building: {

src/utils/mixStr.js

@@ -12,7 +12,7 @@ const fill2Len = (str, len) => {
   return str.repeat(Math.floor(len / orginLen)) + str.substr(0, len % orginLen)
 }
 
-const mixChars = window.navigator.userAgent + (new Date).toUTCString().replace(/\d{2}:\d{2}:\d{2}/, '')
+const mixChars = window.navigator.userAgent // + (new Date).toUTCString().replace(/\d{2}:\d{2}:\d{2}/, '')
 
 const strXOR = (str, mix) => {
   if (!str) return str

src/utils/request.js

@@ -33,15 +33,16 @@ const replaceURLParams = (url, params = {}) => {
 }
 
 request.interceptors.request.use((url, options) => {
-  const { urlData, headers = {}, logout = false, data, ...opts } = options
+  const { urlData, headers = {}, logout = false, login = false, data, ...opts } = options
   const apiURL = urlData ? replaceURLParams(url, urlData) : url
   const token = mixStr(window.localStorage.getItem('test-foobar'))
-  const authHeader = token ? { Authorization: `Bearer ${token}` } : {}
 
-  if (logout) {
+  if (login || logout) {
     window.localStorage.removeItem('test-foobar')
   }
 
+  const authHeader = !login ? { Authorization: `Bearer ${token}` } : {}
+
   return (
     {
       url: apiURL,