编辑项目-项目类型

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

@@ -105,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/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/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/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,