Merge branch 'master' of http://git.ycjcjy.com/estateagents/pc-channel

src/pages/sample/h5/components/H5Card.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert, Card } from 'antd';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert, Card, Modal } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import router from 'umi/router';
 import apis from '../../../../services/apis';
@@ -10,14 +10,53 @@ import moment from 'moment';
 const { Meta } = Card
 
 const H5Card = props => {
+  const { h5Data } = props
+
+  const colerArr = ["#2db7f5","#87d068","#108ee9","magenta","red","volcano","orange","green","geekblue","purple"]
+  const toEdit = () => {
+    router.push({
+      pathname: '/sample/h5/edit',
+      query: {
+        id: h5Data.sampleId
+      },
+    });
+  }
+
+  const deleteSample = () => {
+    const title = '确认将所选数据删除？可删除条件：无关联的H5需求单'
+    Modal.confirm({
+      title: title,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.sample.puth5, urlData: { id: h5Data.sampleId }}).then((data) => {
+          message.info('操作成功！')
+          props.onChange()
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
     return (
-    <Card
-      hoverable
-      style={{ width: 240 }}
-      cover={<img alt="example" src="https://os.alipayobjects.com/rmsportal/QBnOOoLaAfKPirc.png" />}
-    >
-      <Meta title="Europe Street beat" description="www.instagram.com" />
-    </Card>
+      <>
+      <Card
+        hoverable
+        style={{ width: 480,height: 450,marginTop: 50,position: "relative" }}
+        cover={<img height="335px" alt="example" onClick={toEdit} src={h5Data.coverImg} />}
+        extra={<a onClick={deleteSample}>删除</a>}
+        title={h5Data.status == 1 ? '已发布' : h5Data.status == 0 ? '未发布' : ''}
+      >
+        <Meta onClick={toEdit} title={h5Data.sampleName} />
+        <div style={{position: "absolute", bottom: "50px", right: "20px", margin: '20px 0'}}>
+          {(h5Data.tags || []).map((x,i) => {
+            return <Tag color={colerArr[i]}>{x}</Tag>
+          })}
+        </div>
+      </Card>
+    </>
     )
   }
  

src/pages/sample/h5/edit.jsx

@@ -35,10 +35,12 @@ const header = props => {
     // 查询列表
     const getH5Data = (sampleId) => {
       request({
-          ...apis.sample.get,
+          ...apis.sample.geth5,
           urlData: { id: sampleId }
       }).then((data) => {
         setData(data)
+        props.form.setFieldsValue(data)
+        setTypeState(data.sampleType)
       }).catch((err) => {
         message.error(err.msg || err.message)
       })
@@ -52,9 +54,8 @@ const header = props => {
         console.log(values,"valuesvaluesvaluesvaluesvaluesvaluesvalues")
         debugger
         if (!err) {
-          console.log(values,"h5Sample/addh5Sample/add")
           if(sampleId){
-            request({ ...apis.sample.update, urlData: { id: sampleId }, data: { ...values }}).then((data) => {
+            request({ ...apis.sample.updateh5, urlData: { id: sampleId }, data: { ...values }}).then((data) => {
               cancelPage();
             }).catch((err) => {
               message.error(err.msg || err.message)

src/pages/sample/h5/index.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { Form, Pagination, Card, Button, Icon, Tooltip, message,   notification, Modal, Table, Select,Input, DatePicker  } from 'antd';
+import { Form, Pagination, Card, Button, Icon, Tooltip, message,   notification, Modal, Table, Select,Input, DatePicker,Row, Col  } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import className from 'classnames';
@@ -35,6 +35,15 @@ function header(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
+        let {createDate, ...submitValue} = values
+        if(null != createDate && createDate.length > 0){
+          const [startCreateDate, endCreateDate] = createDate
+          submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
+          submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
+        }else{
+          submitValue.startCreateDate = null
+          submitValue.endCreateDate = null
+        }
         getList({ pageNum: 1, pageSize: 10, ...values })
       }
     });
@@ -104,43 +113,25 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('orgName')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="下单组织"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('orderer')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="下单人"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('phone')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="联系方式"
-            />,
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="发布状态">
+              <Select.Option value="1">是</Select.Option>
+              <Select.Option value="0">否</Select.Option>
+            </Select>,
           )}
         </Form.Item>
         <Form.Item>
-            <span style={{marginRight:'10px'}}>下单时间段：</span>
+            <span style={{marginRight:'10px'}}>新增时间段：</span>
                 {getFieldDecorator('createDate')(
                   <RangePicker placeholder={['开始时间','结束时间']} />
                 )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('demandStatus')(
-            <Select style={{ width: '180px' }} placeholder="需求单状态">
-              <Select.Option value="1">已提交</Select.Option>
-              <Select.Option value="2">处理中</Select.Option>
-              <Select.Option value="3">已交付</Select.Option>
-              <Select.Option value="4">作废</Select.Option>
-            </Select>,
+          {getFieldDecorator('tag')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="标签"
+            />,
           )}
         </Form.Item>
         <Form.Item>
@@ -154,10 +145,13 @@ function header(props) {
       </Form>
       
       <Button type="danger" className={styles.addBtn} onClick={toEditH5()}>新增</Button>
- 
-      {(data.records || []).map(x => (
-          <H5Card />
-        ))}
+      <Row>      
+          {(data.records || []).map(x => (
+              <Col span={6}>
+                <H5Card h5Data={x} onChange={handleReset}/>
+              </Col>
+            ))}
+      </Row>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>

src/services/apis.js

@@ -95,13 +95,21 @@ const apis = {
       method: 'POST',
       action: 'channel',
     },
-  },
-  contact: {
-    list: {
-      url: `${prefix}/taContact`,
+    geth5: {
+      url: `${prefix}/get/h5Sample/:id`,
       method: 'GET',
       action: 'channel',
     },
+    updateh5: {
+      url: `${prefix}/update/h5Sample/:id`,
+      method: 'PUT',
+      action: 'channel',
+    },
+    puth5: {
+      url: `${prefix}/put/h5Sample/:id`,
+      method: 'PUT',
+      action: 'channel',
+    }
   },
   image: {
     uploadForAnt: {
@@ -178,6 +186,11 @@ const apis = {
       method: 'PUT',
       action: 'center',
     },
+    list: {
+      url: `${prefix}/taContact`,
+      method: 'GET',
+      action: 'channel',
+    },
   }
   
 }