Merge branch 'dev' into v3-5-30

config/config.js

 
   proxy: {
     '/api': {
-      // target: 'https://dev.fangdeal.cn',
-      target: 'http://127.0.0.1:8080/',
+      target: 'https://dev.fangdeal.cn',
+      // target: 'http://192.168.0.153:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/components/uploadImage/Upload.jsx

   state = {
     previewVisible: false,
     previewImage: '',
-    loadding: false,
+    loading: false,
   };
 
   getFileList = () => {
       <div className="clearfix">
         <Upload
           listType="picture-card"
-          multiple={true}
           fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}

src/pages/fundManagement/AccountDetail.jsx

 import RechargeOrder from './RechargeOrder';
 import ConsumeOrder from './ConsumeOrder';
 import RefundOrder from './RefundOrder';
+import Base from './Base';
 import Recharge from './components/Recharge'
 import { regFenToYuan } from '@/utils/money';
 
 function header(props) {
-    const orgId = props.location.query.id || ''
-    const [newsData, setNewsData] = useState({})
-    if (orgId) {
-        useEffect(() => {
-            getDetail(orgId);
-        }, [])
+    const orgId = props.location.query.orgId || ''
 
-        // 查询详情
-        const getDetail = (orgId) => {
-            request({
-                ...apis.fund.accountDetail,
-                urlData: { id: orgId }
-            }).then((data) => {
-                console.log(data)
-                setNewsData(data)
-            })
-        }
-    }
-    const [tab, changeTab] = useState('basic')
+    useEffect(() => {
+     
+    }, [])
+
+  
 
-    const fields = [
-        {
-            label: '小程序名',
-            name: 'orgName',
-            type: FieldTypes.Message,
-            value: newsData.miniappName || '',
-        },
-        {
-            label: '公司/组织名称',
-            name: 'company',
-            type: FieldTypes.Message,
-            value: newsData.orgName || '',
-        },
-        {
-            label: '代理商',
-            name: 'agent',
-            type: FieldTypes.Message,
-            value: newsData.channelProxyName || '',
-        },
-        {
-            label: '总充值金额',
-            name: 'recharge',
-            type: FieldTypes.Message,
-            value: regFenToYuan(newsData.totalRechargeAmount) || '0',
-            help: '对账请在充值订单中查看充值状态为“已支付”的充值记录',
-        },
-        {
-            label: '已消费金额',
-            name: 'consume',
-            type: FieldTypes.Message,
-            value: regFenToYuan(newsData.purchaseAmount) || '0',
-            help: '对账请在充值订单中查看充值状态为“成功”的充值记录',
-        },
-        {
-            label: '已退款金额',
-            name: 'refund',
-            type: FieldTypes.Message,
-            value: regFenToYuan(newsData.totalRefund) || '0',
-            help: '对账请在充值订单中查看充值状态为“已退款”的退款记录',
-        },
-        {
-            label: '退款冻结金额',
-            name: 'consume',
-            type: FieldTypes.Message,
-            value: regFenToYuan(newsData.refundBlockedAmount) || '0',
-            help: '对账请在充值订单中查看充值状态为“已申请”的退款记录',
-        },
-        {
-            label: '账户余额',
-            name: 'consume',
-            type: FieldTypes.Message,
-            value: regFenToYuan(newsData.realBalance) || '0',
-            help: '对账户余额=总充值金额-已消费金额-已退款额-退款冻结额',
-        },
-    ]
+    const [tab, changeTab] = useState('basic')
 
 
     return (
                 </Radio.Group>
             </div>
             <div>
-                {tab === 'basic' &&
-                    <div>
-                        <XForm buttonVisible={false} fields={fields}></XForm>
-                        <div style={{ paddingLeft: '30%', marginTop: '30px' }}>
-                            <Button htmlType="submit" type="primary" style={{ marginRight: '10%' }}>
-                                <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(orgId)} accountId={newsData.accountId || ''} />
-                            </Button>
-                            <Button onClick={() => router.go(-1)}>返回</Button>
-                        </div>
-                    </div>
-                }
-                {tab === 'recharge' && <RechargeOrder orgId={orgId} />}
-                {tab === 'consume' && <ConsumeOrder orgId={orgId} />}
-                {tab === 'refund' && <RefundOrder orgId={orgId} />}
+                {tab === 'basic' && <Base orgId={orgId} />}
+                {tab === 'recharge' && <RechargeOrder organize="hidden" orgId={orgId} />}
+                {tab === 'consume' && <ConsumeOrder organize="hidden" orgId={orgId} />}
+                {tab === 'refund' && <RefundOrder organize="hidden" orgId={orgId} onToDetail={() => changeTab('basic')} />}
             </div>
         </>
     )

src/pages/fundManagement/AccountManagement.jsx

 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import Recharge from './components/Recharge'
-import Refund from './components/Refund'
+
 import { regFenToYuan } from '@/utils/money';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             render: (x, row) => (
                 <>
                     <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px', display: 'inline-block' }}><Recharge onClick={handleReset} orgId={row.orgId} accountId={row.accountId} /></span>
-                    <span style={{ color: '#FF925C', cursor: 'pointer', display: 'inline-block' }} >
+                    {/* <span style={{ color: '#FF925C', cursor: 'pointer', display: 'inline-block' }} >
                         <Refund orgId={row.orgId} accountId={row.accountId} onClick={handleReset} realBalance={row.realBalance || '0'} />
-                    </span>
+                    </span> */}
                 </>
             ),
         },
         getList({ pageNum: 1, pageSize: 10 })
     }
 
