zls

config/routes.js

@@ -841,6 +841,12 @@ export default [
                 hideInMenu: true,
                 component: './h5SampleManager/h5Sample/add',
               },
+              {
+                path: '/h5SampleManager/h5Sample/addH5',
+                name: '创建H5活动',
+                hideInMenu: true,
+                component: './h5SampleManager/h5Sample/addH5',
+              },
               {
                 path: '/h5SampleManager/h5Demand/list',
                 name: 'H5需求单',
@@ -942,6 +948,30 @@ export default [
               },   
             ],
           },
+          {
+            path: '/funds',
+            name: '资金管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/funds/accountfunds',
+                name: '账户资金',
+                component: './funds/accountfunds/index',
+              },
+           
+              // {
+              //   path: '/fund/qrcodelist/add',
+              //   name: '新增',
+              //   hideInMenu: true,
+              //   component: './fund/qrcodelist/add',
+              // },   
+              {
+                path: '/funds/financialContact',
+                name: '财务联系人',
+                component: './funds/financialContact/index',
+              },   
+            ],
+          },
           // {
           //   path: '/miniapp',
           //   name: '小程序管理',

package.json

@@ -56,6 +56,7 @@
     "moment": "^2.24.0",
     "omit.js": "^1.0.2",
     "path-to-regexp": "^3.0.0",
+    "qrcode.react": "^1.0.0",
     "qs": "^6.7.0",
     "react": "^16.8.6",
     "react-amap": "^1.2.8",

src/pages/activity/drainage/DrainageList.jsx

