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

src/components/SelectButton/BuildSelect.jsx

@@ -35,6 +35,10 @@ const BuildingSelect = (props) => {
   const getCityList = (e) => {
     request({ ...apis.building.buildingSelect, params: {pageNum: 1,pageSize: 999}, }).then((data) => {
         setData(data.records)
+        // 默认选中第一个
+        if ((!preProps || !preProps.one) && props.one === 'true') {
+          setValue(data.records[0].buildingId)
+        }
     })
   }
 

src/components/XForm/ImageUpload.jsx

@@ -17,7 +17,7 @@ class ImageUpload extends React.Component {
       return;
     }
     
-    if (e.file.state === 'removed') {
+    if (info.file.status === 'removed') {
       this.props.onChange();
     }
 

src/pages/activity/editActivity.jsx

@@ -103,6 +103,15 @@ const Edit = (props) => {
           { required: true, message: '请输入活动人数' },
         ]
       },
+      {
+        label: '最大报名人数',
+        name: 'maxEnlistByPerson',
+        type: FieldTypes.Text,
+        value: dynamicData.maxEnlistByPerson,
+        rules: [
+          { required: true, message: '请输入最大报名人数' },
+        ]
+      },
       {
         label: '活动详情',
         name: 'desc',

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

@@ -120,14 +120,14 @@ function AddBuilding(props) {
             {getFieldDecorator('openingDate')(<DatePicker format="YYYY/MM/DD" />)}
           </Form.Item>
           <Form.Item label="电话" hasFeedback>
-            {getFieldDecorator('tel',{
-              initialValue:'',
-              rules:[
+            {getFieldDecorator('tel', {
+              initialValue: '',
+              rules: [
                   {
-                      pattern:new RegExp('^1[0-9]{10}$'),
-                      message:'请输入正确的电话号码'
-                  }
-              ]
+                      pattern: new RegExp('^1[0-9]{10}$'),
+                      message: '请输入正确的电话号码',
+                  },
+              ],
             })(<Input />)}
           </Form.Item>
           <Form.Item label="项目动态" hasFeedback>

src/pages/building/type/index.jsx

@@ -35,13 +35,13 @@ function body() {
       dataIndex: 'row',
       key: 'row',
       render: (_, record) => (
-        <span onClick={() => deleteType(record)}>
-          <span style={{
+        <span >
+          <Button type="link" style={{
             color: '#FF4A4A', right: '0',
-          }} >
+          }} onClick={() => deleteType(record)}>
             删除
-          <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-          </span>
+            <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+          </Button>
         </span>
       ),
     },

src/pages/indexEcharts/components/UserBehavior.jsx

@@ -265,7 +265,7 @@ const UserBehavior = props => {
           {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
         </p>
         <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
-          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>}
+          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} one="true"></BuildSelect>}
         </div>
         <EChart options={options} style={style} />
         {props.tableShow &&