+    // 导出
+    const exportList = () => {
+        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
+        
+        request({ ...apis.fund.accountExport, params: { ...submitValue } }).then(data => {
+            if (!data) {
+                return
+            }
+            const url = window.URL.createObjectURL(new Blob([data]))
+            const link = document.createElement('a')
+            link.style.display = 'none'
+            link.href = url
+            link.setAttribute('download', '账户列表.xlsx')
+            document.body.append(link)
+            link.click()
+        }).catch()
+    }
+
     const toDeatil = (row) => {
         router.push({
             pathname: '/fundManagement/AccountDetail',
             query: {
-                id: row.orgId
+                orgId: row.orgId
             },
         });
     }
                     </Button>
                 </Form.Item>
             </Form>
+            <div>
+                <Button type="danger" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={() => exportList()} >导出</Button>
+            </div>
             <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} />

src/pages/fundManagement/Base.jsx

+import React, { useState, useEffect } from 'react';
+import { Button, Icon, message } from 'antd';
+import router from 'umi/router';
+import { fetch, apis } from '../../utils/request';
+import request from '../../utils/request';
+import XForm, { FieldTypes } from '../../components/XForm';
+import Recharge from './components/Recharge'
+import { regFenToYuan } from '@/utils/money';
+
+function header(props) {
+    const orgId = props.orgId || ''
+    const [newsData, setNewsData] = useState({})
+
+    useEffect(() => {
+        if (orgId) {
+            getDetail(orgId);
+        }
+    }, [])
+
+    // 查询详情
+    const getDetail = (orgId) => {
+        request({
+            ...apis.fund.accountDetail,
+            urlData: { id: orgId }
+        }).then((data) => {
+            console.log(data)
+            setNewsData(data)
+        })
+    }
+
+    const fields = [
+        {
+            label: '小程序名',
+            name: 'orgName',
+            type: FieldTypes.Message,
+            value: newsData.miniappName || '',
+        },
+        {
+            label: '公司/组织名称',
+            name: 'company',
+            type: FieldTypes.Message,
+            value: newsData.orgName || '',
+        },
+        {
+            label: '代理商',
+            name: 'agent',
+            type: FieldTypes.Message,
+            value: newsData.channelProxyName || '',
+        },
+        {
+            label: '总充值金额',
+            name: 'recharge',
+            type: FieldTypes.Message,
+            value: regFenToYuan(newsData.totalRechargeAmount) || '0',
+            help: '对账请在充值订单中查看充值状态为“已支付”的充值记录',
+        },
+        {
+            label: '已消费金额',
+            name: 'consume',
+            type: FieldTypes.Message,
+            value: regFenToYuan(newsData.purchaseAmount) || '0',
+            help: '对账请在充值订单中查看充值状态为“成功”的充值记录',
+        },
+        {
+            label: '已退款金额',
+            name: 'refund',
+            type: FieldTypes.Message,
+            value: regFenToYuan(newsData.totalRefund) || '0',
+            help: '对账请在充值订单中查看充值状态为“已退款”的退款记录',
+        },
+        {
+            label: '退款冻结金额',
+            name: 'consume',
+            type: FieldTypes.Message,
+            value: regFenToYuan(newsData.refundBlockedAmount) || '0',
+            help: '对账请在充值订单中查看充值状态为“已申请”的退款记录',
+        },
+        {
+            label: '账户余额',
+            name: 'consume',
+            type: FieldTypes.Message,
+            value: regFenToYuan(newsData.realBalance) || '0',
+            help: '对账户余额=总充值金额-已消费金额-已退款额-退款冻结额',
+        },
+    ]
+
+
+    return (
+
+        <>
+            <div>
+                <XForm buttonVisible={false} fields={fields}></XForm>
+                <div style={{ paddingLeft: '30%', marginTop: '30px' }}>
+                    <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(newsData.orgId)} accountId={newsData.accountId || ''} />
+                    <Button onClick={() => router.go(-1)}>返回</Button>
+                </div>
+            </div>
+        </>
+    )
+}
+
+export default header

