ACTIVITY

config/config.js

@@ -264,7 +264,7 @@ export default {
                 },
                 {
                   path: '/activity/SignList',
-                  name: '报名列表',
+                  name: '',
                   component: './activity/SignList',
                 },
               ],

src/components/XForm/ImageUpload.jsx

@@ -1,10 +1,14 @@
 import React from 'react';
 import { Upload, Icon, message } from 'antd';
 import './style.less';
+import { uploaderProps } from '../../utils/upload';
+
+
 
 class ImageUpload extends React.Component {
   state = {
-    loading: false
+    loading: false,
+    imageUrl: undefined,
   };
 
   handleChange = info => {
@@ -14,13 +18,19 @@ class ImageUpload extends React.Component {
     }
 
     if (info.file.status === "done") {
-      const imageUrl = info.response.url
-
       this.setState({
-        loading: false
+        loading: false,
       })
 
-      this.props.onChange(imageUrl)
+      if (info.file.response && info.file.response.url) {
+        this.setState({
+          imageUrl: info.file.response.thumbUrl,
+        });
+
+        if (typeof this.props.onChange === 'function') {
+          this.props.onChange(info.file.response.url);
+        }
+      }
     }
   };
 
@@ -35,16 +45,16 @@ class ImageUpload extends React.Component {
 
     return (
       <Upload
-        name="avatar"
         listType="picture-card"
         className="avatar-uploader"
         showUploadList={false}
-        action={this.props.action}
         beforeUpload={this.props.beforeUpload}
         onChange={this.handleChange}
+
+        {...uploaderProps}
       >
-        {value ? (
-          <img src={value} alt="avatar" style={{ width: "100%" }} />
+        {(this.state.imageUrl || value) ? (
+          <img src={this.state.imageUrl || value} alt="avatar" style={{ width: "100%" }} />
         ) : (
           uploadButton
         )}

src/pages/activity/editActivity.jsx

@@ -1,10 +1,15 @@
-import React, { useState } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio } from 'antd';
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
+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'
 
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 /**
  *
  *
@@ -12,69 +17,145 @@ import Wangedit from '../../components/Wangedit/Wangedit'
  * @returns
  */
  const Edit = (props) => {
-  const [ tab, changeTab ] = useState('basic');
+  const [ tab, changeTab ] = useState('basic')
   const dynamicId = props.location.query.dynamicId
-  console.log(dynamicId)
+  const [ dynamicData, setDynamicData ] = useState({})
+  if(dynamicId){
+    useEffect(() => {
+      getDynamicData(dynamicId);
+    },[])
+
+  // 查询列表
+  const getDynamicData = (dynamicId) => {
+    request({
+        url: '/api/admin/buildingDynamic/Details',
+        method: 'GET',
+        params: { dynamicId },
+    }).then((data) => {
+        console.log(data)
+        setDynamicData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/activity/ActivityList',
+    });
+  }
 
   const Basic = (props) => {
     const fields = [
       {
         label: '所属项目',
-        name: 'org_id',
-        type: FieldTypes.Text
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: dynamicData.buildingId,
+        rules: [
+          {required: true, message: '请选择所属项目'},
+        ]
       },
       {
         label: '主图',
-        name: 'city_id',
+        name: 'imgUrl',
         type: FieldTypes.ImageUploader,
+        value: dynamicData.imgUrl,
       },
       {
         label: '活动标题',
-        name: 'share_num',
+        name: 'title',
         type: FieldTypes.Text,
-        placeholder: '不填, 默认使用手机号'
+        value: dynamicData.title,
+        rules: [
+          {required: true, message: '请输入活动标题'},
+        ]
       },
       {
         label: '活动时间',
-        name: 'save_num',
-        type: FieldTypes.Text,
+        name: 'activityTime',
+        type: FieldTypes.RangePicker,
+        value: dynamicData.startDate != null ?  [moment(dynamicData.startDate,'YYYY-MM-DD'),moment(dynamicData.endDate,'YYYY-MM-DD')] : null,
         rules: [
-          {required: true, message: '请填写手机号'}
+          {required: true, message: '请选择活动时间'},
         ]
       },
       {
         label: '活动地点',
-        name: 'pv_num',
-        type: FieldTypes.ImageUploader,
-        extra: '建议图片大小 128 * 128'
+        name: 'address',
+        type: FieldTypes.Text,
+        value: dynamicData.address,
+        rules: [
+          {required: true, message: '请输入活动地点'},
+        ]
       },
       {
         label: '活动人数',
-        name: 'favor_num',
-        type: FieldTypes.DatePicker,
+        name: 'enlistNum',
+        type: FieldTypes.Text,
+        value: dynamicData.enlistNum,
+        rules: [
+          {required: true, message: '请输入活动人数'},
+        ]
       },
       {
         label: '活动详情',
-        name: 'expDate',
+        name: 'desc',
         render: <Wangedit />,
-        value: "222222",
+        value: dynamicData.desc,
       },
       {
         label: '是否需要报名',
-        name: 'volume_rate',
-        type: FieldTypes.DatePicker,
+        name: 'isEnlist',
+        render: <Radio.Group name="radiogroup">
+                  <Radio value={1}>是</Radio>
+                  <Radio value={0}>否</Radio>
+                </Radio.Group>,
+        value: dynamicData.isEnlist != null ? dynamicData.isEnlist-0 : 1,
       },
       {
         label: '报名时间',
-        name: 'parking_rate',
-        type: FieldTypes.DatePicker,
+        name: 'signupTime',
+        type: FieldTypes.RangePicker,
+        value: dynamicData.enlistStart != null ?  [moment(dynamicData.enlistStart,'YYYY-MM-DD'),moment(dynamicData.enlistEnd,'YYYY-MM-DD')] : null,
+        rules: [
+          {required: true, message: '请选择报名时间'},
+        ]
       },
     ]
   
-    const handleSubmit = val => {
-      window.console.log('submit data --->', val)
+    const handleSubmit = val => { 
+      let {activityTime,signupTime, ...submitValue} = val
+      const [startDate, endDate] = activityTime
+      submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
+      submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+      const [enlistStart, enlistEnd] = signupTime
+      submitValue.enlistStart = moment(enlistStart).format('YYYY-MM-DD');
+      submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD');
+      console.log('submit data --->', submitValue)
+      if(dynamicId){
+        submitValue.dynamicId = dynamicId
+        request({
+          url: '/api/admin/buildingDynamic/update',
+          method: 'PUT',
+          data: submitValue,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({
+          url: '/api/admin/buildingDynamic/add',
+          method: 'POST',
+          data: submitValue,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
     }
-    return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
+    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
   }
   
   const Poster = (props) => {

src/services/apis.js

@@ -1,6 +1,12 @@
 const prefix = '/api/admin'
 
 export default {
+  image: {
+    upload: {
+      url: `${prefix}/antd/image`,
+      method: 'POST',
+    }
+  },
   user: {
     current: {
       method: 'GET',

src/utils/upload.js

@@ -0,0 +1,11 @@
+import apis from '../services/apis';
+
+const uploaderProps = {
+  name: 'file',
+  action: apis.image.upload.url,
+  headers: {
+    Authorization: `Bearer ${window.localStorage.getItem('x-token')}`
+  }
+}
+
+export { uploaderProps }