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

src/pages/fundManagement/Finance.jsx

@@ -182,10 +182,8 @@ function header(props) {
                     </Button>
                 </Form.Item>
             </Form>
-            <div style={{ margin: '10px 0 16px 0' }}>
-                {/* <Button type="danger" className={styles.addBtn} style={{ padding: '0' }} > */}
-                    <SelectContact type="danger" onClick={() => getList({ pageNum: 1, pageSize: 10 })} />
-                    {/* </Button> */}
+            <div style={{ margin: '10px 0 16px 0', display: 'flex' }}>
+                <SelectContact type="danger" onClick={() => getList({ pageNum: 1, pageSize: 10 })} />
                 <Button type="primary" className={styles.addBtn} onClick={() => toDel()} style={{ marginLeft: '30px' }} >删除</Button>
             </div>
             <Table rowSelection={rowSelection} rowKey={r => r.contactId} dataSource={data.records} columns={columns} pagination={false} />

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

@@ -146,7 +146,7 @@ const SelectContact = props => {
                     </Form.Item>
                 </Form>
 
-                <Table dataSource={data.records || []} columns={columns} pagination={false} />
+                <Table rowKey={r => r.h5TemplateId}  dataSource={data.records || []} columns={columns} pagination={false} />
                 <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                     <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
                 </div>

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,Row, Col  } 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';
@@ -15,33 +15,33 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 function header(props) {
   // 获取初始化数据
-  const [ data, setData ] = useState({})
+  const [data, setData] = useState({})
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 12 });
-  },[])
+  }, [])
 
   // 查询列表
   const getList = (params) => {
     request({ ...apis.sample.h5list, params: { ...params } }).then((data) => {
-        console.log(data)
-        setData(data)
+      console.log(data)
+      setData(data)
     })
   }
 
-  
+
   // 提交事件
   const handleSubmit = (e, props) => {
     e.preventDefault();
     e.stopPropagation();
     props.form.validateFields((err, values) => {
       if (!err) {
-        let {createDate, ...submitValue} = values
-        if(null != createDate && createDate.length > 0){
+        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{
+        } else {
           submitValue.startCreateDate = null
           submitValue.endCreateDate = null
         }
@@ -51,12 +51,12 @@ function header(props) {
   }
 
   const changePageNum = (pageNumber) => {
-    let {createDate, ...submitValue} = props.form.getFieldsValue()
-    if(null != createDate && createDate.length > 0){
+    let { createDate, ...submitValue } = props.form.getFieldsValue()
+    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{
+    } else {
       submitValue.startCreateDate = null
       submitValue.endCreateDate = null
     }
@@ -74,15 +74,15 @@ function header(props) {
     });
   }
 
-  
+
   const changeNewsStatus = (row, newsId) => () => {
-    const title = row.status === 0 ? '确定启用吗': '停用后，此账号将无法登录渠道代理商后台'
+    const title = row.status === 0 ? '确定启用吗' : '停用后，此账号将无法登录渠道代理商后台'
     Modal.confirm({
       title: title,
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        if(row.status === 0){
+        if (row.status === 0) {
           request({ ...apis.channel.put, urlData: { id: newsId }, data: { ...row, status: 1 } }).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 12 });
@@ -90,7 +90,7 @@ function header(props) {
             console.log(err)
             message.info(err.msg || err.message)
           })
-        }else{
+        } else {
           request({ ...apis.channel.put, urlData: { id: newsId }, data: { ...row, status: 0 } }).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 12 });
@@ -99,11 +99,11 @@ function header(props) {
             message.info(err.msg || err.message)
           })
         }
-        
+
       }
     });
   }
-   
+
   function handleReset() {
     props.form.resetFields();
     getList({ pageNum: 1, pageSize: 12 })
@@ -113,7 +113,7 @@ function header(props) {
   return (
 
     <>
-    <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
           {getFieldDecorator('sampleName')(
             <Input
@@ -131,10 +131,10 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-            <span style={{marginRight:'10px'}}>新增时间段：</span>
-                {getFieldDecorator('createDate')(
-                  <RangePicker placeholder={['开始时间','结束时间']} />
-                )}
+          <span style={{ marginRight: '10px' }}>新增时间段：</span>
+          {getFieldDecorator('createDate')(
+            <RangePicker placeholder={['开始时间', '结束时间']} />
+          )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('tag')(
@@ -149,21 +149,21 @@ function header(props) {
             搜索
           </Button>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+            重置
           </Button>
         </Form.Item>
       </Form>
-      
+
       <Button type="danger" className={styles.addBtn} onClick={toEditH5()}>新增</Button>
-      <Row>      
-          {(data.records || []).map(x => (
-              <Col span={6}>
-                <H5Card h5Data={x} onChange={handleReset}/>
-              </Col>
-            ))}
+      <Row>
+        {(data.records || []).map((x, index) => (
+          <Col key={index} 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}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div>
     </>
   )