src/pages/fundManagement/ConsumeOrder.jsx

     const [personInfo, setPersonInfo] = useState({})
     const orgId = props.orgId || ''
     useEffect(() => {
-        getList({ pageNum: 1, pageSize: 10, orderType: 'redPacket' });
+        getList({ pageNum: 1, pageSize: 10, orderType: 'RedPacket' });
     }, [])
 
     // 查询列表
                 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');
+                    submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+                    submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
                 } else {
                     submitValue.startDate = null
                     submitValue.endDate = null
                 }
-                getList({ pageNum: 1, pageSize: 10, orderType: 'redPacket', ...submitValue })
+                getList({ pageNum: 1, pageSize: 10, orderType: 'RedPacket', ...submitValue })
             }
         });
     }
         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');
+            submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+            submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
         } else {
             submitValue.startDate = null
             submitValue.endDate = null
         }
-        getList({ pageNum: pageNumber, pageSize: 10, orderType: 'redPacket', ...submitValue })
+        getList({ pageNum: pageNumber, pageSize: 10, orderType: 'RedPacket', ...submitValue })
     }
 
     /**
             key: 'amount',
             align: 'center',
             render: (x, row) => <span>{regFenToYuan(x)}</span>
-
         },
         {
             title: '消费方式',
             dataIndex: 'consumeType',
             key: 'consumeType',
             align: 'center',
+            render: (x, row) => <><span>{row.consumeType == 'RedPacket' ? '红包' : ''}</span></>
         },
         {
             title: '活动名称',
             dataIndex: 'tradingStatus',
             key: 'tradingStatus',
             align: 'center',
-            render: (x, row) => <><span>{row.tradingStatus == '1' ? '成功' : '失败'}</span></>
+            render: (x, row) => <><span>{row.tradingStatus == 'success' ? '成功' : '失败'}</span></>
         },
 
     ];
 
     function handleReset() {
         props.form.resetFields();
-        getList({ pageNum: 1, pageSize: 10, orderType: 'redPacket' })
+        getList({ pageNum: 1, pageSize: 10, orderType: 'RedPacket' })
     }
     // 导出
     const exportList = () => {
         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');
+            submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+            submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
         } else {
             submitValue.startDate = null
             submitValue.endDate = null
         }
-        request({ ...apis.fund.consumeOrderExport, params: { orderType: 'redPacket', orgId, ...submitValue } }).then(data => {
+        request({ ...apis.fund.consumeOrderExport, params: { orderType: 'RedPacket', orgId, ...submitValue } }).then(data => {
             if (!data) {
                 return
             }
         }).catch()
     }
     const { getFieldDecorator } = props.form
+
+    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '消费组织') : columns
     return (
 
         <>
                 <div style={{ paddingLeft: '36%' }}>
                     <p>昵称：{personInfo.nickname || ''}</p>
                     <p>头像：<img src={personInfo.avatarurl || ''} className={styles.touxiang} /></p>
-                    <p>姓名：{personInfo.name || ''}</p>
+                    <p>姓名：{personInfo.name || personInfo.nickname}</p>
                     <p>手机号：{personInfo.phone || ''}</p>
                 </div>
 
                         />,
                     )}
                 </Form.Item>
-                <Form.Item>
-                    {getFieldDecorator('miniAppName')(
-                        <Input
-                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                            placeholder="消费组织"
-                        />,
-                    )}
-                </Form.Item>
+                {
+                    props.organize != 'hidden' &&
+                    <Form.Item>
+                        {getFieldDecorator('miniAppName')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="消费组织"
+                            />,
+                        )}
+                    </Form.Item>
+                }
                 <Form.Item>
                     <span style={{ marginRight: '10px' }}>消费时间段：</span>
                     {getFieldDecorator('LocalDate')(
                     {getFieldDecorator('itemType')(
                         <Select style={{ width: '180px' }} placeholder="消费方式">
                             <Select.Option value="">全部</Select.Option>
-                            <Select.Option value="redPacket">红包</Select.Option>
+                            <Select.Option value="RedPacket">红包</Select.Option>
                         </Select>,
                     )}
                 </Form.Item>
                     {getFieldDecorator('tradingStatus')(
                         <Select style={{ width: '180px' }} placeholder="消费状态">
                             <Select.Option value="">全部</Select.Option>
-                            <Select.Option value="1">成功</Select.Option>
-                            <Select.Option value="2">失败</Select.Option>
+                            <Select.Option value="success">成功</Select.Option>
+                            <Select.Option value="fail">失败</Select.Option>
                         </Select>,
                     )}
                 </Form.Item>
             <div>
                 <Button type="danger" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={() => exportList()} >导出</Button>
             </div>
-            <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={columns} pagination={false} />
+            <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={lastColumns} 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

 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.fund.contactList, params: { ...params } }).then((data) => {
+        request({ ...apis.fund.contactList, params: { ...params, contentType: 'finance' } }).then((data) => {
             console.log(data)
             setData(data)
         })
                     </Button>
                 </Form.Item>
             </Form>
-            <div style={{ margin: '10px 0 16px 0' }}>
-                <Button type="danger" className={styles.addBtn} ><SelectContact 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/fundManagement/RechargeOrder.jsx

                 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');
+                    submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+                    submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
                 } else {
                     submitValue.startDate = null
                     submitValue.endDate = null
         });
     }
 
-    const changePageNum = (pageNumber) => {
-        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
-        if (null != LocalDate && LocalDate.length > 0) {
+    const changePageNum = pageNumber => {
+        const { LocalDate, ...submitValue } = props.form.getFieldsValue()
+        if (LocalDate != null && LocalDate.length > 0) {
             const [startDate, endDate] = LocalDate
-            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
-            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+            submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+            submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
         } else {
             submitValue.startDate = null
             submitValue.endDate = null
         getList({ pageNum: pageNumber, pageSize: 10, orderType: 'recharge', ...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)
     }
     /**
             dataIndex: 'isOffline',
             key: 'isOffline',
             align: 'center',
-            render: (x, row) => <><span>{row.isOffline ? '运营手动充值' : '业务线上充值'}</span></>
+            render: (x, row) => <><span>{row.isOffline ? '运营手工充值' : '业务线上充值'}</span></>
         },
         {
             title: '下单时间',
             dataIndex: 'tradingStatus',
             key: 'tradingStatus',
             align: 'center',
-            render: (x, row) => <><span>{row.tradingStatus == 'processing' ? '待支付' : row.tradingStatus == 'success' ? '已支付' : '已超时'}</span></>
+            render: (x, row) => <><span>{row.tradingStatus == 'processing' ? '待支付' : row.tradingStatus == 'success' ? '已支付' : '失败'}</span></>
         },
         {
             title: '支付时间',
             dataIndex: 'payDate',
             key: 'payDate',
             align: 'center',
-            render: (x, row) => <><span>{row.payDate ? `${moment(row.payDate).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
+            render: (x, row) => <><span>{row.isOffline == 0 &&  row.payDate != null ? `${moment(row.payDate).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
         },
 
     ];
         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');
+            submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+            submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
         } else {
             submitValue.startDate = null
             submitValue.endDate = null
         }).catch()
     }
     const { getFieldDecorator } = props.form
+
+    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '充值组织') : columns
+
     return (
 
         <>
                         />,
                     )}
                 </Form.Item>
-                <Form.Item>
-                    {getFieldDecorator('miniAppName')(
-                        <Input
-                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                            placeholder="充值组织"
-                        />,
-                    )}
-                </Form.Item>
+                {
+                    props.organize != 'hidden' &&
+                    <Form.Item>
+                        {getFieldDecorator('miniAppName')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="充值组织"
+                            />,
+                        )}
+                    </Form.Item>
+                }
+
                 <Form.Item>
                     <span style={{ marginRight: '10px' }}>支付时间段：</span>
                     {getFieldDecorator('LocalDate')(
                         <Select style={{ width: '180px' }} placeholder="充值方式">
                             <Select.Option value="">全部</Select.Option>
                             <Select.Option value="0">业务线上充值</Select.Option>
-                            <Select.Option value="1">运营手动充值</Select.Option>
+                            <Select.Option value="1">运营手工充值</Select.Option>
                         </Select>,
                     )}
                 </Form.Item>
                             <Select.Option value="">全部</Select.Option>
                             <Select.Option value="processing">待支付</Select.Option>
                             <Select.Option value="success">已支付</Select.Option>
-                            <Select.Option value="fail">已超时</Select.Option>
+                            <Select.Option value="fail">失败</Select.Option>
                         </Select>,
                     )}
                 </Form.Item>
             <div>
                 <Button type="danger" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={() => exportList()} >导出</Button>
             </div>
-            <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={columns} pagination={false} />
+            <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={lastColumns} 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

 import AuthButton from '@/components/AuthButton';
 import Swiper from './components/Swiper';
 import { regFenToYuan } from '@/utils/money';
+import Refund from './components/Refund'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
     const [refundVisible, setRefundVisible] = useState(false)
     const [inputValue, setValue] = useState('')
     const [swiperList, setSwiperList] = useState([])
-    console.log(props, "propspropspropspropspropsprops")
 
     const orgId = props.orgId || ''
 
                 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');
+                    submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+                    submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
                 } else {
                     submitValue.startDate = null
                     submitValue.endDate = null
         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');
+            submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+            submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
         } else {
             submitValue.startDate = null
             submitValue.endDate = null
         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)
     }
     /**
         setVisible(false)
         setRefundVisible(false)
     }
-    const reject = (row) => {
+    const reject = row => {
         setVisible(true)
         setRow(row)
     }
     const refund = (row) => {
         setRefundVisible(true)
+        console.log(row, 'row')
         setRow(row)
     }
 
     const toDeatil = () => {
-        router.push({
-            pathname: '/fundManagement/AccountDetail',
-            query: {
-                id: row.orgId
-            },
-        });
+        if (orgId) {
+            props.onToDetail()
+        } else {
+            router.push({
+                pathname: '/fundManagement/AccountDetail',
+                query: {
+                    orgId: row.orgId,
+                },
+            });
+        }
     }
     const bohui = () => {
         setRefundVisible(false)
     }
 
     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' });
 
-        })
+        getList({ pageNum: 1, pageSize: 10, orderType: 'refund' });
 
         setRefundVisible(false)
     }
     // 导出
     const exportList = () => {
-        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
+        const { 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');
+            submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+            submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
         } else {
             submitValue.startDate = null
             submitValue.endDate = null
     }
 
     const { getFieldDecorator } = props.form
-    const list = []
+    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '退款组织') : columns
     return (
 
         <>
                 onOk={() => orderRefund()}
                 onCancel={() => handleCancel()}
                 footer={[
-                    <Button key="back" size="large" onClick={() => orderRefund()}>退款</Button>,
+                    <Refund key="back" size="large" orgId={row.orgId} accountId={row.accountId} amount={row.amount || '0'} onClick={() => orderRefund()} orderId={row.orderId} />,
                     <Button key="submit" type="primary" size="large" onClick={() => bohui()}>驳回</Button>,
                 ]}
             ><div>
                     <p>1.请核对账户余额等是否正常，且预留了足够的活动余额。异常请核对企业账单后与企业相关人员沟通并确认点击驳回申请</p>
                     <p className={styles.flexRow}>
                         <span>退款金额: <span className={styles.red}>{regFenToYuan(row.amount) || '0'}元</span></span>
-                        <span>账户余额：<span className={styles.red}>{regFenToYuan(row.realBalance) || '0'}元</span></span>
+                        <span>账户余额：<span className={styles.red}>{regFenToYuan(row.availableBalance) || '0'}元</span></span>
                         <span className={styles.blue} onClick={() => toDeatil()}>查看账户详情</span>
                     </p>
                     <p>2.请到微信商户平台使用企业付款或充值订单退款等方式退款，或使用微信转账/银行卡转账/企业对公转账等方式退款</p>
                         />,
                     )}
                 </Form.Item>
+                {
+                    props.organize != 'hidden' &&
+                    <Form.Item>
+                        {getFieldDecorator('miniAppName')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="退款组织"
+                            />,
+                        )}
+                    </Form.Item>
+                }
+
                 <Form.Item>
-                    {getFieldDecorator('miniAppName')(
-                        <Input
-                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                            placeholder="退款组织"
-                        />,
+                    {getFieldDecorator('auditStatus')(
+                        <Select style={{ width: '180px' }} placeholder="退款状态">
+                            <Select.Option value="">全部</Select.Option>
+                            <Select.Option value="checking">已申请</Select.Option>
+                            <Select.Option value="agree">已退款</Select.Option>
+                            <Select.Option value="unAgree">已驳回</Select.Option>
+                        </Select>,
                     )}
                 </Form.Item>
                 <Form.Item>
                     <span style={{ marginRight: '10px' }}>退款时间段：</span>
                     {getFieldDecorator('LocalDate')(
-                        <RangePicker placeholder={['开始时间', '结束时间']} />
+                        <RangePicker placeholder={['开始时间', '结束时间']} />,
                     )}
                 </Form.Item>
                 <Form.Item>
             <div>
                 <Button type="danger" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={() => exportList()} >导出</Button>
             </div>
-            <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={columns} pagination={false} />
+            <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={lastColumns} 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

 const SelectContact = props => {
 
     const [data, setData] = useState([]);
+    const [disabled, setDisabled] = useState(false);
     const [visible, setVisible] = useState(false);
     const [group, setGroup] = useState({ groupId: undefined, groupName: '充值' })
 
 
 
     const handleOk = (e) => {
+        setDisabled(true)
         props.form.validateFieldsAndScroll((err, values) => {
             console.log(values, "valuesvaluesvaluesvaluesvaluesvaluesvalues")
 
                     message.info("操作成功")
                     setVisible(false)
                     props.onClick()
+                    setDisabled(false)
+                    props.form.resetFields();
+                }).catch(err => {
+                    setDisabled(false)
                 })
+            } else {
+                setDisabled(false)
             }
         });
-
-
     }
 
     const { getFieldDecorator } = props.form;
     const regMoney = /^(\d+|\d+\.\d{1,2})$/;
     return (
-        <div>
-            <span onClick={() => setVisible(true)}>{group.groupName}</span>
+        <>
+            <Button onClick={() => setVisible(true)} type="primary" style={{ marginRight: '10%' }}>{group.groupName}
+                {/* <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(orgId)} accountId={newsData.accountId || ''} /> */}
+            </Button>
+            {/* <div onClick={() => setVisible(true)} style={{ padding: '0 15px', width: '100%', height: '100%' }}>{group.groupName}</div> */}
 
             <Modal
                 visible={visible}
                 onCancel={() => setVisible(false)}
                 footer={[
                     <Button key="back" size="large" onClick={() => setVisible(false)}>取消</Button>,
-                    <Button key="submit" type="primary" size="large" onClick={() => handleOk()}>确认</Button>,
+                    <Button key="submit" type="primary" size="large" disabled={disabled} onClick={() => handleOk()}>确认</Button>,
                 ]}
             >
                 <div>
 
                         <Form.Item label="充值凭证" help="可上传银行转账截图等作为查账线索">
                             {getFieldDecorator('certificateList', {
-                                rules: [{ required: false }],
+                                rules: [{ required: true }],
                             })(
                                 <Upload />,
                             )}
 
 
             </Modal>
