Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

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,7 +79,7 @@ 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 {
   font-size: 16px;
 }
 .ant-breadcrumb{

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/building/list/add/components/base.jsx

@@ -79,6 +79,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 +105,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>

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

@@ -119,10 +119,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,14 +127,13 @@ class ProjectTypeBody extends React.Component {
   }
 
   onCheckboxChange = checkedValues => {
+      // 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)
+      const updateProjectDate = this.updateProjectType(tempDate)
       console.log('updateProjectDate: ', updateProjectDate)
       this.setState({ data: updateProjectDate })
   }
@@ -145,7 +141,6 @@ class ProjectTypeBody extends React.Component {
   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 +148,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 +159,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 +194,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 })
     }
   }
 
@@ -229,17 +223,6 @@ class ProjectTypeBody extends React.Component {
   }
 
   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)
     return (
       <>
         <Button type="primary" icon="plus" size="large" onClick={() => this.showMadel()} />

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

@@ -59,7 +59,6 @@ const Edit = (props) => {
   }
 
   const handleSubmit = val => {
-    window.console.log('submit data --->', val)
     if(userId){
       request({
         url: '/api/admin/taUser/' + userId,
@@ -146,10 +145,7 @@ const Edit = (props) => {
       label: '授权项目',
       name: 'buildingId',
       render: <BuildSelect />,
-      value: userData.buildingId,
-      rules: [
-        { required: true, message: '请选择所属项目' },
-      ],
+      value: userData.buildingId
     },
     {
       label: '图片',
@@ -178,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,