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

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/pages/news/list/NewsList.jsx

@@ -0,0 +1,210 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import Styles from './style.less';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+const tempDate = [{ code: 's101' }]
+
+/**
+ *卡片
+ *
+ * @returns
+ */
+function CartBody(props) {
+  const { data } = props
+  console.log(props);
+  return (
+          <Card
+            hoverable
+            style={{ minWidth: '400px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
+            cover={<img alt="example" src={ data.newsImg } style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
+            bodyStyle={{ padding: '10px 20px' }}
+          >
+            <p className={Styles.cardText}>
+              <span className={Styles.title}>资讯类型</span>
+              <span >：{ data.newsType.newsTypeName }</span>
+              <span className={Styles.ediText}>
+                编辑
+                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
+              </span>
+            </p>
+            <p className={Styles.cardText}>
+              <span className={Styles.title}>状态</span>
+              <span >：{ data.status == '0' ? "已发布" : "未发布" }</span>
+            </p>
+            <p className={Styles.cardItem}>
+              <span className={Styles.title}>阅读数量</span>
+              <span > ：{ data.pvNum }</span>
+            </p>
+            <p className={Styles.cardItem}>
+              <span className={Styles.title}>转发数量</span>
+              <span className={ Styles.address }>：{ data.shareNum }</span>
+            </p>
+            <p className={Styles.cardItem}>
+              <span className={Styles.title}>点赞数量</span>     
+              <span >：{ data.favorNum }</span>         
+            </p>
+            <p className={Styles.cardItem}>
+              <span className={Styles.title}>收藏数量</span>
+              <span >：{ data.saveNum }</span>
+            </p>
+            <p className={Styles.cardItem}>
+              <span className={Styles.title}>录入时间</span>
+              <span >：{ data.createDate }</span>
+            </p>
+            <p style={{ margin: '15px 0', position: 'relative', fontSize: '18px' }}>
+              <span style={{ color: '#1990FF' }}>
+                取消发布
+                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              </span>
+              <span style={{
+                color: '#FF4A4A', position: 'absolute', right: '0',
+              }} >
+                删除
+                <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              </span>
+            </p>
+          </Card>
+  )
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+function body(props) {
+  const { getFieldDecorator } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ records: [] })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 6 })
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.news.getList, params: { ...params } }).then(res => {
+      setDataSource(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        // eslint-disable-next-line no-console
+        console.log('提交数据: ', values)
+        const { startDate } = values
+        getList({ pageNum: 1, pageSize: 9, ...values })
+      }
+    });
+  }
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+      getList({ pageNum: pageNumber, pageSize: 9 })
+  }
+
+  function getDate(value, dateString) {
+    // moment(value).format('YYYY-MM-DD HH:mm:ss')
+    console.log(value, dateString)
+  }
+
+  return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+
+        <Form.Item>
+          {getFieldDecorator('city')(
+            <Select style={{ width: '180px' }} placeholder="请选择城市" onChange={handleSelectChange}>
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item>
+          {getFieldDecorator('project')(
+            <Select style={{ width: '180px' }} placeholder="请选择项目" onChange={handleSelectChange}>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('title')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入标题"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('type')(
+            <Select style={{ width: '180px' }} placeholder="咨询类型" onChange={handleSelectChange}>
+            </Select>,
+          )}
+        </Form.Item>       
+        <Form.Item>
+          {getFieldDecorator('newsStatus')(
+            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
+              <Option value="1">已发布</Option>
+              <Option value="0">未发布</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
+            搜索
+          </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" className={Styles.addButton}>
+        新增
+      </Button>
+
+      {/* 卡片内容，显示楼盘项目  */}
+      <Row style={{ padding: ' 0 10px' }}>
+        {
+          dataSource.records.map((item, index) => (
+              <Col span={8}>
+                <CartBody data={item} key={item.buildingId}/>
+              </Col>
+            ))
+        }
+      </Row>
+      {/* 分页 */}
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} />
+      </div>
+    </>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

src/pages/news/list/style.less

@@ -0,0 +1,58 @@
+.SubmitButton {
+    background: #3a91d5;
+    border-radius: 7px;
+    border: 0px;
+  }
+  .SelectFrom {
+    width: 180px;
+    background: #ffffff;
+    border-radius: 7px;
+    border: 1px solid #dbdbdb;
+  }
+  .addButton {
+    background: #50be00;
+    border-radius: 4px;
+    border: 0px;
+    margin: 10px 0px;
+  }
+  .cardText {
+    font-size: 18px;
+    color: #333;
+    line-height: 24px;
+    display: flex;
+    align-items: center;
+    position: relative;
+  
+  }
+  .cardItem{
+    font-size: 18px;
+    font-weight: 400;
+    color: #666;
+    line-height: 24px;
+    display: flex;
+    align-items: center;  
+  }
+  .ediText {
+    font-size: 18px;
+    color: #ff925c;
+    line-height: 24px;
+    position: absolute;
+    right: 0;
+  }
+  .title{
+    display: inline-block;
+    width: 84px;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+  .address { 
+    width: 400px;
+    height: 24px; 
+    text-overflow: ellipsis; 
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  
+  

src/pages/news/type/NewsType.jsx

@@ -59,7 +59,7 @@ const columns = [
     title: '类型图片',
     dataIndex: 'img',
     key: 'img',
-    align: 'center',
+    align: 'left',
     render: (text, record) => <img src={record.img} className={styles.touxiang} />,
   },
   {

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',
@@ -39,6 +45,12 @@ export default {
       url: `${prefix}/tdBuildingType/id`,
     },
   },
+  news: {
+    getList: {
+      method: 'GET',
+      url: `${prefix}/taNews`,
+    },
+  },
   customer: {
     drift: {
       method: 'GET',

src/services/news.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request';
+
+/**
+ * 项目
+ */
+
+/**
+ * 获取列表
+ */
+export async function getList() {
+  return request('/api/admin/taNews')
+}

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 }