-        </div>
+        </>
     )
 }
 

src/pages/fundManagement/components/Refund.jsx

 
     }, [props.value])
 
-
-    const handleOk = (e) => {
+    const handleOk = () => {
         props.form.validateFieldsAndScroll((err, values) => {
             console.log(values, "valuesvaluesvaluesvaluesvaluesvaluesvalues")
             if (!err) {
-                request({ ...apis.fund.accoutRefund, urlData: { id: props.accountId || '' }, data: { ...values, orgId: props.orgId } }).then((data) => {
-                    message.info("操作成功")
+
+                request({
+                    ...apis.fund.refund, urlData: { id: props.orderId }, data: {
+                        orgId: props.orgId,
+                        // amount: props.amount,
+                        ...values,
+                    }
+                }).then(data => {
+                    console.log(data)
+                    message.success('操作成功')
                     setVisible(false)
+                    // getList({ pageNum: 1, pageSize: 10, orderType: 'refund' });
                     props.onClick()
                 })
             }
     const balance = regFenToYuan(props.realBalance)
     const regMoney = /^(\d+|\d+\.\d{1,2})$/;
     return (
-        <div>
-            <span onClick={() => setVisible(true)}>{group.groupName}</span>
+        <>
+
+            <Button key="back" size="large" onClick={() => setVisible(true)}>{group.groupName}</Button>
+            {/* <span onClick={() => setVisible(true)}>{group.groupName}</span> */}
 
             <Modal
                 visible={visible}
                 ]}
             >
                 <div>
-                    <p style={{ color: 'red' }}>请先进行线下实际退款操作后再执行线上退款存档</p>
-                    <Form {...formItemLayout} >
 
-                        <Form.Item label="退款金额" >
-                            {getFieldDecorator('refundAmount', {
-                                rules: [{ required: true, message: '退款金额不能为空' },
-                                {
-                                    validator: (rule, value, callback) => {
+                    <Form {...formItemLayout} >
+                        <Form.Item label="退款凭证">
 
-                                        callback(!regMoney.test(value) ? '金额最多两位小数' : value > balance.toString() ? '退款金额不能大于余额' : value < 0.01 ? '金额不得小于0.01' : undefined)
+                            <span>{regFenToYuan(props.amount)}元</span>
 
-                                    }
-                                }
-                                ],
-                            })(<Input type='number' placeholder="支持2位小数" addonAfter="元" />)}
                         </Form.Item>
-                        <div style={{ marginBottom: '25px' }}><span style={{ width: '25%', display: 'inline-block', textAlign: 'right' }}>余额：</span>{balance}元</div>
                         <Form.Item label="退款凭证" help="可上传银行转账截图、微信退款订单等截图作为查账线索">
                             {getFieldDecorator('certificateList', {
-                                rules: [{ required: false }],
+                                rules: [{ required: true }],
                             })(
                                 <Upload />,
                             )}
                 </div>
 
             </Modal>
-        </div>
+        </>
     )
 }
 

src/pages/fundManagement/components/SelectContact.jsx

 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import router from 'umi/router';
+import styles from './style.less'
 
 const { Column, ColumnGroup } = Table;
 const SelectContact = props => {
         },
         {
             title: '对外头衔',
-            dataIndex: 'job',
-            key: 'job',
+            dataIndex: 'appellation',
+            key: 'appellation',
             align: 'center',
             ellipsis: true,
         },
     const { getFieldDecorator } = props.form
 
     return (
-        <div>
-            <span style={{ color: '#fff' }} onClick={() => setVisible(true)}>{group.groupName}</span>
+        <div >
+
+            <Button type="danger" onClick={() => setVisible(true)} className={styles.addBtn} >{group.groupName}
+                {/* <SelectContact type="danger" onClick={() => getList({ pageNum: 1, pageSize: 10 })} /> */}
+            </Button>
+            {/* <div style={{ color: '#fff', padding: '0 15px', height: '32px', lineHeight: '32px' }} onClick={() => setVisible(true)}>{group.groupName}</div> */}
 
             <Modal
                 title="选择联系人"
                         )}
                     </Form.Item>
                     <Form.Item>
-                        {getFieldDecorator('job')(
+                        {getFieldDecorator('appellation')(
                             <Input
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                                 placeholder="对外头衔"

src/pages/fundManagement/components/Swiper.jsx

-import React, { useEffect } from "react";
+import React, { useEffect } from 'react';
 // import Swiper from 'swiper';
 import styles from './style.less'
+import './swiper.less'
 import classNames from 'classnames';
 import closeImg from '../../../assets/close.png';
 // import 'swiper/css/swiper.min.css';
             {list.length > 0 && <div className={styles.mask}>
                 <div className={styles.content}>
                     <img src={closeImg} alt="" className={styles.close} onClick={onClose} />
-                    <Carousel autoplay>
+                    <Carousel autoplay draggable>
                         {list.map((item, index) =>
-                            <img style={{ width: '100%', height: '100%', borderRadius: '10px' }} src={item} alt="" />
+                            <img className={styles.swiperImg} key={index} style={{ borderRadius: '10px', objectFit: 'contain' }} src={item} alt="" />,
+                            // <img className={styles.swiperImg} style={{ width: '32vw', minWidth: '757px', height: '21.3vw', minHeight: '504px', borderRadius: '10px' }} src={item} alt="" />,
                         )}
                     </Carousel>
-                    {/* <div className={classNames(['swiper-container', styles.carousel])}  >
+                    {/* <div className={classNames(['swiper-container', styles.carousel])}  >object-fit: contain;
                         <div className={classNames(['swiper-wrapper', styles.carousel])} >
                             {list.map((item, index) =>
                                 <div key={'swiper' + index} className={classNames(['swiper-slide', styles.carouselItem])} >

src/pages/fundManagement/components/style.less

-.mask{
+  .mask{
     width: 100vw;
     height: 100vh;
     background-color: rgba(0,0,0,0.32);
 
         }
     }
-}
+}
+
+.swiperImg{
+    max-height: 504px;
+     border-radius: 10px;
+     object-fit: contain;
+}
+
+.ant-carousel .slick-slide {
+    
+    text-align: center;
+    width: 32vw;
+    min-width: 757px;
+    height: 21.3vw;
+    min-height: 504px;
+    background: #364d79;
+    overflow: hidden;
+  }
+  
+  .ant-carousel .slick-slide h3 {
+    color: #fff;
+  }

src/pages/fundManagement/components/swiper.less

+.ant-carousel .slick-slide {
+    
+    text-align: center;
+    // width: 32vw;
+    // min-width: 757px;
+    // height: 21.3vw;
+    // min-height: 504px;
+    background: #364d79;
+    overflow: hidden;
+  }

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

                     </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/edit.jsx

               rules: [{ max: 300, message: '样例体验链接不超过300个字符' }],
             })(<Input placeholder="若样例暂未发布到小程序，可直接粘贴网页链接"/>)}
           </Form.Item>
-          <Form.Item label="H5模板" >
+          <Form.Item label="H5模板" help="未配置模板的样例，客户无法直接新增H5" >
             {getFieldDecorator('taH5Template',{
               trigger: 'onChoosed'
             })(<H5Sample />)}

src/pages/sample/h5/index.jsx

 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';
 
 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
         }
   }
 
   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
     }
     });
   }
 
-  
+
   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 });
             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 });
             message.info(err.msg || err.message)
           })
         }
-        
+
       }
     });
   }
-   
+
   function handleReset() {
     props.form.resetFields();
     getList({ pageNum: 1, pageSize: 12 })
   return (
 
     <>
-    <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
           {getFieldDecorator('sampleName')(
             <Input
           )}
         </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')(
             搜索
           </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>
     </>
   )

src/services/apis.js

       method: 'GET',
       action: 'channel',
     },
+    accountExport: {
+      url: `${prefix}/taOrgAccount/taOrgAccountListExport`,
+      method: 'GET',
+      action: 'channel',
+    },
   },
   relatedOrganization: {
     get: {