pull

config/config.js

@@ -133,8 +133,8 @@ export default {
 
   proxy: {
     '/api': {
-      target: 'https://dev.fangdeal.cn',
-      // target: 'http://192.168.0.195:8080/',
+      // target: 'https://dev.fangdeal.cn',
+      target: 'http://192.168.0.195:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/components/uploadImage/Upload.jsx

@@ -0,0 +1,81 @@
+import React from 'react';
+import { Upload, Icon, message, Modal } from 'antd';
+import './style.less';
+import { uploaderProps } from '../../utils/upload';
+
+
+
+class ImageUpload extends React.Component {
+
+  state = {
+    loading: false,
+    previewVisible: false,
+    previewImage: '',
+    fileList: this.getPropsFileList(),
+  };
+
+  componentDidUpdate(prevProps) {
+    // 直接 setState 会死循环
+    if (prevProps.value !== this.props.value) {
+      this.setState({ fileList: this.getPropsFileList() })
+    }
+  }
+
+  getPropsFileList() {
+    return !this.props.value ? [] : [{
+      uid: '-1',
+      name: 'image.png',
+      status: 'done',
+      url: this.props.value,
+    }]
+  }
+
+
+  handleChange = ({ file, fileList }) => {
+    const { status, response } = file
+    this.setState({ fileList, loading: status === "uploading" })
+
+    if (typeof this.props.onChange === 'function' && status != "uploading") {
+      const image = status === 'done' ? response : undefined
+      this.props.onChange(image);
+    }
+  };
+
+  handleCancel = () => this.setState({ previewVisible: false });
+
+  handlePreview = async file => {
+    console.log(file)
+    this.setState({
+      previewImage: file.url,
+      previewVisible: true,
+    });
+  };
+
+  render() {
+    const uploadButton = (
+      <div>
+        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"} />
+      </div>
+    );
+
+    return (
+      <>
+      <Upload
+        {...uploaderProps}
+        listType="picture-card"
+        className="avatar-uploader"
+        onChange={this.handleChange}
+        fileList={this.state.fileList}
+        onPreview={this.handlePreview}
+      >
+        {this.state.fileList.length >= 6 ? null : uploadButton}  
+      </Upload>
+      <Modal visible={this.state.previewVisible} footer={null} onCancel={this.handleCancel}>
+      <img alt="example" style={{ width: '100%' }} src={this.state.previewImage} />
+      </Modal>
+      </>
+    );
+  }
+}
+
+export default ImageUpload;

src/pages/contact/contact/list.jsx

@@ -17,7 +17,7 @@ function header(props) {
     }, [])
     // 查询列表
     const getList = params => {
-        request({ ...apis.contact.listContactByCondition, params: { ...params } }).then(data => {
+        request({ ...apis.contact.list, params: { ...params } }).then(data => {
             console.log(data)
             setData(data)
         })

src/pages/fundManagement/AccountDetail.jsx

@@ -14,7 +14,24 @@ import RefundOrder from './RefundOrder';
 
 
 function header(props) {
+    const orgId = props.location.query.id || ''
+    const [newsData, setNewsData] = useState({})
+    if (orgId) {
+        useEffect(() => {
+            getDetail(orgId);
+        }, [])
 
+        // 查询详情
+        const getDetail = (orgId) => {
+            request({
+                ...apis.fund.accountDetail,
+                urlData: { id: orgId }
+            }).then((data) => {
+                console.log(data)
+                setNewsData(data)
+            })
+        }
+    }
     const [tab, changeTab] = useState('basic')
 
     const fields = [
@@ -22,53 +39,53 @@ function header(props) {
             label: '小程序名',
             name: 'orgName',
             type: FieldTypes.Message,
-            value: '444444444444444',
+            value: newsData.miniappName || '',
         },
         {
             label: '公司/组织名称',
             name: 'company',
             type: FieldTypes.Message,
-            value: '444444444444444',
+            value: newsData.orgName || '',
         },
         {
             label: '代理商',
             name: 'agent',
             type: FieldTypes.Message,
-            value: '444444444444444',
+            value: newsData.channelProxyName || '',
         },
         {
             label: '总充值金额',
             name: 'recharge',
             type: FieldTypes.Message,
-            value: '444444444444444元',
+            value: newsData.totalRechargeAmount || '0',
             help: '对账请在充值订单中查看充值状态为“已支付”的充值记录',
         },
         {
             label: '已消费金额',
             name: 'consume',
             type: FieldTypes.Message,
-            value: '444444444444444元',
+            value: newsData.purchaseAmount || '0',
             help: '对账请在充值订单中查看充值状态为“成功”的充值记录',
         },
         {
             label: '已退款金额',
             name: 'refund',
             type: FieldTypes.Message,
-            value: '444444444444444元',
+            value: newsData.totalRefund || '0',
             help: '对账请在充值订单中查看充值状态为“已退款”的退款记录',
         },
         {
             label: '退款冻结金额',
             name: 'consume',
             type: FieldTypes.Message,
-            value: '444444444444444元',
+            value: newsData.refundBlockedAmonut || '0',
             help: '对账请在充值订单中查看充值状态为“已申请”的退款记录',
         },
         {
             label: '账户余额',
             name: 'consume',
             type: FieldTypes.Message,
-            value: '444444444444444元',
+            value: newsData.realBalance || '0',
             help: '对账户余额=总充值金额-已消费金额-已退款额-退款冻结额',
         },
     ]
@@ -97,9 +114,9 @@ function header(props) {
                         </div>
                     </div>
                 }
-                {tab === 'recharge' && <RechargeOrder />}
-                {tab === 'consume' && <ConsumeOrder />}
-                {tab === 'refund' && <RefundOrder />}
+                {tab === 'recharge' && <RechargeOrder orgId={orgId} />}
+                {tab === 'consume' && <ConsumeOrder orgId={orgId} />}
+                {tab === 'refund' && <RefundOrder orgId={orgId} />}
             </div>
         </>
     )

src/pages/fundManagement/AccountManagement.jsx

@@ -9,6 +9,7 @@ import styles from './style.less';
 import { fetch, apis } from '../../utils/request';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
+import Recharge from './components/Recharge'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
@@ -23,7 +24,7 @@ function header(props) {
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.sample.list, params: { ...params } }).then((data) => {
+        request({ ...apis.fund.account, params: { ...params } }).then((data) => {
             console.log(data)
             setData(data)
         })
@@ -35,31 +36,17 @@ 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, ...submitValue })
+                let { miniAppName } = values
+
+                getList({ pageNum: 1, pageSize: 10, miniAppName, })
             }
         });
     }
 
     const changePageNum = (pageNumber) => {
-        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 {
-            submitValue.startCreateDate = null
-            submitValue.endCreateDate = null
-        }
-        getList({ pageNum: pageNumber, pageSize: 10, ...submitValue })
+        let { miniAppName } = props.form.getFieldsValue()
+
+        getList({ pageNum: pageNumber, pageSize: 10, miniAppName, })
     }
 
     /**
@@ -71,52 +58,50 @@ function header(props) {
     const columns = [
         {
             title: '账户',
-            dataIndex: 'sampleName',
-            key: 'sampleName',
+            dataIndex: 'miniappName',
+            key: 'miniappName',
             align: 'center',
             render: (x, row) => (
                 <>
-                    <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px' }} onClick={() => toDeatil()} >
-                        {row.sampleName}
+                    <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px' }} onClick={() => toDeatil(row)} >
+                        {row.miniappName}
                     </span>
                 </>
             ),
         },
         {
             title: '总充值金额',
-            dataIndex: 'orgName',
-            key: 'orgName',
+            dataIndex: 'totalRechargeAmount',
+            key: 'totalRechargeAmount',
             align: 'center',
         },
         {
             title: '已消费金额',
-            dataIndex: 'orderer',
-            key: 'orderer',
+            dataIndex: 'purchaseAmount',
+            key: 'purchaseAmount',
             align: 'center',
         },
         {
             title: '已退款金额',
-            dataIndex: 'orderer',
-            key: 'orderer',
+            dataIndex: 'totalRefund',
+            key: 'totalRefund',
             align: 'center',
         },
         {
             title: '余额',
-            dataIndex: 'orderer',
-            key: 'orderer',
+            dataIndex: 'realBalance',
+            key: 'realBalance',
             align: 'center',
         },
         {
             title: '操作',
-            dataIndex: 'createDate',
-            key: 'createDate',
+            dataIndex: 'handle',
+            key: 'handle',
             align: 'center',
             width: '120px',
             render: (x, row) => (
                 <>
-                    <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px' }} >
-                        充值
-                    </span>
+                    <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px', display: 'inline-block' }}><Recharge orgId={row.orgId} accountId={row.accountId} /></span>
                     <span style={{ color: '#FF925C', cursor: 'pointer' }} >
                         退款
                     </span>
@@ -130,9 +115,12 @@ function header(props) {
         getList({ pageNum: 1, pageSize: 10 })
     }
 
-    const toDeatil = () => {
+    const toDeatil = (row) => {
         router.push({
             pathname: '/fundManagement/AccountDetail',
+            query: {
+                id: row.orgId
+            },
         });
     }
 
@@ -142,7 +130,7 @@ function header(props) {
         <>
             <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ marginBottom: '16px' }}>
                 <Form.Item>
-                    {getFieldDecorator('orgName')(
+                    {getFieldDecorator('miniAppName')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                             placeholder="输入小程序名"
@@ -159,7 +147,7 @@ function header(props) {
                     </Button>
                 </Form.Item>
             </Form>
-            <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
+            <Table rowKey={r => r.accountId} 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/fundManagement/ConsumeOrder.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, Button, Icon, message, Modal, Table, Select, Input, DatePicker } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import className from 'classnames';
@@ -15,15 +15,17 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 function header(props) {
     // 获取初始化数据
     const [data, setData] = useState({})
+    const [visible, setVisible] = useState(false)
     const [demandIdList, setDemandIdList] = useState([])
-
+    const [personInfo, setPersonInfo] = useState({})
+    const orgId = props.orgId || ''
     useEffect(() => {
-        getList({ pageNum: 1, pageSize: 10 });
+        getList({ pageNum: 1, pageSize: 10, orderType: 'redPacket' });
     }, [])
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.sample.list, params: { ...params } }).then((data) => {
+        request({ ...apis.fund.taOrgOrder, params: { ...params, orgId } }).then((data) => {
             console.log(data)
             setData(data)
         })
@@ -35,35 +37,34 @@ 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');
+                let { LocalDate, ...submitValue } = values
+                if (null != LocalDate && LocalDate.length > 0) {
+                    const [startDate, endDate] = LocalDate
+                    submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
+                    submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
                 } else {
-                    submitValue.startCreateDate = null
-                    submitValue.endCreateDate = null
+                    submitValue.startDate = null
+                    submitValue.endDate = null
                 }
-                getList({ pageNum: 1, pageSize: 10, ...submitValue })
+                getList({ pageNum: 1, pageSize: 10, orderType: 'redPacket', ...submitValue })
             }
         });
     }
 
     const changePageNum = (pageNumber) => {
-        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');
+        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
+        if (null != LocalDate && LocalDate.length > 0) {
+            const [startDate, endDate] = LocalDate
+            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
+            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
         } else {
-            submitValue.startCreateDate = null
-            submitValue.endCreateDate = null
+            submitValue.startDate = null
+            submitValue.endDate = null
         }
-        getList({ pageNum: pageNumber, pageSize: 10, ...submitValue })
+        getList({ pageNum: pageNumber, pageSize: 10, orderType: 'redPacket', ...submitValue })
     }
 
     /**
-     *
      *
      * @param {*} props
      * @returns
@@ -71,33 +72,33 @@ function header(props) {
     const columns = [
         {
             title: '订单编号',
-            dataIndex: 'sampleName',
-            key: 'sampleName',
+            dataIndex: 'tradeNo',
+            key: 'tradeNo',
             align: 'center',
         },
         {
             title: '消费组织',
-            dataIndex: 'orgName',
-            key: 'orgName',
+            dataIndex: 'miniAppName',
+            key: 'miniAppName',
             align: 'center',
         },
         {
             title: '消费金额',
-            dataIndex: 'orderer',
-            key: 'orderer',
+            dataIndex: 'amount',
+            key: 'amount',
             align: 'center',
 
         },
         {
             title: '消费方式',
-            dataIndex: 'phone',
-            key: 'phone',
+            dataIndex: 'consumeType',
+            key: 'consumeType',
             align: 'center',
         },
         {
             title: '活动名称',
-            dataIndex: 'phone',
-            key: 'phone',
+            dataIndex: 'activityName',
+            key: 'activityName',
             align: 'center',
         },
         {
@@ -112,27 +113,50 @@ function header(props) {
             dataIndex: 'phone',
             key: 'phone',
             align: 'center',
+            render: (x, row) => <><span className={styles.blue} onClick={() => Info(row)}>{row.phone || '13160056114'}</span></>
         },
         {
             title: '消费状态',
-            dataIndex: 'orderer',
-            key: 'orderer',
+            dataIndex: 'tradingStatus',
+            key: 'tradingStatus',
             align: 'center',
+            render: (x, row) => <><span>{row.tradingStatus == '1' ? '成功' : '失败'}</span></>
         },
 
     ];
+    const Info = (row) => {
+        request({ ...apis.fund.receiveInfo, params: { phone: row.phone, orgId: row.orgId } }).then((data) => {
+            setPersonInfo(data)
+            setVisible(true)
+        })
+    }
+
     function handleReset() {
         props.form.resetFields();
-        getList({ pageNum: 1, pageSize: 10 })
+        getList({ pageNum: 1, pageSize: 10, orderType: 'redPacket' })
     }
 
     const { getFieldDecorator } = props.form
     return (
 
         <>
+            <Modal
+                visible={visible}
+                title="接收人消息"
+                onCancel={() => setVisible(false)}
+                footer={null}
+            >
+                <div style={{ paddingLeft:'36%'}}>
+                    <p>昵称：{personInfo.nickname || ''}</p>
+                    <p>头像：<img src={personInfo.avatarurl || ''} className={styles.touxiang} /></p>
+                    <p>姓名：{personInfo.name || ''}</p>
+                    <p>手机号：{personInfo.phone || ''}</p>
+                </div>
+
+            </Modal>
             <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ marginBottom: '16px' }}>
                 <Form.Item>
-                    {getFieldDecorator('sampleName')(
+                    {getFieldDecorator('tradeNo')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                             placeholder="订单编号"
@@ -140,7 +164,7 @@ function header(props) {
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('orgName')(
+                    {getFieldDecorator('miniAppName')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                             placeholder="消费组织"
@@ -149,29 +173,29 @@ function header(props) {
                 </Form.Item>
                 <Form.Item>
                     <span style={{ marginRight: '10px' }}>消费时间段：</span>
-                    {getFieldDecorator('createDate')(
+                    {getFieldDecorator('LocalDate')(
                         <RangePicker placeholder={['开始时间', '结束时间']} />
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('payType')(
+                    {getFieldDecorator('itemType')(
                         <Select style={{ width: '180px' }} placeholder="消费方式">
-                            <Select.Option value="1">全部</Select.Option>
-                            <Select.Option value="2">红包</Select.Option>
+                            <Select.Option value="">全部</Select.Option>
+                            <Select.Option value="redPacket">红包</Select.Option>
                         </Select>,
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('payStatus')(
+                    {getFieldDecorator('tradingStatus')(
                         <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="">全部</Select.Option>
+                            <Select.Option value="1">成功</Select.Option>
+                            <Select.Option value="2">失败</Select.Option>
                         </Select>,
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('phone')(
+                    {getFieldDecorator('receivePhone')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                             placeholder="接收人手机号"
@@ -187,7 +211,7 @@ function header(props) {
           </Button>
                 </Form.Item>
             </Form>
-            <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
+            <Table rowKey={r => r.tradeNo} 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/fundManagement/Finance.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, Button, Icon, message, Modal, Table, Input } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import className from 'classnames';
@@ -11,13 +11,11 @@ import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import SelectContact from './components/SelectContact';
 
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 function header(props) {
     // 获取初始化数据
     const [data, setData] = useState({})
     const [contactList, setContactList] = useState([])
-    const [contactVisible, setContactVisible] = useState(false)
 
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 10 });
@@ -25,7 +23,7 @@ function header(props) {
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.sample.list, params: { ...params } }).then((data) => {
+        request({ ...apis.fund.contactList, params: { ...params } }).then((data) => {
             console.log(data)
             setData(data)
         })
@@ -37,30 +35,16 @@ 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
-                }
+                let { ...submitValue } = values
+
                 getList({ pageNum: 1, pageSize: 10, ...submitValue })
             }
         });
     }
 
     const changePageNum = (pageNumber) => {
-        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 {
-            submitValue.startCreateDate = null
-            submitValue.endCreateDate = null
-        }
+        let { ...submitValue } = props.form.getFieldsValue()
+
         getList({ pageNum: pageNumber, pageSize: 10, ...submitValue })
     }
 
@@ -73,15 +57,17 @@ function header(props) {
     const columns = [
         {
             title: '姓名',
-            dataIndex: 'sampleName',
-            key: 'sampleName',
+            dataIndex: 'contactName',
+            key: 'contactName',
             align: 'center',
         },
         {
             title: '性别',
-            dataIndex: 'orgName',
-            key: 'orgName',
+            dataIndex: 'sex',
+            key: 'sex',
             align: 'center',
+            render: (text, record) => <span>{record.sex == '1' ? '男' : record.sex == '2' ? '女' : '未知'}</span>
+
         },
         {
             title: '头像',
@@ -92,26 +78,26 @@ function header(props) {
         },
         {
             title: '固话',
-            dataIndex: 'orderer',
-            key: 'orderer4',
+            dataIndex: 'telephone',
+            key: 'telephone',
             align: 'center',
         },
         {
             title: '手机号',
-            dataIndex: 'orderer',
-            key: 'orderer3',
+            dataIndex: 'phone',
+            key: 'phone',
             align: 'center',
         },
         {
             title: '对外头衔',
-            dataIndex: 'orderer',
-            key: 'orderer2',
+            dataIndex: 'appellation',
+            key: 'appellation',
             align: 'center',
         },
         {
             title: '权重',
-            dataIndex: 'orderer',
-            key: 'orderer1',
+            dataIndex: 'orderNo',
+            key: 'orderNo',
             align: 'center',
         },
 
@@ -121,11 +107,6 @@ function header(props) {
         getList({ pageNum: 1, pageSize: 10 })
     }
 
-    const toDeatil = () => {
-        router.push({
-            pathname: '/fundManagement/AccountDetail',
-        });
-    }
 
     const rowSelection = {
         onChange: (selectedRowKeys, selectedRows) => {
@@ -133,24 +114,21 @@ function header(props) {
             setContactList(selectedRows)
         },
     };
-    const toAdd = (id) => () => {
-        console.log('hhhhhhhhhhhhhhh')
-        setContactVisible(true)
-    }
-    const toDel = rowData => () => {
+
+    const toDel = () => {
         if (contactList.length < 1) {
             message.info('请至少选择一条数据')
             return
         }
-
         Modal.confirm({
-            title: '确定删除联系人信息吗',
+            title: `确认将所选的${contactList.length}条数据删除`,
             okText: '确定',
             cancelText: '取消',
             onOk() {
-                request({ ...apis.contact.batchDeleteContact, data: contactList, }).then((data) => {
+                request({ ...apis.fund.delContact, data: contactList, }).then((data) => {
                     message.info("操作成功")
                     getList({ pageNum: 1, pageSize: 10 });
+                    setContactList([])
                 }).catch((err) => {
 
                 })
@@ -162,10 +140,9 @@ function header(props) {
     return (
 
         <>
-            {/* {contactVisible && <SelectContact />} */}
             <Form layout="inline" onSubmit={e => handleSubmit(e, props)} >
                 <Form.Item>
