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

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': '' },
     },

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

@@ -104,7 +104,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} />