@@ -264,26 +264,24 @@ const header = props => {
           values.endDate = moment(values.endDate._d).format('YYYY-MM-DD HH:mm:ss')
           if (formsDate.drainageId) {
             // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
-            request({ ...apis.activity.updatetaDrainage, urlData: { id: formsDate.drainageId }, data: values }).then((data) => {
+            request({ ...apis.activity.updatetaDrainage, urlData: { id: formsDate.drainageId }, data: values }).then(data => {
               message.info('操作成功！')
-              gettaDrainage(JSON.parse(localStorage.getItem("drainageActivePageParams")))
+              gettaDrainage(JSON.parse(localStorage.getItem('drainageActivePageParams')))
               setDate({
                 visible: false,
               });
-            }).catch((err) => {
+            }).catch(err => {
               console.log('111111', err)
               message.info(err.msg || err.message)
             })
-
           } else {
-
-            request({ ...apis.activity.addtaDrainage, data: values }).then((data) => {
-              message.info("操作成功")
-              gettaDrainage(JSON.parse(localStorage.getItem("drainageActivePageParams")))
+            request({ ...apis.activity.addtaDrainage, data: values }).then(data => {
+              message.info('操作成功')
+              gettaDrainage(JSON.parse(localStorage.getItem('drainageActivePageParams')))
               setDate({
                 visible: false,
               });
-            }).catch((err) => {
+            }).catch(err => {
               message.error(err.msg || err.message)
             })
           }

src/pages/activity/drainage/components/Basic.jsx

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Slider, Row, Col, Checkbox, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+import { Form, Slider, Row, Col, Checkbox, Input, Button, InputNumber } from 'antd';
 import router from 'umi/router';
-import moment from 'moment';
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 import ImageUploader from './ImageUpload';
@@ -9,44 +8,61 @@ import Styles from './styles.less';
 import Navigate from '@/components/Navigate';
 import BuildSelect from '../../../../components/SelectButton/BuildSelect2'
 
-const registrationFormOption = [
-    { label: '姓名', value: 'name' },
-    { label: '电话', value: 'tel' },
-    { label: '自定义', value: 'abc' },
-];
-
 function Basic(props) {
 
+    const { id, name } = props
+
     const [registrationInputValue, setRegistrationInputValue] = useState()
 
-    const [viewProperty, setViewProperty] = useState([])
-    const [productionPoster, setProductionPoster] = useState([])
-    const [registrationForm, setRegistrationForm] = useState([])
+    const [viewProperty, setViewProperty] = useState(['index'])
+    const [productionPoster, setProductionPoster] = useState(['index'])
+    // const [registrationForm, setRegistrationForm] = useState([])
     const [inputVisible, setInputVisible] = useState(false)
-    const [registrationFormOption, setregistrationFormOption] = useState([
-        { label: '姓名', value: 'name' },
-        { label: '电话', value: 'tel' },
-        { label: '自定义', value: 'abc' },
-    ])
+    // const [registrationFormOption, setregistrationFormOption] = useState([
+    //     { label: '姓名', value: 'name' },
+    //     { label: '电话', value: 'tel' },
+    //     { label: '自定义', value: 'abc' },
+    // ])
 
-    // const [data, setData] = useState({})V
+    const [data, setData] = useState({})
     useEffect(() => {
-        // getList({ pageNum: 1, pageSize: 10 });
+        getList();
         console.log(props.id, '2341')
     }, [])
     // 查询列表
-    true
-    const getList = params => {
-        // request({ ...apis.relatedOrganization.get, params: { ...params } }).then(data => {
-        //     setData(data)
-        // })
+
+    const getList = () => {
+        request({ ...apis.redPacket.detail, urlData: { id } }).then(data => {
+            console.log(data, '2341')
+            // s.split("==");
+            data.buildingShowPos = data.buildingShowPos.split(',')
+
+            data.buildingSposterShowPoshowPos = (data.posterShowPos).split(',')
+            setViewProperty(data.buildingShowPos)
+            setProductionPoster(data.posterShowPos)
+            console.log(data, '2341')
+            setData(data)
+        })
+    }
+
+    const updateRedPacket = data => {
+        request({ ...apis.redPacket.update, data: { ...data } }).then(data => {
+            // setData(data)
+        })
     }
 
+
     function handleSubmit(e) {
         e.preventDefault();
         props.form.validateFields((err, values) => {
             if (!err) {
                 console.log(values, '------222-------')
+                values.activityId = id
+                // values.name = name
+                values.buildingShowPos = values.buildingShowPos.toString()
+                values.posterShowPos = values.posterShowPos.toString()
+                console.log(values, '------222-------')
+                updateRedPacket(values)
             }
         },
         )
@@ -89,17 +105,6 @@ function Basic(props) {
 
 
         setInputVisible(!inputVisible)
-        // const { inputValue } = this.state;
-        // let { tags } = this.state;
-        // if (inputValue && tags.indexOf(inputValue) === -1) {
-        //   tags = [...tags, inputValue];
-        // }
-        // console.log(tags);
-        // this.setState({
-        //   tags,
-        //   inputVisible: false,
-        //   inputValue: '',
-        // });
     }
 
     const { getFieldDecorator } = props.form
@@ -108,85 +113,125 @@ function Basic(props) {
 
         <>
             <Form labelCol={{ span: 8 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
-                <Form.Item label="文本标签">
-                    {getFieldDecorator('text')(
-                        <span>活动名称</span>,
-                    )}
+                <Form.Item label="活动名称">
+                    <span>{data.name}</span>
                 </Form.Item>
-                <Form.Item label="扫码查看">
-                    {getFieldDecorator('channelId')(
-                        <img src="" alt />,
-                    )}
+                <Form.Item label="扫码查看" >
+                    <img src={data.qrcode || ''} alt="" />
                 </Form.Item>
-                <Form.Item label="首页背景图">
-                    {getFieldDecorator('23423')(
-                        <ImageUploader />,
-                    )}
+                <Form.Item label="首页背景图" help="建议尺寸：750*1206px，格式:jpg；内容区大小：750*1150">
+                    {getFieldDecorator('indexBackgroundImg',
+                        {
+                            initialValue: data.indexBackgroundImg,
+                        })(
+                            <ImageUploader />,
+                        )}
                 </Form.Item>
-                <Form.Item label="分享海报图">
-                    {getFieldDecorator('23423')(
-                        <ImageUploader />,
-                    )}
+                <Form.Item label="分享海报图" help="建议尺寸：750*1206px，格式:jpg；内容区大小：750*1150">
+                    {getFieldDecorator('sharePosterImg',
+                        {
+                            initialValue: data.sharePosterImg,
+                        })(
+                            <ImageUploader />,
+                        )}
                 </Form.Item>
-                <Form.Item label="活动规则图">
-                    {getFieldDecorator('23423')(
-                        <ImageUploader />,
-                    )}
+                <Form.Item label="活动规则图" help="建议尺寸：750*1206px，格式:jpg">
+                    {getFieldDecorator('activityRulesImg',
+                        {
+                            initialValue: data.activityRulesImg,
+                        })(
+                            <ImageUploader />,
+                        )}
                 </Form.Item>
-                <Form.Item label="助力页背景图">
-                    {getFieldDecorator('23423')(
-                        <ImageUploader />,
-                    )}
+                <Form.Item label="助力页背景图" help="建议尺寸：750*1206px，格式:jpg；内容区大小：750*1150">
+                    {getFieldDecorator('helpBackgroundImg',
+                        {
+                            initialValue: data.helpBackgroundImg,
+                        })(
+                            <ImageUploader />,
+                        )}
                 </Form.Item>
-                <Form.Item label="排行榜背景图">
-                    {getFieldDecorator('23423')(
-                        <ImageUploader />,
-                    )}
+                <Form.Item label="排行榜背景图" help="建议尺寸：750*1206px，格式:jpg；内容区大小：750*1150">
+                    {getFieldDecorator('rankingBackgroundImg',
+                        {
+                            initialValue: data.rankingBackgroundImg,
+                        })(
+                            <ImageUploader />,
+                        )}
                 </Form.Item>
                 <Form.Item label="上榜人数限制">
-                    {getFieldDecorator('number')(
-                        <Slider
-                            min={5}
-                            max={100}
-                            value={typeof inputValue === 'number' ? inputValue : 0}
-                            step={1}
-                            // width="100px"
-                            style={{ width: '100px' }}
-                        />,
-                    )}
+                    <Row>
+                        <Col span={6}>
+                            {getFieldDecorator('topLimitPersons',
+                                {
+                                    initialValue: typeof data.topLimitPersons === 'number' ? data.topLimitPersons : 0,
+                                })(
+                                    <Slider
+                                        min={5}
+                                        max={100}
+                                        // value={typeof inputValue === 'number' ? inputValue : 0}
+                                        step={1}
+                                    // width="100px"
+                                    // style={{ width: '100px' }}
+                                    />,
+                                )}
+                        </Col>
+                        <Col span={6}>
+                            {getFieldDecorator('topLimitPersons',
+                                {
+                                    // initialValue: data.topLimitPersons,
+                                })(
+                                    <InputNumber
+                                        min={5}
+                                        max={100}
+                                        style={{ marginLeft: 16 }}
+                                    // value={inputValue}
+                                    // onChange={this.onChange}
+                                    />,
+                                )}
+                        </Col>
+                    </Row>
                 </Form.Item>
                 <Form.Item label="查看楼盘按钮">
-                    {getFieldDecorator('ViewProperty')(
-                        // <Checkbox.Group options={ViewProperty} defaultValue={['Apple']} onChange={onChange} />,style={viewProperty.indexOf('home') == -1 ? {} : { color: '#EF273A' }}
-                        <Checkbox.Group name={Styles.Checkboxs} onChange={onViewPropertyChange} style={{ width: '100%' }}>
-                            <Row>
-                                <Col span={6}>
-                                    <Checkbox className={viewProperty.indexOf('home') === -1 ? {} : Styles.CheckboxStytle} value="home" >首页</Checkbox>
-                                </Col>
-                                <Col span={6}>
-                                    <Checkbox className={viewProperty.indexOf('group') === -1 ? {} : Styles.CheckboxStytle} value="group">助力页</Checkbox>
-                                </Col>
-                                <Col span={6}>
-                                    <Checkbox className={viewProperty.indexOf('rule') === -1 ? {} : Styles.CheckboxStytle} value="rule">活动规则页</Checkbox>
-                                </Col>
-                            </Row>
-                        </Checkbox.Group>,
-                    )}
+                    {getFieldDecorator('buildingShowPos',
+                        {
+                            initialValue: viewProperty,
+                        })(
+                            // <Checkbox.Group options={ViewProperty} defaultValue={['Apple']} onChange={onChange} />,style={viewProperty.indexOf('home') == -1 ? {} : { color: '#EF273A' }}
+                            <Checkbox.Group name={Styles.Checkboxs} onChange={onViewPropertyChange} style={{ width: '100%' }}>
+                                <Row>
+                                    <Col span={6}>
+                                        <Checkbox className={viewProperty.indexOf('index') === -1 ? {} : Styles.CheckboxStytle} value="index" >首页</Checkbox>
+                                    </Col>
+                                    <Col span={6}>
+                                        <Checkbox className={viewProperty.indexOf('help') === -1 ? {} : Styles.CheckboxStytle} value="help">助力页</Checkbox>
+                                    </Col>
+                                    <Col span={6}>
+                                        <Checkbox className={viewProperty.indexOf('rule') === -1 ? {} : Styles.CheckboxStytle} value="rule">活动规则页</Checkbox>
+                                    </Col>
+                                </Row>
+                            </Checkbox.Group>,
+                        )}
                 </Form.Item>
                 <Form.Item label="关联楼盘">
-                    {getFieldDecorator('buildId')(
-                        <BuildSelect />,
-                    )}
+                    {getFieldDecorator('buildingId',
+                        {
+                            initialValue: data.buildingId,
+                        })(
+                            <BuildSelect />,
+                        )}
                 </Form.Item>
                 <Form.Item label="生成海报按钮">
-                    {getFieldDecorator('ProductionPoster')(
+                    {getFieldDecorator('posterShowPos', {
+                        initialValue: productionPoster,
+                    })(
                         <Checkbox.Group name={Styles.Checkboxs} onChange={onProductionPoster} style={{ width: '100%' }}>
                             <Row>
                                 <Col span={6}>
-                                    <Checkbox className={productionPoster.indexOf('home') === -1 ? {} : Styles.CheckboxStytle} value="home" >首页</Checkbox>
+                                    <Checkbox className={productionPoster.indexOf('index') === -1 ? {} : Styles.CheckboxStytle} value="index" >首页</Checkbox>
                                 </Col>
                                 <Col span={6}>
-                                    <Checkbox className={productionPoster.indexOf('group') === -1 ? {} : Styles.CheckboxStytle} value="group">助力页</Checkbox>
+                                    <Checkbox className={productionPoster.indexOf('help') === -1 ? {} : Styles.CheckboxStytle} value="help">助力页</Checkbox>
                                 </Col>
                                 <Col span={6}>
                                     <Checkbox className={productionPoster.indexOf('rule') === -1 ? {} : Styles.CheckboxStytle} value="rule">活动规则页</Checkbox>
@@ -195,13 +240,13 @@ function Basic(props) {
                         </Checkbox.Group>,
                     )}
                 </Form.Item>
-                <Form.Item label="报名表单">
+                {/* <Form.Item label="报名表单">
                     {getFieldDecorator('registrationForm')(
                         <Checkbox.Group name={Styles.Checkboxs} onChange={onRegistrationForm} style={{ width: '100%' }}>
                             <Row>
                                 {registrationFormOption.map((x, index) => {
                                     return <Col span={6}>
-                                        {index !== 2 && (<Checkbox className={viewProperty.indexOf(x.value) === -1 ? {} : Styles.CheckboxStytle} value={x.value} >{x.label} </Checkbox>)}
+                                        {index !== 2 && (<Checkbox className={registrationForm.indexOf(x.value) === -1 ? {} : Styles.CheckboxStytle} value={x.value} >{x.label} </Checkbox>)}
 
                                         {inputVisible && index === 2 && (
                                             <Input
@@ -216,31 +261,20 @@ function Basic(props) {
                                             />
                                         )}
                                         {!inputVisible && index === 2 && (
-                                            <Checkbox className={viewProperty.indexOf(x.value) === -1 ? {} : Styles.CheckboxStytle} value={x.value} >{x.label} </Checkbox>
+                                            <Checkbox className={registrationForm.indexOf(x.value) === -1 ? {} : Styles.CheckboxStytle} value={x.value} >{x.label} </Checkbox>
                                         )}
                                         {!inputVisible && index === 2 && x.label === '自定义' && (
-                                            <Navigate onClick={showInput}  >
+                                            <Navigate onClick={showInput} >
                                                 修改
                                             </Navigate>
                                         )}
                                     </Col>
                                 })}
                             </Row>
-                            {/* registrationForm */}
-                            {/* <Row>
-                                <Col span={6}>
-                                    <Checkbox className={viewProperty.indexOf('home') === -1 ? {} : Styles.CheckboxStytle} value="home" >姓名</Checkbox>
-                                </Col>
-                                <Col span={6}>
-                                    <Checkbox className={viewProperty.indexOf('group') === -1 ? {} : Styles.CheckboxStytle} value="group">电话</Checkbox>
-                                </Col>
-                                <Col span={6}>
-                                    <Checkbox className={viewProperty.indexOf('rule') === -1 ? {} : Styles.CheckboxStytle} value="rule">活动规则页</Checkbox>
-                                </Col>
-                            </Row> */}
+                          
                         </Checkbox.Group>,
                     )}
-                </Form.Item>
+                </Form.Item> */}
                 <Form.Item wrapperCol={{ span: 15, offset: 8 }}>
                     <div style={{ width: '190px' }}>
                         <Button type="primary" style={{ marginRight: '20px' }} htmlType="submit">保存</Button>

src/pages/activity/drainage/components/CustomerData.jsx

@@ -7,18 +7,27 @@ import request from '../../../../utils/request';
 
 function CustomerData(props) {
 
+    const { id } = props
     // const [taNoticeList, setTaNoticeList] = useState([])
-    const [data, setData] = useState([])
+    const [data, setData] = useState({})
 
     useEffect(() => {
-        // getList({ pageNum: 1, pageSize: 10 });
+        getList({ pageNum: 1, pageSize: 10 });
     }, [])
     // 查询列表
 
     const getList = params => {
-        // request({ ...apis.relatedOrganization.get, params: { ...params } }).then(data => {
-        //     setData(data)
-        // })
+        request({ ...apis.redPacket.getRecordByConditionList, params: { ...params, activityId: id } }).then(data => {
+            setData(data)
+        })
+    }
+
+    const changePageNum = pageNumber => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ pageNum: pageNumber, pageSize: 10, ...values })
+            }
+        });
     }
 
     function handleSubmit(e) {
@@ -27,7 +36,7 @@ function CustomerData(props) {
             if (!err) {
                 // eslint-disable-next-line no-console
                 console.log('提交数据: ', values)
-
+                getList({ pageNum: 1, pageSize: 10 }, ...values)
             }
         });
     }
@@ -35,56 +44,77 @@ function CustomerData(props) {
     function handleReset() {
         props.form.resetFields();
 
-        // getList({ pageNum: 1, pageSize: 10 })
+        getList({ pageNum: 1, pageSize: 10 })
     }
 
     const columns = [
         {
             title: '头像',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'avatarurl',
+            key: 'avatarurl',
             align: 'center',
-            render: (x, row) => <img src={row.qrCodeUrl} alt="" width="100px"></img >,
+            render: (x, row) => <img src={row.avatarurl} alt="" width="100px"></img >,
         },
         {
             title: '昵称',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'nickName',
+            key: 'nickName',
             align: 'center',
         },
         {
             title: '姓名',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'name',
+            key: 'name',
             align: 'center',
         },
         {
             title: '手机号',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'phone',
+            key: 'phone',
             align: 'center',
         },
         {
-            title: '发放时间',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            title: '访问时间',
+            dataIndex: 'createDate',
+            key: 'createDate',
             align: 'center',
             render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
         },
         {
             title: '分享人昵称',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'sharePersonNickName',
+            key: 'sharePersonNickName',
             align: 'center',
         },
         {
             title: '分享人手机号',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'sharePersonPhone',
+            key: 'sharePersonPhone',
             align: 'center',
         },
     ]
 
+    function download(data) {
+        if (!data) {
+            console.log('234')
+            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()
+    }
+
+    const exportReport = () => {
+
+        request({ ...apis.redPacket.exportVisitRecordByCondition, responseType: 'blob', params: { ...props.form.getFieldsValue(), activityId: id } }).then(data => {
+            download(data)
+        }).catch()
+    }
+
     const { getFieldDecorator } = props.form
 
     return (
@@ -92,7 +122,7 @@ function CustomerData(props) {
         <>
             <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
                 <Form.Item>
-                    {getFieldDecorator('tel')(
+                    {getFieldDecorator('phone')(
                         <Input
                             placeholder="手机号"
                         />,
@@ -109,7 +139,7 @@ function CustomerData(props) {
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('tel')(
+                    {getFieldDecorator('sharePersonPhone')(
                         <Input
                             placeholder="分享人手机号"
                         />,
@@ -121,15 +151,15 @@ function CustomerData(props) {
                 </Form.Item>
             </Form>
             <div style={{ marginTop: '20px' }}>
-                <span style={{ lineHeight: '32px' }}>共筛选出XX条数据</span>
-                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+                <span style={{ lineHeight: '32px' }}>共筛选出{data.total}条数据</span>
+                <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
             </div>
-            <Table dataSource={data} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
+            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-                {/* <Pagination
+                <Pagination
                     showQuickJumper
                     defaultCurrent={1}
-                    total={data.total} onChange={e => changePageNum(e)} current={data.current} /> */}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
             </div>
         </>
 

src/pages/activity/drainage/components/Group.jsx → src/pages/activity/drainage/components/Help.jsx

@@ -7,20 +7,34 @@ import request from '../../../../utils/request';
 
 const { RangePicker } = DatePicker;
 
-function Group(props) {
+function Help(props) {
+
+    const { id, name } = props
 
     // const [taNoticeList, setTaNoticeList] = useState([])
-    // const [data, setData] = useState({})
+    const [data, setData] = useState({})
 
     useEffect(() => {
-        // getList({ pageNum: 1, pageSize: 10 });
+        getHelpDetail();
     }, [])
     // 查询列表
 
-    const getList = params => {
-        // request({ ...apis.relatedOrganization.get, params: { ...params } }).then(data => {
-        //     setData(data)
-        // })
+    const getHelpDetail = () => {
+        request({ ...apis.redPacket.helpDetail, urlData: { id } }).then(data => {
+            data.date = [moment(data.startDate), moment(data.endDate)]
+            setData(data)
+        })
+    }
+
+    const updateRedPacket = values => {
+
+        const [startDate, endDate] = values.date
+        values.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00.000')}Z`
+        values.endDate = `${moment(endDate).format('YYYY-MM-DDT00:00:00.000')}Z`
+        values.activityId = id
+        request({ ...apis.redPacket.updateHelp, urlData: { id }, data: { ...values } }).then(data => {
+
+        })
     }
 
     function handleSubmit(e) {
@@ -28,6 +42,11 @@ function Group(props) {
         props.form.validateFields((err, values) => {
             if (!err) {
                 console.log(values, '------222-------')
+
+                // date
+
+                // values.
+                updateRedPacket(values)
             }
         },
         )
@@ -40,79 +59,79 @@ function Group(props) {
         <>
             <Form labelCol={{ span: 8 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
                 <Form.Item label="助力成功需要人数">
-                    {getFieldDecorator('groupsuccess', {
-                        initialValue: '3',
+                    {getFieldDecorator('helpSuccesPersons', {
+                        initialValue: data.helpSuccesPersons || 3,
                     },
                     )(
                         <InputNumber min={1} max={1000} />,
                     )}
                 </Form.Item>
                 <Form.Item label="单人每人助力次数限制">
-                    {getFieldDecorator('number', {
-                        initialValue: '3',
+                    {getFieldDecorator('limitNumPerDay', {
+                        initialValue: data.limitNumPerDay || 3,
                     })(
                         <InputNumber min={1} max={1000} />,
                     )}
                 </Form.Item>
                 <Form.Item label="超出时提示文案">
-                    {getFieldDecorator('text', {
-
+                    {getFieldDecorator('limitPerDayIllegalTip', {
+                        initialValue: data.limitPerDayIllegalTip || '每人每天最多只能助力3次',
                     })(
                         <Input placeholder="每人每天最多只能助力3次" />,
                     )}
                 </Form.Item>
                 <Form.Item label="单人总助力次数限制">
-                    {getFieldDecorator('one', {
-                        initialValue: '3',
+                    {getFieldDecorator('limitNumPerPerson', {
+                        initialValue: data.limitNumPerPerson || 3,
                     })(
                         <InputNumber min={1} max={1000} />,
                     )}
                 </Form.Item>
                 <Form.Item label="超出时提示文案">
-                    {getFieldDecorator('text', {
-
+                    {getFieldDecorator('limitPerPersonIllegalTip', {
+                        initialValue: data.limitPerPersonIllegalTip || '每人最多只能为他人助力3次',
                     })(
                         <Input placeholder="每人最多只能为他人助力3次" />,
                     )}
                 </Form.Item>
                 <Form.Item label="为同一人助力次数限制">
-                    {getFieldDecorator('one', {
-                        initialValue: '3',
+                    {getFieldDecorator('limitNumForEachPerson', {
+                        initialValue: data.limitNumForEachPerson || 3,
                     })(
                         <InputNumber min={1} max={1000} />,
                     )}
                 </Form.Item>
                 <Form.Item label="超出时提示文案">
-                    {getFieldDecorator('text', {
-
+                    {getFieldDecorator('limitForEachPersonIllegalTip', {
+                        initialValue: data.limitForEachPersonIllegalTip || '只能为同一人助力1次',
                     })(
                         <Input placeholder="只能为同一人助力1次" />,
                     )}
                 </Form.Item>
                 <Form.Item label="助力成功时提示文案">
-                    {getFieldDecorator('text', {
-
+                    {getFieldDecorator('successTip', {
+                        initialValue: data.successTip || '助力成功！快去告诉你的好友吧',
                     })(
                         <Input placeholder="助力成功！快去告诉你的好友吧" />,
                     )}
                 </Form.Item>
                 <Form.Item label="其他无法助力时提示文案">
-                    {getFieldDecorator('text', {
-
+                    {getFieldDecorator('warnningTip', {
+                        initialValue: data.warnningTip || '无法助力！具体原因请看活动规则',
                     })(
                         <Input placeholder="无法助力！具体原因请看活动规则" />,
                     )}
                 </Form.Item>
                 <Form.Item label="活动开始～结束时间">
-                    {getFieldDecorator('text', {
-
+                    {getFieldDecorator('date', {
+                        initialValue: data.date,
                     })(
                         <RangePicker />,
                     )}
                 </Form.Item>
                 <Form.Item label="超出时提示文案">
-                    {getFieldDecorator('text', {
-
+                    {getFieldDecorator('activityEndTip', {
+                        initialValue: data.activityEndTip,
                     })(
                         <Input placeholder="活动已经结束啦" />,
                     )}
@@ -130,6 +149,6 @@ function Group(props) {
     )
 }
 
-const WrappedGroup = Form.create({ name: 'Group' })(Group);
+const WrappedHelp = Form.create({ name: 'Help' })(Help);
 
-export default WrappedGroup
+export default WrappedHelp

src/pages/activity/drainage/components/ImageUpload.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import { Upload, Icon, message } from 'antd';
-import './style.less';
+// import './style.less';
 import { uploaderProps } from '../../../../utils/upload';
-
+import './style.less';
 
 
 class ImageUpload extends React.Component {
@@ -12,7 +12,7 @@ class ImageUpload extends React.Component {
     };
 
     handleChange = info => {
-        if (info.file.status === "uploading") {
+        if (info.file.status === 'uploading') {
             this.setState({ loading: true });
             return;
         }
@@ -54,42 +54,49 @@ class ImageUpload extends React.Component {
     render() {
         const uploadButton = (
             <div>
-                <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"} />
+                <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? 'loading' : 'plus'} />
             </div>
         );
-
+        // width: 150px;
+        // height: 241px;
         const value = this.props.value;
         return (
             <>
-                {!(this.state.imageUrl || value) && <Upload
+                {!(this.state.imageUrl || value) && <div style={{ width: '150px', height: '241px', marginTop: '10px' }}> <Upload
                     listType="picture-card"
-                    className="avatar-uploader"
+                    className="avatar-uploader avatar-newupdate"
                     showUploadList={false}
                     beforeUpload={this.props.beforeUpload}
                     onChange={this.handleChange}
                     {...uploaderProps}
                     disabled={this.props.disabled}
                     onSuccess={this.handleUploadSucess}
+
                 >
                     {uploadButton}
                 </Upload>
+                </div>
                 }
-                {(this.state.imageUrl || value) && <Upload
-                    listType="picture-card"
-                    className="avatar-uploader"
-                    showUploadList={false}
-                    beforeUpload={this.props.beforeUpload}
-                    onChange={this.handleChange}
-                    {...uploaderProps}
-                    disabled={this.props.disabled}
-                    onSuccess={this.handleUploadSucess}
-                >
-                    <img src={this.state.imageUrl || value} alt="avatar" style={{ width: '100%' }} />
+                {(this.state.imageUrl || value) && <div className="uploadbox">
+                    <img className="img" src={this.state.imageUrl || value} alt="avatar" style={{ width: '100%' }} ></img>
+
+                    <Upload
+                        listType="picture-card"
+                        // className={}
+                        className="avatar-uploader avatar-update"
+                        showUploadList={false}
+                        beforeUpload={this.props.beforeUpload}
+                        onChange={this.handleChange}
+                        {...uploaderProps}
+                        disabled={this.props.disabled}
+                        onSuccess={this.handleUploadSucess}
+                    >
+                        更换
                 </Upload>
-                }
+                </div>}
+
             </>
         );
-
     }
 }
 

src/pages/activity/drainage/components/Ranking.jsx

@@ -7,18 +7,19 @@ import request from '../../../../utils/request';
 
 function Ranking(props) {
 
+    const { id } = props
     // const [taNoticeList, setTaNoticeList] = useState([])
-    const [data, setData] = useState([])
+    const [data, setData] = useState({})
 
     useEffect(() => {
-        // getList({ pageNum: 1, pageSize: 10 });
+        getList({ pageNum: 1, pageSize: 10 });
     }, [])
     // 查询列表
 
     const getList = params => {
-        // request({ ...apis.relatedOrganization.get, params: { ...params } }).then(data => {
-        //     setData(data)
-        // })
+        request({ ...apis.redPacket.getRedPacketRankingList, params: { ...params, activityId: id } }).then(data => {
+            setData(data)
+        })
     }
 
     function handleSubmit(e) {
@@ -27,7 +28,14 @@ function Ranking(props) {
             if (!err) {
                 // eslint-disable-next-line no-console
                 console.log('提交数据: ', values)
+            }
+        });
+    }
 
+    const changePageNum = pageNumber => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ pageNum: pageNumber, pageSize: 10, ...values })
             }
         });
     }
@@ -35,37 +43,37 @@ function Ranking(props) {
     function handleReset() {
         props.form.resetFields();
 
-        // getList({ pageNum: 1, pageSize: 10 })
+        getList({ pageNum: 1, pageSize: 10 })
     }
 
     const columns = [
         {
             title: '头像',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'avatarurl',
+            key: 'avatarurl',
             align: 'center',
             render: (x, row) => <img src={row.qrCodeUrl} alt="" width="100px"></img >,
         },
         {
             title: '昵称',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'nickname',
+            key: 'nickname',
             align: 'center',
         },
         {
             title: '姓名',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'name',
+            key: 'name',
             align: 'center',
         },
         {
             title: '手机号',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'phone',
+            key: 'phone',
             align: 'center',
         },
         {
-            title: '发放时间',
+            title: '发起时间',
             dataIndex: 'targetName',
             key: 'targetName',
             align: 'center',
@@ -79,6 +87,26 @@ function Ranking(props) {
         },
     ]
 
+    function download(data) {
+        // if (!data) {
+        //     console.log('234')
+        //     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()
+    }
+
+    const exportReport = () => {
+
+        request({ ...apis.redPacket.exportRedPacketRankingList, responseType: 'blob', params: { ...props.form.getFieldsValue(), activityId: id } }).then(data => {
+            download(data)
+        }).catch()
+    }
     const { getFieldDecorator } = props.form
 
     return (
@@ -86,7 +114,7 @@ function Ranking(props) {
         <>
             <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
                 <Form.Item>
-                    {getFieldDecorator('tel')(
+                    {getFieldDecorator('phone')(
                         <Input
                             placeholder="手机号"
                         />,
@@ -98,15 +126,15 @@ function Ranking(props) {
                 </Form.Item>
             </Form>
             <div style={{ marginTop: '20px' }}>
-                <span style={{ lineHeight: '32px' }}>共筛选出XX条数据</span>
-                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+                <span style={{ lineHeight: '32px' }}>共筛选出{data.total}条数据</span>
+                <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
             </div>
-            <Table dataSource={data} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
+            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-                {/* <Pagination
+                <Pagination
                     showQuickJumper
                     defaultCurrent={1}
-                    total={data.total} onChange={e => changePageNum(e)} current={data.current} /> */}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
             </div>
         </>
 

src/pages/activity/drainage/components/RedPacket.jsx

@@ -7,20 +7,31 @@ import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 import Styles from './styles.less';
 
+
 function RedPacket(props) {
 
+    const { id, name } = props
     // const [taNoticeList, setTaNoticeList] = useState([])
-    // const [data, setData] = useState({})
+    const [data, setData] = useState({})
 
     useEffect(() => {
+        getMoneyDetail()
         // getList({ pageNum: 1, pageSize: 10 });
     }, [])
     // 查询列表
+    //     moneyDetail
+    // updateMoney
+
+    const getMoneyDetail = () => {
+        request({ ...apis.redPacket.moneyDetail, urlData: { id } }).then(data => {
+            setData(data)
+        })
+    }
 
-    const getList = params => {
-        // request({ ...apis.relatedOrganization.get, params: { ...params } }).then(data => {
-        //     setData(data)
-        // })
+    const updateRedPacket = data => {
+        request({ ...apis.redPacket.updateMoney, urlData: { id }, data: { ...data } }).then(data => {
+            // setData(data)
+        })
     }
 
     function handleSubmit(e) {
@@ -28,31 +39,41 @@ function RedPacket(props) {
         props.form.validateFields((err, values) => {
             if (!err) {
                 console.log(values, '------222-------')
+                updateRedPacket(values)
             }
         },
         )
     }
 
+    const toRecharge = () => {
+
+        router.push({
+            pathname: '/funds/accountfunds',
+        })
+    }
+
 
     const { getFieldDecorator } = props.form
+    const { taRedPacketClient } = data
 
     return (
 
         <>
             <Row style={{ marginBottom: '40px' }}>
-                <Col span={8} >
+                <Col span={8} style={{ paddingRight: '30px' }}>
                     <div className={Styles.redHeader}>
-                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>账户余额/元</span><span className={Styles.redHeaderTopNum}>1000</span></div>
-                        <div className={Styles.redHeaderBottom}> <Navigate>去充值</Navigate></div>
+                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>账户余额/元</span><span className={Styles.redHeaderTopNum}>{data.balance}</span></div>
+                        <div className={Styles.redHeaderBottom}> <Navigate onClick={() => toRecharge()}>去充值</Navigate></div>
                     </div>
                 </Col>
-                <Col span={8} style={{ padding: '0 40px' }}>
+                <Col span={8} style={{ padding: '0 10px' }}>
                     <div className={Styles.redHeader}>
-                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包总数量/个</span><span className={Styles.redHeaderTopNum}>1000</span></div>
+                        {/* packetSendedNum */}
+                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包总数量/个</span><span className={Styles.redHeaderTopNum}>{}</span></div>
                         <div className={Styles.redHeaderBottom}><Navigate onClick={() => props.toDetail()}>查看详情</Navigate></div>
                     </div>
                 </Col>
-                <Col span={8} >
+                <Col span={8} style={{ paddingLeft: '30px' }}>
                     <div className={Styles.redHeader}>
                         <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包金额/元</span><span className={Styles.redHeaderTopNum}>1000</span></div>
                         <div className={Styles.redHeaderBottom}><Navigate onClick={() => props.toDetail(1)}>查看详情</Navigate></div>
@@ -61,7 +82,8 @@ function RedPacket(props) {
             </Row>
             <Form labelCol={{ span: 8 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
                 <Form.Item label="本次红包预算/元">
-                    {getFieldDecorator('groupsuccess', {
+                    {getFieldDecorator('budget', {
+                        initialValue: data.budget,
                         // rules: [
                         //     {
                         //         type: 'number', message: '123'
@@ -73,55 +95,62 @@ function RedPacket(props) {
                     )}
                 </Form.Item>
                 <Form.Item label="单个红包金额范围/元">
-                    {getFieldDecorator('minNumber', {
-                        initialValue: '3',
+                    {getFieldDecorator('minPacket', {
+                        initialValue: data.minPacket || 3,
                     })(
                         <InputNumber min={1} max={1000} />,
                     )}~
-                     {getFieldDecorator('maxNumber', {
-                        initialValue: '3',
+                     {getFieldDecorator('maxPacket', {
+                        initialValue: data.maxPacket || 3,
                     })(
                         <InputNumber min={1} max={1000} />,
                     )}
                 </Form.Item>
                 <Form.Item label="发放红包个数上限">
-                    {getFieldDecorator('text', {
-
+                    {getFieldDecorator('limitPacketNum', {
+                        initialValue: data.limitPacketNum,
                     })(
                         <Input type="number" />,
                     )}
                 </Form.Item>
                 <Form.Item label="余额或预算不足时提示文案">
-                    {getFieldDecorator('one', {
-
+                    {getFieldDecorator('insufficientBalanceTip', {
+                        initialValue: data.insufficientBalanceTip || '红包已发送完毕，谢谢您的参与',
                     })(
                         <Input placeholder="红包已发送完毕，谢谢您的参与" />,
                     )}
                 </Form.Item>
-                <Form.Item label="商品名称">
-                    {getFieldDecorator('text', {
-
+                {/* font-size:22px;
+font-family:PingFangSC-Medium,PingFang SC;
+font-weight:500;
+color:rgba(102,102,102,1); */}
+                <Row>
+                    <Col span={8} style={{ textAlign: 'end', fontSize: '0.13rem', fontWeight: '500', color: 'rgba(102,102,102,1)', padding: '0 0.076rem' }}>配置消息</Col>
+                </Row>
+                <Form.Item label="商品名称" >
+                    {getFieldDecorator('mchName', {
+                        // initialValue: taRedPacketClient.mchName,
                     })(
                         <Input placeholder="{小程序名}" />,
                     )}
                 </Form.Item>
                 <Form.Item label="红包祝福语">
-                    {getFieldDecorator('one', {
-
+                    {getFieldDecorator('blessing', {
+                        // initialValue: taRedPacketClient.blessing,
                     })(
                         <Input placeholder="祝您中个大红包！" />,
                     )}
                 </Form.Item>
                 <Form.Item label="活动名称">
-                    {getFieldDecorator('text', {
-
+                    {getFieldDecorator('activityName', {
+                        // initialValue: taRedPacketClient.activityName,
                     })(
                         <Input placeholder="{活动标题}" />,
                     )}
                 </Form.Item>
                 <Form.Item label="备注">
-                    {getFieldDecorator('text', {
-
+                    {getFieldDecorator('remark', {
+                        // initialValue: taRedPacketClient.remark,
                     })(
                         <Input placeholder="点我拆红包" />,
                     )}

src/pages/activity/drainage/components/RedPacketRecord.jsx

@@ -8,17 +8,19 @@ import request from '../../../../utils/request';
 function RedPacketRecord(props) {
 
     // const [taNoticeList, setTaNoticeList] = useState([])
-    const [data, setData] = useState([])
+
+    const { id, name } = props
+    const [data, setData] = useState({})
 
     useEffect(() => {
-        // getList({ pageNum: 1, pageSize: 10 });
+        getList({ pageNum: 1, pageSize: 10 });
     }, [])
     // 查询列表
 
     const getList = params => {
-        // request({ ...apis.relatedOrganization.get, params: { ...params } }).then(data => {
-        //     setData(data)
-        // })
+        request({ ...apis.redPacket.listSendRecord, params: { ...params, activityId: id } }).then(data => {
+            setData(data)
+        })
     }
 
     function handleSubmit(e) {
@@ -35,33 +37,41 @@ function RedPacketRecord(props) {
     function handleReset() {
         props.form.resetFields();
 
-        // getList({ pageNum: 1, pageSize: 10 })
+        getList({ pageNum: 1, pageSize: 10 })
     }
 
+    const changePageNum = pageNumber => {
+        props.form.validateFields((err, values) => {
+          if (!err) {
+            getList({ pageNum: pageNumber, pageSize: 10, ...values })
+          }
+        });
+      }
+
     const columns = [
         {
             title: '微信订单号',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'wxOrderId',
+            key: 'wxOrderId',
             align: 'center',
         },
         {
             title: '用户昵称',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'nickname',
+            key: 'nickname',
             align: 'center',
         },
         {
             title: '头像',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'avatarurl',
+            key: 'avatarurl',
             align: 'center',
             render: (x, row) => <img src={row.qrCodeUrl} alt="" width="100px"></img >,
         },
         {
             title: '手机号',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'phone',
+            key: 'phone',
             align: 'center',
         },
         {
@@ -73,14 +83,14 @@ function RedPacketRecord(props) {
         },
         {
             title: '金额（元）',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'packetAmount',
+            key: 'packetAmount',
             align: 'center',
         },
         {
             title: '发送状态',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'packetStatus',
+            key: 'packetStatus',
             align: 'center',
         },
     ]
@@ -92,21 +102,21 @@ function RedPacketRecord(props) {
         <>
             <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
                 <Form.Item>
-                    {getFieldDecorator('code')(
+                    {getFieldDecorator('wxOrderId')(
                         <Input
                             placeholder="订单号"
                         />,
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('tel')(
+                    {getFieldDecorator('phone')(
                         <Input
                             placeholder="手机号"
                         />,
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('code')(
+                    {getFieldDecorator('packetStatus')(
                         <Select style={{ width: '180px' }} placeholder="发送状态">
                             <option value="">全部</option>
                             <option value="1">成功</option>
@@ -120,12 +130,12 @@ function RedPacketRecord(props) {
                 </Form.Item>
             </Form>
 
-            <Table dataSource={data} columns={columns} pagination={false} rowKey={r => r.qrCodeId} style={{ marginTop: '20px' }} />
+            <Table dataSource={data.records} columns={columns} pagination={false} rowKey={r => r.qrCodeId} style={{ marginTop: '20px' }} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-                {/* <Pagination
+                <Pagination
                     showQuickJumper
                     defaultCurrent={1}
-                    total={data.total} onChange={e => changePageNum(e)} current={data.current} /> */}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
             </div>
         </>
 

src/pages/activity/drainage/components/style.less

@@ -1,13 +1,71 @@
 :global {
-  .avatar-uploader {
+  .avatar-newupdate{
+    width: 100%;
+    height: 100%;
     & > .ant-upload {
-      // width: 128px;
-      // height: 128px;
+      width: 100%;
+        height: 100%;
     }
+    
   }
+  
+  // > .ant-upload{
+  //   width: 100%;
+  //   height: 100%;
+  // }
+  .avatar-update {
+    & > .ant-upload {
+      width:36px;
+      height:25px;
+      border: none;
+      font-size:18px;
+      // font-family:PingFangSC-Medium,PingFang SC;
+      font-weight:500;
+      color:rgba(255,255,255,1);
+      line-height:25px;
+      padding: 0;
+      margin: 0;
+      border: none;
+      background: none;
+      // position: absolute;
+     .ant-upload{
+        padding: 0;
+        color:#fff;
+        // position: relative;
+      }
+    }
+  }
+ .uploadbox {
+   margin-top: 10px;
+  position: relative;
+  width: 150px;
+  height: 241px;
+ 
+  .img{
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    border-radius:7px;
+    border:1px solid rgba(156,156,156,1);
+  }
+  .avatar-update{
+    width: 36px;
+    position: absolute;
+    bottom: 0;
+    left: 50%;
+    transform: translate(-50%, 0);
+    // margin: 0 auto;
+  }
+}
+}
+
+.avatar-uploader{
+  width: 100%;
+  height: 100%;
 }
 
 
+
 /* you can make up upload button and sample style by using stylesheets */
 .ant-upload-select-picture-card i {
   font-size: 32px;
@@ -26,3 +84,30 @@
 .Checkboxs {
   background-color: #EF273A !important;
 }
+
+.img {
+  position: absolute;
+}
+
+.avatar-update > .ant-upload {
+  width:36px;
+height:25px;
+border: none;
+font-size:18px;
+// font-family:PingFangSC-Medium,PingFang SC;
+font-weight:500;
+color:rgba(255,255,255,1);
+line-height:25px;
+padding: 0;
+}
+
+.avatar-update{
+  
+  width:36px;
+height:25px !important;
+// font-size:18px;
+// font-family:PingFangSC-Medium,PingFang SC;
+// font-weight:500;
+// color:rgba(255,255,255,1);
+// line-height:25px;
+}

src/pages/activity/drainage/detailDrainage.jsx

@@ -26,7 +26,8 @@ const BasicForm = props => {
     router.push({
       pathname: '/activity/drainage/h5edit',
       query: {
-        id: drainageId,
+        id: data.activityId,
+        name: data.name,
       },
     });
   }
@@ -58,12 +59,12 @@ const BasicForm = props => {
             <span>{data.h5Address}</span>
           </Form.Item>
         )}
-        {data.isMiniapp && (
+        {data.activityId && (
           <Form.Item label="扫码查看">
-            <img src="" alt></img>
+            <img src={data.qrCode} alt="" width="200"></img>
           </Form.Item>
         )}
-        {data.isMiniapp && (
+        {data.activityId && (
           <Form.Item label="配置H5">
             <Navigate onClick={toDrainageDetail}>修改配置</Navigate>
           </Form.Item>

src/pages/activity/drainage/h5edit.jsx

@@ -1,11 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Radio, Menu, Dropdown, Button, Icon, Modal, message, Table, Divider, Tabs, Tag, Select, Pagination } from 'antd';
+import { Radio } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import Basic from './components/Basic';
-import Group from './components/Group';
+import Help from './components/Help';
 import RedPacket from './components/RedPacket';
 import RedPacketRecord from './components/RedPacketRecord';
 import CustomerData from './components/CustomerData';
@@ -17,7 +17,7 @@ const H5configuration = props => {
     const [tab, setTab] = useState('5')
     const [data, setData] = useState({})
 
-    const id = props.location.query.id
+    const { id, name } = props.location.query
     // const type = props.activeType
 
 
@@ -67,17 +67,17 @@ const H5configuration = props => {
             </Tabs> */}
             <div style={{ marginTop: '20px' }}>
                 {/* 基础配置 */}
-                {(tab === '1' && <Basic id={id} />)}
+                {(tab === '1' && <Basic id={id} name={name} />)}
                 {/* 助力配置 */}
-                {(tab === '2' && <Group />)}
+                {(tab === '2' && <Help id={id} name={name} />)}
                 {/* 红包配置 */}
-                {(tab === '3' && <RedPacket toDetail={ onDetai} />)}
+                {(tab === '3' && <RedPacket toDetail={onDetai} id={id} name={name} />)}
                 {/* 红包记录 */}
-                {(tab === '4' && <RedPacketRecord />)}
+                {(tab === '4' && <RedPacketRecord id={id} />)}
                 {/* 客户数据 */}
-                {(tab === '5' && <CustomerData />)}
+                {(tab === '5' && <CustomerData id={id} />)}
                 {/* 排行榜 */}
-                {(tab === '6' && <Ranking />)}
+                {(tab === '6' && <Ranking id={id} />)}
             </div>
         </div>
     </>

src/pages/funds/accountfunds/components/Basic.jsx

@@ -0,0 +1,174 @@
+import React, { useState, useEffect } from 'react';
+import { Button, Modal, Input, Row, Col, message } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import Navigate from '@/components/Navigate';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import Styles from './styles.less';
+import Recharge from './Recharge'
+import Refund from './Refund'
+import Pay from './Pay'
+import Contact from './Contact'
+
+function Basic(props) {
+
+    // const [taNoticeList, setTaNoticeList] = useState([])
+    const [data, setData] = useState({})
+    const [visible, setvisiblea] = useState(false)
+    const [confirmLoading, setConfirmLoading] = useState(false)
+    const [title, setTitle] = useState()
+    const [amount, setAmount] = useState()
+    useEffect(() => {
+        getData();
+    }, [])
+    // 查询列表
+
+    const getData = params => {
+        request({ ...apis.funds.get, params: { ...params } }).then(data => {
+            setData(data)
+        })
+    }
+
+    const handleOkRecharge = e => {
+        console.log(e, '123123')
+        if (e) {
+
+            request({ ...apis.funds.saveOrder, data: { amount: e } }).then(data => {
+                setAmount(data)
+                showModal('pay')
+            }).catch(err => {
+                console.log(err)
+            })
+
+        }
+
+
+    };
+    // data: { amount: e }
+    const handleOkRefund = e => {
+        console.log(e, '123123')
+
+        if (e) {
+            request({ ...apis.funds.saveRefundOrder, data: { amount: e } }).then(data => {
+                message.info('申请退款成功')
+                setvisiblea(false)
+            }).catch(err => {
+                console.log(err)
+                message.err('申请退款失败')
+            })
+        }
+        // setConfirmLoading(true)
+        // setTimeout(() => {
+        //   this.setState({
+        //     visible: false,
+        //     confirmLoading: false,
+        //   });
+        // }, 2000);
+        // setvisiblea(false)
+    };
+
+    const handleOkRepay = e => {
+        console.log(e, '123123')
+        if (e === 'success') {
+            showModal('contact')
+        } else {
+            showModal()
+        }
+        // setConfirmLoading(true)
+        // setTimeout(() => {
+        //   this.setState({
+        //     visible: false,
+        //     confirmLoading: false,
+        //   });
+        // }, 2000);
+
+    };
+
+    const toNewContact = () => {
+
+        router.push({
+            pathname: '/funds/financialContact',
+            // query: {
+            //   id: rowData.raiseId,
+            //   buildingId: rowData.buildingId,
+            //   salesBatchId: rowData.salesBatchId,
+        })
+        
+    }
+
+
+    const showModal = value => {
+        if (value === 'recharge') {
+            setTitle('线上充值')
+        }
+        if (value === 'refund') {
+            setTitle('申请退款')
+        }
+        if (value === 'pay') {
+            setTitle('扫码支付')
+        }
+        if (value === 'contact') {
+            setTitle('联系我们')
+        }
+        setvisiblea(true)
+    };
+
+    const handleCancel = () => {
+        console.log('Clicked cancel button');
+        setvisiblea(false)
+    };
+
+    return (
+
+        <>
+            对资金有疑问？ <Navigate onClick={() => toNewContact()}>请联系我们</Navigate>
+            <div style={{ display: 'flex', margin: '20px 0 40px' }}>
+                <div className={Styles.redHeader}>
+                    <div className={Styles.redHeaderTop}><div className={Styles.redHeaderTopText}>总充值金额/元</div><div className={Styles.redHeaderTopNum}>{data.totalRechargeAmount / 100 || 0}</div></div>
+                    <div className={Styles.redHeaderBottom}> 对账请在充值订单中查看充值状态为“已支付”的充值记录</div>
+                </div>
+                <div className={Styles.redHeader} style={{ margin: '0 40px' }}>
+                    <div className={Styles.redHeaderTop}><div className={Styles.redHeaderTopText}>已消费金额/元</div><div className={Styles.redHeaderTopNum}>{data.purchaseAmount / 100 || 0}</div></div>
+                    <div className={Styles.redHeaderBottom}>对账请在消费订单中查看消费状态为“成功”的消费记录</div>
+                </div>
+                <div className={Styles.redHeader}>
+                    <div className={Styles.redHeaderTop}><div className={Styles.redHeaderTopText}>已退款额/元</div><div className={Styles.redHeaderTopNum}>{data.totalRechargeAmounttotalRefund / 100 || 0}</div></div>
+                    <div className={Styles.redHeaderBottom}>对账请在退款订单中查看退款状态为“已退款”的退款记录</div>
+                </div>
+
+                <div className={Styles.redHeader} style={{ margin: '0 40px' }}>
+                    <div className={Styles.redHeaderTop}><div className={Styles.redHeaderTopText}>退款冻结额/元</div><div className={Styles.redHeaderTopNum}>{data.refundBlockedAmount / 100 || 0}</div></div>
+                    <div className={Styles.redHeaderBottom}>对账请在退款订单中查看退款状态为“已申请”的退款记录</div>
+                </div>
+                <div className={Styles.redHeader}>
+                    <div className={Styles.redHeaderTop}><div className={Styles.redHeaderTopText}>账户余额/元</div><div className={Styles.redHeaderTopNum}>{data.realBalance / 100 || 0}</div></div>
+                    <div className={Styles.redHeaderBottom}>账户余额=总充值金额-已消费金额-已退款额-退款冻结额</div>
+                </div>
+            </div>
+            <div style={{ textAlign: 'center', marginTop: '272px' }}>
+                <Button className={Styles.btn} type="primary" htmlType="submit" onClick={() => showModal('recharge')}>充值</Button>
+                <Button className={Styles.btn} style={{ marginLeft: '80px' }} onClick={() => showModal('refund')}>退款</Button>
+            </div>
+
+            <Modal
+                title={title}
+                visible={visible}
+                // onOk={handleOk}
+                confirmLoading={confirmLoading}
+                onCancel={handleCancel}
+                footer={null}
+                width="1000px"
+                maskClosable={false}
+            >
+                {title === '线上充值' && <Recharge value={e => handleOkRecharge(e)}></Recharge>}
+                {title === '申请退款' && <Refund balance={data.realBalance / 100 || 0} value={e => handleOkRefund(e)}></Refund>}
+                {title === '扫码支付' && visible && <Pay amount={amount} visible={visible} value={e => handleOkRepay(e)}></Pay>}
+                {title === '联系我们' && <Contact></Contact>}
+
+            </Modal>
+        </>
+    )
+}
+
+export default Basic

src/pages/funds/accountfunds/components/ConsumerOrder.jsx

@@ -0,0 +1,236 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb, DatePicker } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import Navigate from '@/components/Navigate';
+
+const { Option } = Select
+
+function RechargeOrder(props) {
+
+    // const [taNoticeList, setTaNoticeList] = useState([])
+    const [data, setData] = useState({})
+    const [modalData, setModalData] = useState([])
+    const [visible, setvisiblea] = useState(false)
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+        request({ ...apis.funds.consumeOrderByConditionlist, params: { ...params, consumeType: 'redPackage' } }).then(data => {
+            setData(data)
+        })
+    }
+
+    function handleSubmit(e) {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ pageNum: 1, pageSize: 10 });
+            }
+        });
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+
+        getList({ pageNum: 1, pageSize: 10 })
+    }
+
+    const showModal = (row) => {
+        setvisiblea(true)
+        setModalData(row)
+    }
+
+    const changePageNum = e => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ pageNum: e, pageSize: 10, ...values })
+            }
+        });
+
+    }
+
+    const columns = [
+        {
+            title: '订单编号',
+            dataIndex: 'tradeNo',
+            key: 'tradeNo',
+            align: 'center',
+        },
+        {
+            title: '消费金额',
+            dataIndex: 'amount',
+            key: 'amount',
+            align: 'center',
+        },
+        {
+            title: '消费方式',
+            dataIndex: 'targetName',
+            key: 'targetName',
+            align: 'center',
+            render: () => <><span>红包</span></>,
+        },
+        {
+            title: '活动名称',
+            dataIndex: 'activityName',
+            key: 'activityName',
+            align: 'center',
+        },
+        {
+            title: '消费下单时间',
+            dataIndex: 'expiryDate',
+            key: 'expiryDate',
+            align: 'center',
+            render: (x, row) => <><span>{`${moment(row.expiryDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+        },
+        {
+            title: '接收人手机号',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+            render: (x, row) => <><Navigate onClick={() => showModal(row)}>{x}</Navigate> </>,
+        },
+        {
+            title: '消费状态',
+            dataIndex: 'auditStatus',
+            key: 'auditStatus',
+            align: 'center',
+            render: (x, row) => <><span>{x === 1 ? '成功' : '失败'}</span></>,
+        },
+    ]
+
+    function download(data) {
+        // if (!data) {
+        //     console.log('234')
+        //     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()
+    }
+
+    const exportReport = () => {
+
+        request({ ...apis.funds.exportConsumeOrderByCondition, responseType: 'blob', params: { ...props.form.getFieldsValue(), consumeType: 'redPackage' } }).then(data => {
+            download(data)
+        }).catch()
+    }
+
+    const { getFieldDecorator } = props.form
+
+    return (
+
+        <>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item>
+                    {getFieldDecorator('tradeNo')(
+                        <Input
+                            placeholder="订单编号"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('startTime')(
+                        <DatePicker placeholder="消费开始时间" />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('endTime')(
+                        <DatePicker placeholder="消费结束时间" />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('auditStatus')(
+                        <Select style={{ width: '180px' }} placeholder="消费状态">
+                            <Option value="">全部</Option>
+                            <Option value="1">成功</Option>
+                            <Option value="0">失败</Option>
+                        </Select>,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('consumeType')(
+                        <Select style={{ width: '180px' }} placeholder="消费状态">
+                            <Option value="">全部</Option>
+                            <Option value="redPackage">红包</Option>
+                        </Select>,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('phone')(
+                        <Input
+                            placeholder="接收人手机号"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    <Button type="primary" htmlType="submit"> 搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+            <div style={{ marginTop: '20px' }}>
+                <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+            </div>
+            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination
+                    showQuickJumper
+                    defaultCurrent={1}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+            </div>
+            <Modal
+                title="接收人信息"
+                visible={visible}
+                // onOk={handleOk}
+                // confirmLoading={confirmLoading}
+                onCancel={() => setvisiblea(false)}
+                footer={null}
+            // width="1000px"
+            // maskClosable={false}
+            >
+                <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }}>
+                    <Form.Item label="昵称">
+
+                        <span>{modalData.nickName}</span>
+
+                    </Form.Item>
+                    <Form.Item label="头像">
+
+                        <img src={modalData.avatarurl} alt="" />
+
+                    </Form.Item>
+                    <Form.Item label="姓名">
+
+                        <span>{modalData.name}</span>
+
+                    </Form.Item>
+                    <Form.Item label="手机号">
+
+                        <span>{modalData.phone}</span>
+
+                    </Form.Item>
+                </Form>
+            </Modal>
+        </>
+
+    )
+}
+
+
+const WrappedRechargeOrder = Form.create({ name: 'RechargeOrder' })(RechargeOrder);
+
+export default WrappedRechargeOrder
+

src/pages/funds/accountfunds/components/Contact.jsx

@@ -0,0 +1,19 @@
+import React, { useState } from 'react';
+import { Button, Input, Row, Col } from 'antd';
+import Styles from './styles.less';
+import Navigate from '@/components/Navigate';
+
+const Recharge = props => {
+
+    const [value, setValue] = useState()
+
+    return (
+        <>
+            <span style={{ fontSize: '22px', color: '#979797', lineHeight: '30px' }}>重要说明：</span>
+            <div style={{ fontSize: '18px', color: '#333', lineHeight: '34px', marginTop: '20px' }}>
+                您已充值成功，微信充值到账为T+7，因此，充值金额7日后才能到账，为不影响客户使用，实际活动金额由橙蕉预先充值垫付，需要在使用预算前和运营人员确认橙蕉余额是否充足， <Navigate>请联系我们</Navigate>
+            </div>
+        </>
+    )
+}
+export default Recharge

src/pages/funds/accountfunds/components/Pay.jsx

@@ -0,0 +1,104 @@
+import React, { useState, useEffect } from 'react';
+import { Button, Input, Row, Col, message } from 'antd';
+import QRCode from 'qrcode.react';
+import Styles from './styles.less';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+
+const Recharge = props => {
+
+    const { amount, visible } = props
+    console.log(amount, visible, 'amount')
+    const { orderInfo } = amount
+    console.log(orderInfo, 'orderInfo')
+    useEffect(() => {
+        getByInfo
+        // setTimeout(() => { getByInfo() }, 1000)
+    }, [])
+
+
+    const getByInfo = setInterval(() => {
+
+
+
+        request({ ...apis.funds.getByInfo, params: { orderId: orderInfo.orderId } }).then(data => {
+            if (data.tradingStatus === 'processing') {
+
+                // clearInterval(getByInfo)
+                // props.value()
+                if (!visible) { clearInterval(getByInfo) }
+            } else if (data.tradingStatus === 'success') {
+                mmessage.info('充值成功')
+                
+                props.value('success')
+                clearInterval(getByInfo)
+            } else {
+                mmessage.info('充值失败')
+                
+                props.value('fail')
+                clearInterval(getByInfo)
+            }
+            // tradingStatus
+            // setTimeout(() => { getByInfo() }, 1000)
+        }).catch(err => {
+            console.log(err)
+            clearInterval(getByInfo)
+        })
+    }, 1000)
+
+
+    // {
+    //     request({ ...apis.funds.getByInfo, params: { orderId: orderInfo.orderId } }).then(data => {
+    //         if (data.tradingStatus === 'processing') {
+    //             setTimeout(() => { getByInfo() }, 1000)
+    //         } else if (data.tradingStatus === 'success') {
+    //             mmessage.info('充值成功')
+    //         } else {
+    //             mmessage.info('充值失败')
+    //         }
+
+    //         // tradingStatus
+    //         // setTimeout(() => { getByInfo() }, 1000)
+    //     }).catch(err => {
+    //         console.log(err)
+    //     })
+    // }
+    // getByInfo
+
+
+    // const [value, setValue] = useState()
+
+    // function onChange(e) {
+    //     if (e.target.value <= 0) return
+    //     if (e.target.value > 99999.99) { setValue(99999.99); return }
+    //     console.log('changed', e.target.value);
+    //     setValue(e.target.value)
+
+    // }
+    return (
+        <>
+            <div style={{ fontSize: '18px', fontWeight: '400', color: '#333333' }}>
+                <span onClick={props.value}>充值金额{amount.amount}元</span><span style={{ marginLeft: '80px' }}>微信商户手续费率{amount.mchPayRate}</span><span style={{ marginLeft: '80px' }}>手续费{amount.serviceFee}元</span>
+                {/* <img src="" alt="" width:/> */}
+            </div>
+            <div style={{ height: '278px', borderRadius: '12px', border: '1px solid rgba(218,218,218,1', margin: '40px 0', display: 'flex' }}>
+                <div className={Styles.box}>
+                    <QRCode
+                        value={amount.payQrCode}  //value参数为生成二维码的链接
+                        size={194} //二维码的宽高尺寸
+                        fgColor="#000000"  //二维码的颜色
+                    />
+                    {/* <img src={amount.payQrCode} alt="" /> */}
+                </div>
+                <div className={Styles.boxRight}>
+                    <div className={Styles.child}>
+                        <p style={{ lineHeight: '43px', height: '43px', marginBottom: '5px' }}><span style={{ fontSize: '32px', fontWeight: '600', color: '#EF273A' }}>￥{amount.realAmount}</span><span style={{ marginLeft: '5px' }}>应付金额</span></p>
+                        <p>仅支持微信支付</p>
+                    </div>
+
+                </div>
+            </div>
+        </>
+    )
+}
+export default Recharge

src/pages/funds/accountfunds/components/Recharge.jsx

@@ -0,0 +1,38 @@
+import React, { useState } from 'react';
+import { Button, Input, Row, Col } from 'antd';
+import Styles from './styles.less';
+import Navigate from '@/components/Navigate';
+import ContactText from './contactText'
+
+const Recharge = props => {
+
+    const [value, setValue] = useState()
+
+    function onChange(e) {
+        if (e.target.value <= 0) return
+        if (e.target.value > 99999.99) { setValue(99999.99); return }
+        console.log('changed', e.target.value);
+        setValue(e.target.value)
+
+    }
+    return (
+        <>
+            <Row>
+                <Col span={3}> <span style={{ fontSize: '20px', color: '#666' }}>充值金额/元</span></Col>
+                <Col span={17} offset={1}>
+                    <Input type="number" min={0} step={0.01} value={value} onChange={onChange} style={{ marginBottom: '40px' }}></Input>
+                    <span style={{ fontSize: '20px', color: '#979797', lineHeight: '30px' }}>重要说明：</span>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px', marginTop: '20px' }}>1.充值流程：输入充值金额-点击确定-扫码支付-支付成功。</p>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px' }}>2.因微信限制，微信充值有手续费，因此充值金额中应包含手续费，费率1%。</p>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px' }}>3.微信充值到账为T+7，因此，充值金额7日后才能到账，为不影响客户使用，实际活动金额由橙蕉预先充值垫付，需要在使用预算前和运营人员确认橙蕉余额是否充足。充值后请联系我们。</p>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px' }}>4.您也可使用银行卡转账/支付宝支付/对公账户打款/现金支付等方式充值，具体方式请<ContactText /></p>
+                </Col>
+            </Row>
+            <div style={{ textAlign: 'center', marginTop: '40px' }}>
+                <Button className={Styles.btn} type="primary" htmlType="submit" onClick={() => props.value(value)}>充值</Button>
+
+            </div>
+        </>
+    )
+}
+export default Recharge

src/pages/funds/accountfunds/components/RechargeOrder.jsx

@@ -0,0 +1,226 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb, DatePicker } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import Navigate from '@/components/Navigate'
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import ShowVoucher from './ShowVoucher';
+
+
+const { Option } = Select
+
+function RechargeOrder(props) {
+
+    // const [taNoticeList, setTaNoticeList] = useState([])
+    const [data, setData] = useState({})
+
+    const [showVoucher, setShowVoucher] = useState({})
+    //     {
+    //         visible: false,
+    //         bannerList: ['//njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1591609582282-1584614514971-504167f68a5d43ee693949b26498ef21.jpg', '//njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1591609582282-1584614514971-504167f68a5d43ee693949b26498ef21.jpg'],
+    //     },
+    // )
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+        request({ ...apis.funds.czlist, params: { ...params } }).then(data => {
+            setData(data)
+        })
+    }
+    const openImg = data => {
+        setShowVoucher(
+            {
+                visible: true,
+                bannerList: data,
+            },
+        )
+    }
+
+    const changePageNum = e => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ pageNum: e, pageSize: 10, ...values })
+            }
+        });
+
+    }
+
+
+    function handleSubmit(e) {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ pageNum: 1, pageSize: 10, ...values })
+            }
+        });
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+
+        getList({ pageNum: 1, pageSize: 10 })
+    }
+
+    const columns = [
+        {
+            title: '订单编号',
+            dataIndex: 'tradeNo',
+            key: 'tradeNo',
+            align: 'center',
+        },
+        {
+            title: '充值金额',
+            dataIndex: 'amount',
+            key: 'amount',
+            align: 'center',
+        },
+        {
+            title: '充值方式',
+            dataIndex: 'isOffline',
+            key: 'isOffline',
+            align: 'center',
+            render: x => <><span>{x ? '运营手工充值' : '业务线上充值'}</span></>,
+        },
+        {
+            title: '下单时间',
+            dataIndex: 'createDate',
+            key: 'createDate',
+            align: 'center',
+            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+        },
+        {
+            title: '充值凭证',
+            dataIndex: 'certificateList',
+            key: 'certificateList',
+            align: 'center',
+            render: (x, row) => <><Navigate onClick={() => openImg(x)}>查看</Navigate> </>,
+        },
+        {
+            title: '充值状态',
+            dataIndex: 'tradingStatus',
+            key: 'tradingStatus',
+            align: 'center',
+            render: x => <><span>{x ? '运营手工充值' : '业务线上充值'}</span></>,
+        },
+        {
+            title: '支付时间',
+            dataIndex: 'payDate',
+            key: 'payDate',
+            align: 'center',
+            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+        },
+    ]
+
+    const { getFieldDecorator } = props.form
+
+    function download(data) {
+        // if (!data) {
+        //     console.log('234')
+        //     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()
+    }
+
+    const exportReport = () => {
+
+        request({ ...apis.funds.czexportList, responseType: 'blob', params: { ...props.form.getFieldsValue() } }).then(data => {
+            download(data)
+        }).catch()
+    }
+
+    return (
+
+        <>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item>
+                    {getFieldDecorator('tradeNo')(
+                        <Input
+                            placeholder="订单编号"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('payStartTime')(
+                        <DatePicker placeholder="支付开始时间" />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('payEndTime')(
+                        <DatePicker placeholder="支付结束时间" />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('isOffline')(
+                        <Select style={{ width: '180px' }} placeholder="充值方式">
+                            <Option value="">全部</Option>
+                            <Option value={0}>业务线上充值</Option>
+                            <Option value={1}>运营手工充值</Option>
+                        </Select>,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('tradingStatus')(
+                        <Select style={{ width: '180px' }} placeholder="充值状态">
+                            <Option value="">全部</Option>
+                            <Option value="1">待支付</Option>
+                            <Option value="2">已支付</Option>
+                            <Option value="3">已超时</Option>
+                        </Select>,
+                    )}
+                </Form.Item>
+                {/* <Form.Item>
+                    {getFieldDecorator('tel')(
+                        <Input
+                            placeholder="充值方式"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('tel')(
+                        <Input
+                            placeholder="充值状态"
+                        />,
+                    )}
+                </Form.Item> */}
+                <Form.Item>
+                    <Button type="primary" htmlType="submit"> 搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+            <div style={{ marginTop: '20px' }}>
+                <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+            </div>
+            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination
+                    showQuickJumper
+                    defaultCurrent={1}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+            </div>
+
+            {showVoucher.visible && <ShowVoucher bannerList={showVoucher.bannerList} closeSwiper={() => setShowVoucher({ visible: false })} />}
+        </>
+
+    )
+}
+
+
+const WrappedRechargeOrder = Form.create({ name: 'RechargeOrder' })(RechargeOrder);
+
+export default WrappedRechargeOrder
+

src/pages/funds/accountfunds/components/Refund.jsx

@@ -0,0 +1,36 @@
+import React, { useState } from 'react';
+import { Button, Input, Row, Col } from 'antd';
+import Styles from './styles.less';
+import Navigate from '@/components/Navigate';
+
+const Recharge = props => {
+
+    const { balance } = props
+
+    const [value, setValue] = useState()
+
+    function onChange(e) {
+        // if (e.target.value <= 0) return
+        // if (e.target.value > balance) { setValue(balance); return }
+        console.log('changed', e.target.value);
+        setValue(e.target.value)
+
+    }
+    return (
+        <>
+            <Row>
+                <Col span={3}> <span style={{ fontSize: '20px', color: '#666' }}>退款金额/元</span></Col>
+                <Col span={17} offset={1}>
+                    <Input type="number" min={0} step={0.01} value={value} onChange={onChange} style={{ marginBottom: '40px' }}></Input>
+                    <span style={{ fontSize: '20px', color: '#979797', lineHeight: '30px' }}>账户余额：{balance}元</span>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px', marginTop: '20px' }}>因微信商户平台限制，需先提交退款申请，提交后会冻结退款额对应余额资金，冻结金额无法使用，若您的平台有正在举办的活动等需要消费的地方，请预留充足的余额。如有疑问， <Navigate>请联系我们</Navigate></p>
+                </Col>
+            </Row>
+            <div style={{ textAlign: 'center', marginTop: '40px' }}>
+                <Button className={Styles.btn} type="primary" htmlType="submit" onClick={() => props.value(value)}>确认申请</Button>
+
+            </div>
+        </>
+    )
+}
+export default Recharge

src/pages/funds/accountfunds/components/RefundOrder.jsx

@@ -0,0 +1,209 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb, DatePicker } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import Navigate from '@/components/Navigate'
+import ShowVoucher from './ShowVoucher';
+
+const { Option } = Select
+
+function RechargeOrder(props) {
+
+    // const [taNoticeList, setTaNoticeList] = useState([])
+    const [data, setData] = useState({})
+
+    const [showVoucher, setShowVoucher] = useState({})
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+        request({ ...apis.funds.refundlist, params: { ...params } }).then(data => {
+            setData(data)
+        })
+    }
+
+    function handleSubmit(e) {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ pageNum: 1, pageSize: 10, ...values })
+            }
+        });
+    }
+
+    const openImg = data => {
+        setShowVoucher(
+            {
+                visible: true,
+                bannerList: data,
+            },
+        )
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+
+        getList({ pageNum: 1, pageSize: 10 })
+    }
+
+    const changePageNum = e => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ pageNum: e, pageSize: 10, ...values })
+            }
+        });
+
+    }
+
+    const columns = [
+        {
+            title: '订单编号',
+            dataIndex: 'tradeNo',
+            key: 'tradeNo',
+            align: 'center',
+        },
+        {
+            title: '退款金额（元）',
+            dataIndex: 'amount',
+            key: 'amount',
+            align: 'center',
+        },
+        {
+            title: '退款创建时间',
+            dataIndex: 'createDate',
+            key: 'createDate',
+            align: 'center',
+            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+        },
+        {
+            title: '退款状态',
+            dataIndex: 'auditStatus',
+            key: 'auditStatus',
+            align: 'center',
+        },
+        {
+            title: '驳回原因',
+            dataIndex: 'auditResult',
+            key: 'auditResult',
+            align: 'center',
+        },
+
+        {
+            title: '退款凭证',
+            dataIndex: 'certificateList',
+            key: 'certificateList',
+            align: 'center',
+            render: (x, row) => <><Navigate onClick={() => openImg(x)}>查看</Navigate> </>,
+        },
+        {
+            title: '操作',
+            dataIndex: 'num',
+            key: 'num',
+            align: 'center',
+            render: withActions((text, row) => [
+
+                <EditIcon type="look" text="查看联系人" > </EditIcon>,
+
+
+            ]),
+        },
+    ]
+
+    function download(data) {
+        // if (!data) {
+        //     console.log('234')
+        //     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()
+    }
+
+    const exportReport = () => {
+
+        request({ ...apis.funds.refundexportList, responseType: 'blob', params: { ...props.form.getFieldsValue() } }).then(data => {
+            download(data)
+        }).catch()
+    }
+
+    const { getFieldDecorator } = props.form
+
+    return (
+
+        <>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item>
+                    {getFieldDecorator('tradeNo')(
+                        <Input
+                            placeholder="订单编号"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('startTime')(
+                        <DatePicker placeholder="退款开始时间" />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('endTime')(
+                        <DatePicker placeholder="退款结束时间" />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('auditStatus')(
+                        <Select style={{ width: '180px' }} placeholder="退款状态">
+                            <Option value="">全部</Option>
+                            <Option value="1">已申请</Option>
+                            <Option value="2">已驳回</Option>
+                            <Option value="3">已退款</Option>
+                        </Select>,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('phone')(
+                        <Input
+                            placeholder="接收人手机号"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    <Button type="primary" htmlType="submit"> 搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+            <div style={{ marginTop: '20px' }}>
+                <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+            </div>
+            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination
+                    showQuickJumper
+                    defaultCurrent={1}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+            </div>
+            {showVoucher.visible && <ShowVoucher bannerList={showVoucher.bannerList} closeSwiper={() => setShowVoucher({ visible: false })} />}
+        </>
+
+    )
+}
+
+
+const WrappedRechargeOrder = Form.create({ name: 'RechargeOrder' })(RechargeOrder);
+
+export default WrappedRechargeOrder
+

src/pages/funds/accountfunds/components/ShowVoucher.jsx

@@ -0,0 +1,115 @@
+import React, { useState, useRef, useEffect } from "react";
+import { Alert, message } from 'antd';
+import Swiper from 'swiper';
+import router from 'umi/router';
+// import request from '../../utils/request'
+import styles from './styles.less'
+import closeImg from '../../../../assets/close.png';
+import classNames from 'classnames';
+import 'swiper/css/swiper.min.css';
+
+const storageKey = 'showSwiperIndex';
+
+// const ShowVoucher = props => {
+
+
+//     useEffect(()={
+
+//     },[])
+
+//     return <>
+//         <div className={styles.content}>
+//             <img src={closeImg} alt="" className={styles.close} onClick={() => props.closeSwiper} />
+//             <div className={classNames(['swiper-container', styles.carousel])}  >
+//                 <div className={classNames(['swiper-wrapper', styles.carousel])} >
+//                     {props.data.bannerList.map((item, index) =>
+//                         <div key={'swiper' + index} className={classNames(['swiper-slide', styles.carouselItem])} >
+//                             <img style={{ width: '100%', height: '100%', borderRadius: '10px' }} src={item.noticeImg} alt="" />
+//                         </div>,
+//                     )}
+//                 </div>
+//                 <div className={classNames(['swiper-pagination', styles.dots])}  ></div>
+//             </div>
+//             {/* 123 */}
+//         </div>
+//     </>
+// }
+
+class ShowVoucher extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            bannerList: this.props.bannerList,
+        }
+
+        console.log(this.props, ' props.bannerList')
+
+        this.slider = null
+    }
+
+    componentDidMount() {
+        console.log(this.props, ' props.bannerList')
+        this.showSwiper()
+
+
+    }
+
+
+    showSwiper() {
+        //swiper初始化
+        const { bannerList } = this.state
+        if (bannerList.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,
+                observeParents: true,
+            })
+        } else {
+            this.swiper = new Swiper('.swiper-container', {
+                loop: false,
+                observer: true,
+                observeParents: true,
+            })
+        }
+    }
+
+    render() {
+
+        const { bannerList } = this.state
+        // const showSwiper = window.localStorage.getItem(storageKey)
+        return (
+            <>
+                {bannerList.length > 0 && <div className={styles.mask}>
+                    <div className={styles.content}>
+                        <img src={closeImg} alt="" className={styles.close} onClick={() => this.props.closeSwiper()} />
+                        <div className={classNames(['swiper-container', styles.carousel])} >
+                            <div className={classNames(['swiper-wrapper', styles.carousel])} >
+                                {bannerList.map((item, index) =>
+                                    <div key={'swiper' + index} className={classNames(['swiper-slide', styles.carouselItem])} onClick={() => this.handleSwiperItem(item)}>
+                                        <img style={{ width: '100%', height: '100%', borderRadius: '10px' }} src={item} alt="" />
+                                    </div>,
+                                )}
+                            </div>
+                            <div className={classNames(['swiper-pagination', styles.dots])} ></div>
+                        </div>
+                    </div>
+                </div>}
+                11
+            </>
+        )
+    }
+}
+
+
+export default ShowVoucher

src/pages/funds/accountfunds/components/contactText.jsx

@@ -0,0 +1,17 @@
+import React from 'react'
+import Navigate from '@/components/Navigate';
+
+const ContactText = () => {
+    // const toNewContact = () => {
+    //     const aTag = document.createElement('a')
+
+    //     aTag.setAttribute('href', `${window.location.origin}${window.location.pathname}#/funds/financialContact`);
+    //     aTag.setAttribute('target', '_blank')
+    //     document.body.appendChild(aTag)
+    //     aTag.click();
+    // }
+    return <a href={`${window.location.origin}${window.location.pathname}#/funds/financialContact`} style={{ color: '#1D74D9' }} target="_blank">请联系我们</a>
+
+}
+
+export default ContactText

src/pages/funds/accountfunds/components/styles.less

@@ -0,0 +1,100 @@
+
+  .redHeader{
+    width: 20%;
+    // height: 217px;
+    background:rgba(249,249,249,1);
+    border-radius:12px;
+    padding: 20px 24px;
+    .redHeaderTop{
+      text-align: center;
+      height: 122px;
+      font-family:PingFangSC-Regular,PingFang SC;
+      font-size:18px;
+      font-weight:400;
+      color:rgba(51,51,51,1);
+      .redHeaderTopText{
+        font-size:18px;
+        color:rgba(51,51,51,1);
+      }
+      .redHeaderTopNum{
+        font-size:48px;
+        font-weight:500;
+        color:rgba(255,126,72,1);
+line-height: 97px;
+      }
+    }
+    .redHeaderBottom{
+      padding-top: 10px;
+      border-top:1px solid rgba(216,216,216,1);
+      font-size:16px;
+      font-weight:400;
+      color:rgba(153,153,153,1);
+      // line-height:22px;
+    }
+  }
+
+  .btn {
+    width: 140px;
+    height: 45px;
+  }
+
+  .box{
+    height: 204px;
+    width: 204px;
+    // background-color:red;
+    margin: 37px 40px 40px 249px;
+    // borderRadius: '12px', border: '1px solid rgba(218,218,218,1', margin: '40px 0' 
+      // width: 100px; 
+      // height: 100px;
+      // border-radius:5px;
+      background: linear-gradient(to left, #1D74D9, #1D74D9) left top no-repeat, 
+            linear-gradient(to bottom, #1D74D9, #1D74D9) left top no-repeat, 
+            linear-gradient(to left, #1D74D9, #1D74D9) right top no-repeat,
+            linear-gradient(to bottom, #1D74D9, #1D74D9) right top no-repeat, 
+            linear-gradient(to left, #1D74D9, #1D74D9) left bottom no-repeat,
+            linear-gradient(to bottom, #1D74D9, #1D74D9) left bottom no-repeat,
+            linear-gradient(to left, #1D74D9, #1D74D9) right bottom no-repeat,
+            linear-gradient(to left, #1D74D9, #1D74D9) right bottom no-repeat;
+      background-size: 2px 10px, 10px 2px, 2px 10px, 10px 2px; 
+      padding: 5px;
+      // background-color:#aaaaaa
+    
+  }
+  .boxRight{
+    width: 400px;
+    margin: 40px 0;
+    // position: absolute;
+    // top: 50%;
+    // transform: translate(50%,-50%);
+    position:relative;
+    .child{
+      position: absolute;
+    top: 50%;
+    transform: translate(0,-50%);
+    font-size:18px;
+font-weight:400;
+color:rgba(102,102,102,1);
+float: left;
+// line-height:25px;
+    }
+  }
+
+  .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;
+    }
+}

src/pages/funds/accountfunds/index.jsx

@@ -0,0 +1,68 @@
+import React, { useState, useEffect } from 'react';
+import { Radio } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import Basic from './components/Basic';
+import RechargeOrder from './components/RechargeOrder'
+import ConsumerOrder from './components/ConsumerOrder'
+import RefundOrder from './components/RefundOrder'
+
+const H5configuration = props => {
+
+    const [tab, setTab] = useState('1')
+    const [data, setData] = useState({})
+
+    const id = props.location.query.id
+    // const type = props.activeType
+
+
+    useEffect(() => {
+        console.log(props)
+        // getData({ id: id, type: type })
+
+    }, [])
+
+    const getData = (params) => {
+
+        // request({ ...apis.activityDataStatis.getStatisticData, params: { ...params, } }).then((data) => {
+        //     console.log(data)
+        //     setData(data || {})
+        // })
+    }
+
+    function tabsCallback(e) {
+
+        setTab(e.target.value)
+    }
+    const onDetai = (e) => {
+        console.log(e)
+        setTab('4')
+    }
+
+
+    return <>
+
+        <div>
+            <Radio.Group value={tab} buttonStyle="solid" onChange={e => tabsCallback(e)}>
+                <Radio.Button value="1">基本信息</Radio.Button>
+                <Radio.Button value="2">充值订单</Radio.Button>
+                <Radio.Button value="3">消费订单</Radio.Button>
+                <Radio.Button value="4">退款订单</Radio.Button>
+            </Radio.Group>
+            <div style={{ marginTop: '20px' }}>
+                {/* 基本信息 */}
+                {(tab === '1' && <Basic />)}
+                {/* 充值订单 */}
+                {(tab === '2' && <RechargeOrder />)}
+                {/* 消费订单 */}
+                {(tab === '3' && <ConsumerOrder />)}
+                {/* 退款订单 */}
+                {(tab === '4' && <RefundOrder />)}
+            </div>
+        </div>
+    </>
+}
+
+export default H5configuration

src/pages/funds/financialContact/index.jsx

@@ -0,0 +1,141 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+
+function financialContact(props) {
+
+    // const [taNoticeList, setTaNoticeList] = useState([])
+    const [data, setData] = useState({})
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+        request({ ...apis.funds.list, params: { ...params } }).then(data => {
+            setData(data)
+        })
+    }
+
+    function handleSubmit(e) {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ ...values })
+            }
+        });
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+
+        getList({ pageNum: 1, pageSize: 10 })
+    }
+
+    const columns = [
+        {
+            title: '姓名',
+            dataIndex: 'contactName',
+            key: 'contactName',
+            align: 'center',
+        },
+        {
+            title: '性别',
+            dataIndex: 'sex',
+            key: 'sex',
+            align: 'center',
+        },
+        {
+            title: '头像',
+            dataIndex: 'avatar',
+            key: 'avatar',
+            align: 'center',
+            render: (x, row) => <img src={row.qrCodeUrl} alt="" width="100px"></img >,
+        },
+        {
+            title: '固话',
+            dataIndex: 'telephone',
+            key: 'telephone',
+            align: 'center',
+        },
+        {
+            title: '手机号',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '头衔',
+            dataIndex: 'appellation',
+            key: 'appellation',
+            align: 'center',
+        },
+    ]
+
+    const changePageNum = pageNumber => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ pageNum: pageNumber, pageSize: 10, ...values })
+            }
+        });
+    }
+
+
+    const { getFieldDecorator } = props.form
+
+    return (
+
+        <>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item>
+                    {getFieldDecorator('contactName')(
+                        <Input
+                            placeholder="姓名"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('telephone')(
+                        <Input
+                            placeholder="固话"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('phone')(
+                        <Input
+                            placeholder="手机号"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    <Button type="primary" htmlType="submit"> 搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+            {/* <div style={{ marginTop: '20px' }}>
+                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+            </div> */}
+            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination
+                    showQuickJumper
+                    defaultCurrent={1}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+            </div>
+        </>
+
+    )
+}
+
+
+const WrappedFinancialContact = Form.create({ name: 'financialContact' })(financialContact);
+
+export default WrappedFinancialContact
+

src/pages/h5SampleManager/h5Sample/addH5.jsx

@@ -0,0 +1,139 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, InputNumber, Checkbox, Row, Col } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import ImageUploader from '../../../components/XForm/ImageUpload';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+
+const header = props => {
+    const sampleId = props.location.query.id;
+    // const sampleName = props.location.query.sampleName;
+    // const [sampleData, setSampleData] = useState({})
+
+    //   useEffect(() => {
+    //     getSampleData(sampleId);
+    //   },[])
+
+    //   // 查询列表
+    //   const getSampleData = (demandId) => {
+    //       request({ ...apis.taH5SampleManager.taH5DemandById, urlData: {id: demandId} }).then((data) => {
+    //           setDemandData(data)
+    //           props.form.setFieldsValue(data)
+    //       })
+    //   }
+
+    // 跳转到编辑
+    const toDetail = rowData => () => {
+        if (rowData) {
+            router.push({
+                pathname: '/h5SampleManager/h5Demand/edit',
+                query: {
+                    id: demandId,
+                },
+            });
+            return
+        }
+    }
+
+    function handleSubmit(e) {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                values.h5SampleId = sampleId
+                values.endDate = moment(values.endDate._d).format('YYYY-MM-DD HH:mm:ss')
+                values.isMiniapp = 1
+                values.fromH5Sample = true
+                request({ ...apis.activity.addtaDrainage, data: { ...values } }).then(data => {
+                    message.info('操作成功')
+
+                }).catch(err => {
+                    message.error(err.msg || err.message)
+                })
+
+                // values.sampleName = sampleName
+                // request({ ...apis.taH5SampleManager.addTaH5Demand, data: { ...values } }).then(() => {
+                //     message.info('保存成功')
+                //     // router.go(-1);
+                // }).catch((err) => {
+                //     message.info(err.msg || err.message)
+                // })
+            }
+        });
+    }
+
+    const { getFieldDecorator } = props.form;
+
+    return (
+        <>
+            <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+                <Form.Item label="H5活动名称">
+                    {getFieldDecorator('name', {
+                        rules: [
+                            {
+                                required: true,
+                                message: '请填写活动名称',
+                            },
+                        ],
+                    })(<Input placeholder="H5活动名称" />)}
+                </Form.Item>
+                <Form.Item label="下架时间">
+                    {getFieldDecorator('endDate', {
+                        // initialValue: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm:ss') : null,
+                        rules: [
+                            { required: true, message: '请输入下架时间' },
+                        ]
+                    })(
+                        <DatePicker
+                            showTime={{ format: 'HH:mm:ss' }}
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item label="分享设置" help="建议图片尺寸：750*600px，比例5:4,格式：jpg">
+                    {getFieldDecorator('shareImg', {
+                        // initialValue: formsDate.shareImg,
+                        rules: [
+                            { required: true, message: '请选择分享图片' },
+                        ]
+                    })(<ImageUploader />)}
+                </Form.Item>
+                <Form.Item label="活动分享语">
+                    {getFieldDecorator('shareTitle', {
+                        // initialValue: formsDate.shareTitle,
+                        rules: [
+                            { required: true, message: '请输入活动分享语' },
+                        ]
+                    })(
+                        <Input
+                            placeholder="分享语，不超过15个字"
+                            maxLength="15"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item label="中间页飞机图" help="建议图片尺寸：750*1667px，比例9:20,格式：jpg。图片底部不要放置关键信息。">
+                    {getFieldDecorator('middleImg', {
+                        // initialValue: formsDate.middleImg,
+                        rules: [
+                            { required: true, message: '请选择中间页飞机图' },
+                        ]
+                    })(<ImageUploader />)}
+                </Form.Item>
+                <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+                    <Button type="primary" htmlType="submit">保存</Button>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <Button onClick={() => router.go(-1)}>取消</Button>
+                </Form.Item>
+            </Form>
+        </>
+    )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/h5SampleManager/h5Sample/detail.jsx

@@ -54,7 +54,19 @@ const header = props => {
       message.info("该H5样例已取消发布或已删除")
     })
 
-    
+
+  }
+
+  const toAddH5 = rowData => () => {
+    router.push({
+      pathname: '/h5SampleManager/h5Sample/addH5',
+      query: {
+        id: sampleId,
+        sampleName: demandData.sampleName
+      },
+    });
+
+
   }
   const toCancel = () => {
     router.go(-1)
@@ -104,11 +116,14 @@ const header = props => {
           <DragableUploadImageList sampleId={sampleId}></DragableUploadImageList>
         </Form.Item>}
         <Form.Item label="样例内容">
-          {demandData.sampleType === 'link' && <div><span style={{ color: 'rgba(0, 0, 0, 0.45)', fontSize: '14px' }}>点击链接查看内容</span><br/></div>}
-          {demandData.sampleType === 'rich' ? getFieldDecorator('sampleContent')(<div dangerouslySetInnerHTML={{ __html: demandData.sampleContent}}></div>) : getFieldDecorator('sampleContentLink')(<Navigate to={demandData.sampleContentLink}>{demandData.sampleContentLink}</Navigate>)}
+          {demandData.sampleType === 'link' && <div><span style={{ color: 'rgba(0, 0, 0, 0.45)', fontSize: '14px' }}>点击链接查看内容</span><br /></div>}
+          {demandData.sampleType === 'rich' ? getFieldDecorator('sampleContent')(<div dangerouslySetInnerHTML={{ __html: demandData.sampleContent }}></div>) : getFieldDecorator('sampleContentLink')(<Navigate to={demandData.sampleContentLink}>{demandData.sampleContentLink}</Navigate>)}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
           <div style={{ margin: '0.16rem 0 0.06rem' }}>
+            <Button type="primary" onClick={toAddH5(sampleId)} style={{ marginRight: '20px' }}>
+              创建H5活动
+          </Button>
             <Button type="primary" onClick={toDetail(sampleId)} style={{ marginRight: '20px' }}>
               提交需求
           </Button>
@@ -118,6 +133,11 @@ const header = props => {
           </div>
         </Form.Item>
         <div style={{ position: 'fixed', right: '0.4rem', bottom: '6%' }}>
+          <div style={{ display: 'flex', alignItems: 'center', minWidth: '1.1rem', justifyContent: 'space-between', marginBottom: '20px' }}>样例可直接使用 <span style={{ color: '#EF273A', margin: '0 0.1rem' }}>>></span>
+            <Button type="primary" onClick={toAddH5(sampleId)} >
+              创建H5活动
+              </Button>
+          </div>
           <div style={{ display: 'flex', alignItems: 'center', minWidth: '1.1rem', justifyContent: 'space-between' }}>我想办类似活动 <span style={{ color: '#EF273A', margin: '0 0.1rem' }}>>></span>
             <Button type="primary" onClick={toDetail(sampleId)} >
               提交需求

src/services/apis.js

@@ -1867,4 +1867,135 @@ export default {
       action: 'admin.qrcode.getStatisticRecordExport.get',
     },
   },
+  redPacket: {
+    update: {
+      method: 'put',
+      url: `${prefix}/redPacket/update`,
+      action: 'admin.redPacket.put',
+    },
+    detail: {
+      method: 'GET',
+      url: `${prefix}/redPacket/:id`,
+      action: 'admin.redPacket.id.get',
+    },
+    helpDetail: {
+      method: 'GET',
+      url: `${prefix}/redPacket/help/:id`,
+      action: 'admin.redPacket.help.id.get',
+    },
+    updateHelp: {
+      method: 'put',
+      url: `${prefix}/redPacket/help/:id`,
+      action: 'admin.redPacket.help.put',
+    },
+    moneyDetail: {
+      method: 'GET',
+      url: `${prefix}/redPacket/money/:id`,
+      action: 'admin.redPacket.money/id.get',
+    },
+    updateMoney: {
+      method: 'put',
+      url: `${prefix}/redPacket/money/:id`,
+      action: 'admin.redPacket.money.put',
+    },
+    listSendRecord: {
+      method: 'GET',
+      url: `${prefix}/redPacket/listSendRecord`,
+      action: 'admin.redPacket.listSendRecord.get',
+    },
+    getRedPacketRankingList: {
+      method: 'GET',
+      url: `${prefix}/redPacket/getRedPacketRankingList`,
+      action: 'admin.redPacket.getRedPacketRankingList.get',
+    },
+    getRecordByConditionList: {
+      method: 'GET',
+      url: `${prefix}/redPacket/listVisitRecordByCondition`,
+      action: 'admin.redPacket.getRecordByConditionList.get',
+    },
+    exportRedPacketRankingList: {
+      method: 'GET',
+      url: `${prefix}/redPacket/exportRedPacketRankingList`,
+      action: 'admin.redPacket.exportRedPacketRankingList.get',
+    },
+    getConsumeOrderByConditionList: {
+      method: 'GET',
+      url: `${prefix}/redPacket/listConsumeOrderByCondition`,
+      action: 'admin.redPacket.getConsumeOrderByConditionList.get',
+    },
+    exportVisitRecordByCondition: {
+      method: 'GET',
+      url: `${prefix}/redPacket/exportVisitRecordByCondition`,
+      action: 'admin.redPacket.exportVisitRecordByCondition.get',
+    },
+    // /redPacket/listVisitRecordByCondition
+    // redPacket/exportVisitRecordByCondition
+  },
+  funds: {
+    get: {
+      method: 'GET',
+      url: `${prefix}/orgAccount/get`,
+      action: 'admin.funds.listContactByCondition.get',
+    },
+    saveOrder: {
+      method: 'put',
+      url: `${prefix}/orgOrder/cz/saveOrder`,
+      action: 'admin.funds.listContactByCondition.put',
+    },
+    saveRefundOrder: {
+      method: 'put',
+      url: `${prefix}/orgOrder/refund/saveOrder`,
+      action: 'admin.funds.refund.put',
+    },
+
+    // /admin/orgOrder/cz/saveOrder
+    czlist: {
+      method: 'GET',
+      url: `${prefix}/orgOrder/cz/list`,
+      action: 'admin.funds.orgOrder.cz.list.get',
+    },
+    czexportList: {
+      method: 'GET',
+      url: `${prefix}/orgOrder/cz/exportList`,
+      action: 'admin.funds.orgOrder.cz.list.get',
+    },
+    consumeOrderByConditionlist: {
+      method: 'GET',
+      url: `${prefix}/orgOrder/listConsumeOrderByCondition`,
+      action: 'admin.funds.orgOrder.listConsumeOrderByCondition.get',
+    },
+    exportConsumeOrderByCondition: {
+      method: 'GET',
+      url: `${prefix}/orgOrder/exportConsumeOrderByCondition`,
+      action: 'admin.funds.orgOrder.exportConsumeOrderByCondition.get',
+    },
+    refundlist: {
+      method: 'GET',
+      url: `${prefix}/orgOrder/refund/list`,
+      action: 'admin.funds.orgOrder.refund.list.get',
+    },
+    refundexportList: {
+      method: 'GET',
+      url: `${prefix}/orgOrder/refund/exportList`,
+      action: 'admin.funds.orgOrder.refund.list.get',
+    },
+//     /admin/orgOrder/refund/list
+// 13.导出退款订单接口：/admin/orgOrder/refund/exportList
+    // listConsumeOrderByCondition
+    // /admin/orgOrder/cz/exportList
+    // /admin/orgOrder/cz/list
+    getByInfo: {
+      method: 'GET',
+      url: `${prefix}/orgOrder/getByInfo`,
+      action: 'admin.funds.orgOrder.getByInfo.get',
+    },
+
+    // /admin/orgOrder/getByInfo
+    list: {
+      method: 'GET',
+      url: `${prefix}/listContactByCondition`,
+      action: 'admin.funds.listContactByCondition.get',
+    },
+  },
+  // admin/redPacket/money/{id}
 }