-                    {getFieldDecorator('name')(
+                    {getFieldDecorator('contactName')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                             placeholder="姓名"
@@ -173,7 +150,7 @@ function header(props) {
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('Telephone')(
+                    {getFieldDecorator('telephone')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                             placeholder="固话"
@@ -189,7 +166,7 @@ function header(props) {
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('title')(
+                    {getFieldDecorator('appellation')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                             placeholder="对外头衔"
@@ -206,10 +183,10 @@ function header(props) {
                 </Form.Item>
             </Form>
             <div style={{ margin: '10px 0 16px 0' }}>
-                <Button type="danger" className={styles.addBtn} onClick={toAdd()}><SelectContact /></Button>
-                <Button type="primary" className={styles.addBtn} onClick={toDel()} style={{ marginLeft: '30px' }} >删除</Button>
+                <Button type="danger" className={styles.addBtn} ><SelectContact onClick={() => getList({ pageNum: 1, pageSize: 10 })} /></Button>
+                <Button type="primary" className={styles.addBtn} onClick={() => toDel()} style={{ marginLeft: '30px' }} >删除</Button>
             </div>
-            <Table rowSelection={rowSelection} rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
+            <Table rowSelection={rowSelection} rowKey={r => r.contactId} 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/fundManagement/RechargeOrder.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { Form, Pagination, Button, Icon, message,  Modal, Table, Select, Input, DatePicker } from 'antd';
+import { Form, Pagination, Button, Icon, message, Modal, Table, Select, Input, DatePicker } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import className from 'classnames';
@@ -16,14 +16,14 @@ function header(props) {
     // 获取初始化数据
     const [data, setData] = useState({})
     const [demandIdList, setDemandIdList] = useState([])
-
+    const orgId = props.orgId || ''
     useEffect(() => {
-        getList({ pageNum: 1, pageSize: 10 });
+        getList({ pageNum: 1, pageSize: 10, orderType: 'recharge' });
     }, [])
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.sample.list, params: { ...params } }).then((data) => {
+        request({ ...apis.fund.taOrgOrder, params: { ...params, orgId } }).then((data) => {
             console.log(data)
             setData(data)
         })
@@ -35,31 +35,31 @@ 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');
+                let { LocalDate, ...submitValue } = values
+                if (null != LocalDate && LocalDate.length > 0) {
+                    const [startDate, endDate] = LocalDate
+                    submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
+                    submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
                 } else {
-                    submitValue.startCreateDate = null
-                    submitValue.endCreateDate = null
+                    submitValue.startDate = null
+                    submitValue.endDate = null
                 }
-                getList({ pageNum: 1, pageSize: 10, ...submitValue })
+                getList({ pageNum: 1, pageSize: 10, orderType: 'recharge', ...submitValue })
             }
         });
     }
 
     const changePageNum = (pageNumber) => {
-        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');
+        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
+        if (null != LocalDate && LocalDate.length > 0) {
+            const [startDate, endDate] = LocalDate
+            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
+            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
         } else {
-            submitValue.startCreateDate = null
-            submitValue.endCreateDate = null
+            submitValue.startDate = null
+            submitValue.endDate = null
         }
-        getList({ pageNum: pageNumber, pageSize: 10, ...submitValue })
+        getList({ pageNum: pageNumber, pageSize: 10, orderType: 'recharge', ...submitValue })
     }
 
     /**
@@ -71,28 +71,29 @@ function header(props) {
     const columns = [
         {
             title: '订单编号',
-            dataIndex: 'sampleName',
-            key: 'sampleName',
+            dataIndex: 'tradeNo',
+            key: 'tradeNo',
             align: 'center',
         },
         {
             title: '充值组织',
-            dataIndex: 'orgName',
-            key: 'orgName',
+            dataIndex: 'miniAppName',
+            key: 'miniAppName',
             align: 'center',
         },
         {
             title: '充值金额',
-            dataIndex: 'orderer',
-            key: 'orderer',
+            dataIndex: 'amount',
+            key: 'amount',
             align: 'center',
 
         },
         {
             title: '充值方式',
-            dataIndex: 'phone',
-            key: 'phone',
+            dataIndex: 'isOffline',
+            key: 'isOffline',
             align: 'center',
+            render: (x, row) => <><span>{row.isOffline ? '运营手动充值' : '业务线上充值'}</span></>
         },
         {
             title: '下单时间',
@@ -109,31 +110,32 @@ function header(props) {
         },
         {
             title: '充值状态',
-            dataIndex: 'orderer',
-            key: 'orderer',
+            dataIndex: 'tradingStatus',
+            key: 'tradingStatus',
             align: 'center',
+            render: (x, row) => <><span>{row.tradingStatus == '0' ? '待支付' : row.tradingStatus == '1' ? '已支付' : '已超时'}</span></>
         },
         {
             title: '支付时间',
-            dataIndex: 'createDate',
-            key: 'createDate',
+            dataIndex: 'payDate',
+            key: 'payDate',
             align: 'center',
-            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+            render: (x, row) => <><span>{row.payDate ? `${moment(row.payDate).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
         },
 
     ];
     function handleReset() {
         props.form.resetFields();
-        getList({ pageNum: 1, pageSize: 10 })
+        getList({ pageNum: 1, pageSize: 10, orderType: 'recharge' })
     }
 
     const { getFieldDecorator } = props.form
     return (
 
         <>
-            <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{marginBottom:'16px'}}>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ marginBottom: '16px' }}>
                 <Form.Item>
-                    {getFieldDecorator('sampleName')(
+                    {getFieldDecorator('tradeNo')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                             placeholder="订单编号"
@@ -141,7 +143,7 @@ function header(props) {
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('orgName')(
+                    {getFieldDecorator('miniAppName')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                             placeholder="充值组织"
@@ -150,26 +152,26 @@ function header(props) {
                 </Form.Item>
                 <Form.Item>
                     <span style={{ marginRight: '10px' }}>支付时间段：</span>
-                    {getFieldDecorator('createDate')(
+                    {getFieldDecorator('LocalDate')(
                         <RangePicker placeholder={['开始时间', '结束时间']} />
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('payType')(
+                    {getFieldDecorator('isOffline')(
                         <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="">全部</Select.Option>
+                            <Select.Option value="0">业务线上充值</Select.Option>
+                            <Select.Option value="1">运营手动充值</Select.Option>
                         </Select>,
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('payStatus')(
+                    {getFieldDecorator('tradingStatus')(
                         <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.Option value="">全部</Select.Option>
+                            <Select.Option value="0">待支付</Select.Option>
+                            <Select.Option value="1">已支付</Select.Option>
+                            <Select.Option value="2">已超时</Select.Option>
                         </Select>,
                     )}
                 </Form.Item>
@@ -182,7 +184,7 @@ function header(props) {
           </Button>
                 </Form.Item>
             </Form>
-            <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
+            <Table rowKey={r => r.tradeNo} 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/fundManagement/RefundOrder.jsx

@@ -9,22 +9,29 @@ import styles from './style.less';
 import { fetch, apis } from '../../utils/request';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
+import Swiper from './components/Swiper';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 function header(props) {
     // 获取初始化数据
     const [data, setData] = useState({})
+    const [row, setRow] = useState({})
     const [demandIdList, setDemandIdList] = useState([])
     const [visible, setVisible] = useState(false)
+    const [refundVisible, setRefundVisible] = useState(false)
+    const [inputValue, setValue] = useState('')
+    const [swiperList, setSwiperList] = useState([])
+
+    const orgId = props.orgId || ''
 
     useEffect(() => {
-        getList({ pageNum: 1, pageSize: 10 });
+        getList({ pageNum: 1, pageSize: 10, orderType: 'refund' });
     }, [])
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.sample.list, params: { ...params } }).then((data) => {
+        request({ ...apis.fund.taOrgOrder, params: { ...params, orgId, } }).then((data) => {
             console.log(data)
             setData(data)
         })
@@ -36,33 +43,40 @@ 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');
+                let { LocalDate, ...submitValue } = values
+                if (null != LocalDate && LocalDate.length > 0) {
+                    const [startDate, endDate] = LocalDate
+                    submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
+                    submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
                 } else {
-                    submitValue.startCreateDate = null
-                    submitValue.endCreateDate = null
+                    submitValue.startDate = null
+                    submitValue.endDate = null
                 }
-                getList({ pageNum: 1, pageSize: 10, ...submitValue })
+                getList({ pageNum: 1, pageSize: 10, orderType: 'refund', ...submitValue })
             }
         });
     }
 
     const changePageNum = (pageNumber) => {
-        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');
+        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
+        if (null != LocalDate && LocalDate.length > 0) {
+            const [startDate, endDate] = LocalDate
+            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
+            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
         } else {
-            submitValue.startCreateDate = null
-            submitValue.endCreateDate = null
+            submitValue.startDate = null
+            submitValue.endDate = null
         }
-        getList({ pageNum: pageNumber, pageSize: 10, ...submitValue })
+        getList({ pageNum: pageNumber, pageSize: 10, orderType: 'refund', ...submitValue })
+    }
+    const look = (list) => {
+        // setSwiperList([
+        //     'https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1591688474&di=85bb9a6a9736e51c63a7bac09601f1e7&src=http://a3.att.hudong.com/14/75/01300000164186121366756803686.jpg',
+        //     'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591698586868&di=f528c96c3004268843a070c342b905fa&imgtype=0&src=http%3A%2F%2Fa2.att.hudong.com%2F36%2F48%2F19300001357258133412489354717.jpg',
+        //     'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591698586867&di=7865b3f07e4b6b050642a042fa30f07e&imgtype=0&src=http%3A%2F%2Fa0.att.hudong.com%2F64%2F76%2F20300001349415131407760417677.jpg'
+        // ])
+        setSwiperList(list)
     }
-
     /**
      *
      *
@@ -72,20 +86,20 @@ function header(props) {
     const columns = [
         {
             title: '订单编号',
-            dataIndex: 'sampleName',
-            key: 'sampleName',
+            dataIndex: 'tradeNo',
+            key: 'tradeNo',
             align: 'center',
         },
         {
             title: '退款组织',
-            dataIndex: 'orgName',
-            key: 'orgName',
+            dataIndex: 'miniAppName',
+            key: 'miniAppName',
             align: 'center',
         },
         {
             title: '退款金额',
-            dataIndex: 'orderer',
-            key: 'orderer',
+            dataIndex: 'amount',
+            key: 'amount',
             align: 'center',
         },
         {
@@ -97,36 +111,55 @@ function header(props) {
         },
         {
             title: '退款状态',
-            dataIndex: 'orderer',
-            key: 'orderer1',
+            dataIndex: 'tradingStatus',
+            key: 'tradingStatus',
             align: 'center',
+            render: (x, row) => <><span>{row.tradingStatus == '0' ? '已申请' : row.tradingStatus == '1' ? '已退款' : '已驳回'}</span></>
         },
         {
             title: '驳回原因',
-            dataIndex: 'orderer',
-            key: 'ordere2r',
+            dataIndex: 'auditResult',
+            key: 'auditResult',
             align: 'center',
+            render: (x, row) => <>{row.tradingStatus == '2' && <span>{row.auditResult}</span>}</>
         },
         {
             title: '退款凭证',
-            dataIndex: 'orderer',
-            key: 'o2rderer',
+            dataIndex: 'certificateUrlList',
+            key: 'certificateUrlList',
             align: 'center',
+            render: (x, row) => (
+                <>
+                    {
+                        (x || []).length > 0 &&
+                        <>
+
+                            <span className={styles.blue} onClick={() => look(row.certificateUrlList)}>
+                                查看
+                         </span></>
+                    }
+                </>
+            ),
         },
         {
             title: '操作',
-            dataIndex: 'createDate',
-            key: 'crea2teDate',
+            dataIndex: 'handle',
+            key: 'handle',
             align: 'center',
             width: '120px',
             render: (x, row) => (
                 <>
-                    <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px' }} >
-                        退款
-                    </span>
-                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={() => setVisible(true)}>
-                        驳回
+                    {
+                        row.tradingStatus == '0' &&
+                        <>
+                            <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px' }} onClick={() => refund(row)}>
+                                退款
                     </span>
+                            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={() => reject(row)}>
+                                驳回
+                    </span></>
+                    }
+
                 </>
             ),
         },
@@ -134,18 +167,72 @@ function header(props) {
     ];
     function handleReset() {
         props.form.resetFields();
-        getList({ pageNum: 1, pageSize: 10 })
+        getList({ pageNum: 1, pageSize: 10, orderType: 'refund' })
     }
     const handleOk = () => {
+        if (inputValue) {
+            request({
+                ...apis.fund.reject, urlData: { id: row.orderId }, data: {
+                    auditResult: inputValue,
+                    orgId: row.orgId,
+                }
+            }).then((data) => {
+                console.log(data)
+                getList({ pageNum: 1, pageSize: 10, orderType: 'refund' });
 
-        setVisible(false)
+            })
+
+            setVisible(false)
+            setValue('')
+        } else {
+            message.warning('驳回原因不能为空');
+        }
 
     }
+
     const handleCancel = () => {
         setVisible(false)
+        setRefundVisible(false)
+    }
+    const reject = (row) => {
+        setVisible(true)
+        setRow(row)
+    }
+    const refund = (row) => {
+        setRefundVisible(true)
+        setRow(row)
+    }
+
+    const toDeatil = () => {
+        router.push({
+            pathname: '/fundManagement/AccountDetail',
+            query: {
+                id: row.orgId
+            },
+        });
+    }
+    const bohui = () => {
+        setRefundVisible(false)
+        setVisible(true)
+    }
+
+    const orderRefund = () => {
+        request({
+            ...apis.fund.refund, urlData: { id: row.orderId }, data: {
+                orgId: row.orgId,
+                amount: row.amount,
+            }
+        }).then((data) => {
+            console.log(data)
+            getList({ pageNum: 1, pageSize: 10, orderType: 'refund' });
+
+        })
+
+        setRefundVisible(false)
     }
 
     const { getFieldDecorator } = props.form
+    const list = []
     return (
 
         <>
@@ -160,12 +247,33 @@ function header(props) {
                 ]}
             >
                 <div style={{ display: 'flex', alignItems: 'center', margin: '30px 0' }}>驳回原因
-                <span style={{ color: 'red' }}>*</span><Input style={{ marginLeft: '10px', width: '80%' }} placeholder="请输入驳回原因" />
+                <span style={{ color: 'red' }}>*</span><Input value={inputValue} onChange={e => setValue(e.target.value)} style={{ marginLeft: '10px', width: '80%' }} placeholder="请输入驳回原因" />
+                </div>
+            </Modal>
+            <Modal
+                visible={refundVisible}
+                title="退款审核"
+                onOk={() => orderRefund()}
+                onCancel={() => handleCancel()}
+                footer={[
+                    <Button key="back" size="large" onClick={() => orderRefund()}>退款</Button>,
+                    <Button key="submit" type="primary" size="large" onClick={() => bohui()}>驳回</Button>,
+                ]}
+            ><div>
+                    <p>1.请核对账户余额等是否正常，且预留了足够的活动余额。异常请核对企业账单后与企业相关人员沟通并确认点击驳回申请</p>
+                    <p className={styles.flexRow}>
+                        <span>退款金额: <span className={styles.red}>{row.amount || '0'}元</span></span>
+                        <span>账户余额：<span className={styles.red}>{row.realBalance || '0'}元</span></span>
+                        <span className={styles.blue} onClick={() => toDeatil()}>查看账户详情</span>
+                    </p>
+                    <p>2.请到微信商户平台使用企业付款或充值订单退款等方式退款，或使用微信转账/银行卡转账/企业对公转账等方式退款</p>
+                    <p>3.退款完成后，截图保留凭证并点击确认退款</p>
                 </div>
             </Modal>
+            < Swiper list={swiperList} onClose={() => setSwiperList([])} />
             <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ marginBottom: '16px' }}>
                 <Form.Item>
-                    {getFieldDecorator('sampleName')(
+                    {getFieldDecorator('tradeNo')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                             placeholder="订单编号"
@@ -173,7 +281,7 @@ function header(props) {
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('orgName')(
+                    {getFieldDecorator('miniAppName')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                             placeholder="退款组织"
@@ -182,7 +290,7 @@ function header(props) {
                 </Form.Item>
                 <Form.Item>
                     <span style={{ marginRight: '10px' }}>退款时间段：</span>
-                    {getFieldDecorator('createDate')(
+                    {getFieldDecorator('LocalDate')(
                         <RangePicker placeholder={['开始时间', '结束时间']} />
                     )}
                 </Form.Item>
@@ -195,7 +303,7 @@ function header(props) {
                     </Button>
                 </Form.Item>
             </Form>
-            <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
+            <Table rowKey={r => r.tradeNo} 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/fundManagement/components/Recharge.jsx

@@ -0,0 +1,99 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Modal, Button, Table, message, Input, Icon, Pagination } from 'antd';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import router from 'umi/router';
+import Upload from '../../../components/uploadImage/Upload'
+
+const { Column, ColumnGroup } = Table;
+
+const formItemLayout = {
+    labelCol: {
+        xs: { span: 6 },
+        sm: { span: 6 },
+    },
+    wrapperCol: {
+        xs: { span: 18 },
+        sm: { span: 18 },
+    },
+};
+
+const SelectContact = props => {
+
+    const [data, setData] = useState([]);
+    const [visible, setVisible] = useState(false);
+    const [group, setGroup] = useState({ groupId: undefined, groupName: '充值' })
+
+    useEffect(() => {
+
+    }, [props.value])
+
+
+
+
+    const handleSubmit = (e) => {
+
+
+    }
+    const handleOk = (e) => {
+        props.form.validateFieldsAndScroll((err, values) => {
+            console.log(values, "valuesvaluesvaluesvaluesvaluesvaluesvalues")
+            if (!err) {
+                request({ ...apis.fund.recharge, urlData: { id: props.accountId || '' }, data: { ...values, orgId: props.orgId } }).then((data) => {
+                    message.info("操作成功")
+                    setVisible(false)
+                })
+            }
+        });
+
+
+    }
+
+    const { getFieldDecorator } = props.form;
+    return (
+        <div>
+            <span onClick={() => setVisible(true)}>{group.groupName}</span>
+
+            <Modal
+                visible={visible}
+                title="确认充值"
+                onOk={() => handleOk()}
+                onCancel={() => setVisible(false)}
+                footer={[
+                    <Button key="back" size="large" onClick={() => setVisible(false)}>取消</Button>,
+                    <Button key="submit" type="primary" size="large" onClick={() => handleOk()}>确认</Button>,
+                ]}
+            >
+                <div>
+                    <p style={{ color: 'red' }}>请先进行线下实际充值操作后再执行线上充值存档</p>
+                    <Form {...formItemLayout} onSubmit={handleSubmit}>
+
+                        <Form.Item label="充值金额" >
+                            {getFieldDecorator('rechargeAmount', {
+                                rules: [{ required: true, message: '充值金额不能为空' },
+                                { max: 20 }],
+                            })(<Input type='number' placeholder="支持2位小数" />)}
+                        </Form.Item>
+
+                        <Form.Item label="充值凭证" help="可上传银行转账截图等作为查账线索">
+                            {getFieldDecorator('certificateList', {
+                                rules: [{ required: false }],
+                            })(
+                                <Upload />,
+                            )}
+                        </Form.Item>
+
+                    </Form>
+                </div>
+
+
+
+
+            </Modal>
+        </div>
+    )
+}
+
+const WrappedRegistrationForm = Form.create()(SelectContact);
+export default WrappedRegistrationForm;

src/pages/fundManagement/components/SelectContact.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Select, Modal, Button, Table, Divider, Tag, Input, Row, Col, Icon, Pagination } from 'antd';
+import { Form, Modal, Button, Table, message, Input, Icon, Pagination } from 'antd';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import router from 'umi/router';
@@ -29,11 +29,6 @@ const SelectContact = props => {
 
 
 
-    const handleChange = val => {
-    }
-
-
-
 
     // 提交事件
     const handleSubmit = (e, props) => {
@@ -61,6 +56,13 @@ const SelectContact = props => {
         });
     }
 
+    const selectData = (record) => {
+        request({ ...apis.fund.addContact, urlData: { id: record.contactId } }).then((data) => {
+            message.success('新增成功!');
+            props.onClick()
+            setVisible(false)
+        })
+    }
 
 
     const columns = [

src/pages/fundManagement/components/Swiper.jsx

@@ -0,0 +1,63 @@
+import React, { useEffect } from "react";
+import Swiper from 'swiper';
+import styles from './style.less'
+import classNames from 'classnames';
+import closeImg from '../../../assets/close.png';
+import 'swiper/css/swiper.min.css';
+
+
+const swiper = ({ list, onClose }) => {
+
+    useEffect(() => {
+        if (list.length > 0) {
+            //swiper初始化
+            if (list.length > 1) {
+                this.swiper = new Swiper('.swiper-container', {
+                    slidesPerView: 1,
+                    loop: true,
+                    autoplay: {
+                        disableOnInteraction: false,
+                    },
+                    touchRatio: 1.5,
+                    pagination: {
+                        el: '.swiper-pagination',
+                        bulletElement: 'li',
+                        clickable: true,
+                        bulletActiveClass: 'antd-pro-pages-swiper-style-active',
+                    },
+                    observer: true,//修改swiper自己或子元素时，自动初始化swiper
+                    observeParents: true,//修改swiper的父元素时，自动初始化swiper
+                })
+            } else {
+                this.swiper = new Swiper('.swiper-container', {
+                    loop: false,
+                    observer: true,//修改swiper自己或子元素时，自动初始化swiper
+                    observeParents: true,//修改swiper的父元素时，自动初始化swiper
+                })
+            }
+
+        }
+    }, [])
+
+    return (
+        <>
+            {list.length > 0 && <div className={styles.mask}>
+                <div className={styles.content}>
+                    <img src={closeImg} alt="" className={styles.close} onClick={onClose} />
+                    <div className={classNames(['swiper-container', styles.carousel])}  >
+                        <div className={classNames(['swiper-wrapper', styles.carousel])} >
+                            {list.map((item, index) =>
+                                <div key={'swiper' + index} className={classNames(['swiper-slide', styles.carouselItem])} >
+                                    <img style={{ width: '100%', height: '100%', borderRadius: '10px' }} src={item} alt="" />
+                                </div>
+                            )}
+                        </div>
+                        <div className={classNames(['swiper-pagination', styles.dots])}  ></div>
+                    </div>
+                </div>
+            </div>}
+        </>
+    )
+};
+
+export default swiper;

src/pages/fundManagement/components/style.less

@@ -0,0 +1,88 @@
+.mask{
+    width: 100vw;
+    height: 100vh;
+    background-color: rgba(0,0,0,0.32);
+    position: fixed;
+    z-index: 999;
+    top: 0;
+    left: 0;
+}
+
+.content{
+    width: 32vw;
+    min-width: 757px;
+    height: 21.3vw;
+    min-height: 504px;
+    position: absolute;
+    left: 50%;
+    top: 110px;
+    transform: translateX(-50%);
+    border-radius: 10px;
+    .close{
+        width: 40px;
+        height: 40px;
+        position: absolute;
+        top: -22px;
+        right: -22px;
+        z-index: 9;
+    }
+}
+
+.dots{
+    position: absolute;
+    bottom: 11px;
+    width: 100%;
+    padding: 0;
+    margin: 0;
+    list-style: none;
+    text-align: center;
+    li {
+        position: relative;
+        display: inline-block;
+        width: 14px;
+        height: 2px;
+        margin: 0 3px;
+        padding: 0;
+        cursor: pointer;
+        background: #fff;
+        opacity: 0.6;
+        &.active{
+            width: 16px;
+            height: 3px;
+            background: #fff;
+            opacity: 1;
+        }
+    }
+}
+.carousel {
+    width: 32vw;
+    min-width: 757px;
+    height: 21.3vw;
+    min-height: 504px;
+    border-radius: 10px;
+    // overflow: hidden;
+    
+    .carouselItem{
+        width: 32vw;
+        min-width: 757px;
+        height: 21.3vw;
+        min-height: 504px;
+        position: relative;
+        display: inline-block;
+        .title{
+            font-size: 0.12rem;
+            color: #fff;
+            position: absolute;
+            display: block;
+            width: 100%;
+            height: 0.16rem;
+            bottom: 30px ;
+            padding: 0 40px;
+            text-align: center;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+
+        }
+    }
+}

src/pages/fundManagement/style.less

@@ -23,4 +23,16 @@
   .touxiang {
     width: 93px;
     height: 93px;
+  }
+  .flexRow{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  .red{
+    color: red;
+  }
+  .blue{
+    color: #1890FF;
+    cursor: pointer;
   }

src/pages/sample/h5/h5Sample.jsx

@@ -14,7 +14,6 @@ import AuthButton from '@/components/AuthButton';
 function header(props) {
     // 获取初始化数据
     const [data, setData] = useState({})
-    const [demandIdList, setDemandIdList] = useState([])
 
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 10 });
@@ -22,7 +21,7 @@ function header(props) {
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.sample.list, params: { ...params } }).then((data) => {
+        request({ ...apis.sample.h5Template, params: { ...params } }).then((data) => {
             console.log(data)
             setData(data)
         })
@@ -34,30 +33,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
-                }
+                let { ...submitValue } = values
                 getList({ pageNum: 1, pageSize: 10, ...submitValue })
             }
         });
     }
 
     const changePageNum = (pageNumber) => {
-        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 {
-            submitValue.startCreateDate = null
-            submitValue.endCreateDate = null
-        }
+        let { ...submitValue } = props.form.getFieldsValue()
+
         getList({ pageNum: pageNumber, pageSize: 10, ...submitValue })
     }
 
@@ -72,14 +56,14 @@ function header(props) {
     const columns = [
         {
             title: '模板编号',
-            dataIndex: 'sampleName',
-            key: 'sampleName',
+            dataIndex: 'h5TemplateId',
+            key: 'h5TemplateId',
             align: 'center',
         },
         {
             title: '模板名称',
-            dataIndex: 'orgName',
-            key: 'orgName',
+            dataIndex: 'name',
+            key: 'name',
             align: 'center',
         },
         {
@@ -99,12 +83,12 @@ function header(props) {
     return (
 
         <>
-            <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{marginBottom:'16px'}}>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ marginBottom: '16px' }}>
                 <Form.Item>
-                    {getFieldDecorator('sampleName')(
+                    {getFieldDecorator('name')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                            placeholder="样例名"
+                            placeholder="模板名"
                         />,
                     )}
                 </Form.Item>

src/services/apis.js

@@ -109,7 +109,12 @@ const apis = {
       url: `${prefix}/put/h5Sample/:id`,
       method: 'PUT',
       action: 'channel',
-    }
+    },
+    h5Template: {
+      url: `${prefix}/taH5Template`,
+      method: 'GET',
+      action: 'channel',
+    },
   },
   image: {
     uploadForAnt: {
@@ -141,26 +146,26 @@ const apis = {
       action: 'channel',
     },
 
-   
-    get:{
+
+    get: {
       url: `${prefix}/taNotice/:id`,
       method: 'GET',
       action: 'channel',
     },
-    delete:{
+    delete: {
       url: `${prefix}/taNotice/batchDelete`,
       method: 'put',
       action: 'channel',
     },
-    getSample:{
+    getSample: {
       url: `${prefix}/listH5SampleByCondition`,
       method: 'GET',
       action: 'channel',
     }
     // /api/admin/ListH5SampleByCondition
   },
-  
-  contact:{
+
+  contact: {
     listContactByCondition: {
       url: `${prefix}/listContactByCondition`,
       method: 'GET',
@@ -192,42 +197,100 @@ const apis = {
       action: 'channel',
     },
   },
-  relatedOrganization:{
-    get:{
+  fund: {
+    account: {
+      url: `${prefix}/taOrgAccount`,
+      method: 'GET',
+      action: 'channel',
+    },
+    accountDetail: {
+      url: `${prefix}/taOrgAccount/:id`,
+      method: 'GET',
+      action: 'channel',
+    },
+    taOrgOrder: {
+      url: `${prefix}/taOrgOrder`,
+      method: 'GET',
+      action: 'channel',
+    },
+    refund: {
+      url: `${prefix}/taOrgOrder/refund/:id`,
+      method: 'PUT',
+      action: 'channel',
+    },
+    reject: {
+      url: `${prefix}/taOrgOrder/reject/:id`,
+      method: 'PUT',
+      action: 'channel',
+    },
+    receiveInfo: {
+      url: `${prefix}/receiveInfo`,
+      method: 'GET',
+      action: 'channel',
+    },
+    recharge: {
+      url: `${prefix}/taOrgAccount/recharge/:id`,
+      method: 'PUT',
+      action: 'channel',
+    },
+    accoutRefund: {
+      url: `${prefix}/taOrgAccount/refund/:id`,
+      method: 'PUT',
+      action: 'channel',
+    },
+    addContact: {
+      url: `${prefix}/taContactFinance/:id`,
+      method: 'PUT',
+      action: 'channel',
+    },
+    delContact: {
+      url: `${prefix}/taContactFinanceDel`,
+      method: 'PUT',
+      action: 'channel',
+    },
+    contactList: {
+      url: `${prefix}/listContactByCondition`,
+      method: 'GET',
+      action: 'channel',
+    },
+
+  },
+  relatedOrganization: {
+    get: {
       url: `${prefix}/contract/listCompanyOrg`,
       method: 'GET',
       action: 'channel',
     },
-    listCompany:{
+    listCompany: {
       url: `${prefix}/contract/listCompany`,
       method: 'GET',
       action: 'channel',
     },
-    listOrg:{
+    listOrg: {
       url: `${prefix}/contract/listOrg`,
       method: 'GET',
       action: 'channel',
     },
-    post:{
+    post: {
       url: `${prefix}/contract/taCompanyOrg`,
       method: 'post',
       action: 'channel',
     },
-    delete:{
+    delete: {
       url: `${prefix}/taCompanyOrg/:id`,
       method: 'delete',
       action: 'channel',
 
     },
- 
+
   },
-  signedContract:{
-    get:{
+  signedContract: {
+    get: {
       url: `${prefix}/contract/list`,
       method: 'GET',
       action: 'channel',
     },
-    check:{
+    check: {
       url: `${prefix}/contract/checkBeforeBatchUpdatePrice`,
       method: 'post',
       action: 'channel',
@@ -333,7 +396,7 @@ const apis = {
       method: 'POST',
       action: 'channel',
     }
-  }  
+  }
 }
 
 export default apis;