bug

config/config.js

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

src/pages/fundManagement/AccountDetail.jsx

@@ -17,21 +17,25 @@ import { regFenToYuan } from '@/utils/money';
 function header(props) {
     const orgId = props.location.query.id || ''
     const [newsData, setNewsData] = useState({})
-    if (orgId) {
-        useEffect(() => {
-            getDetail(orgId);
-        }, [])
 
-        // 查询详情
-        const getDetail = (orgId) => {
-            request({
-                ...apis.fund.accountDetail,
-                urlData: { id: orgId }
-            }).then((data) => {
-                console.log(data)
-                setNewsData(data)
-            })
+    useEffect(() => {
+        if (orgId) {
+            getDetail(orgId);
         }
+    }, [])
+
+    // 查询详情
+
+
+
+    const getDetail = orgId => {
+        request({
+            ...apis.fund.accountDetail,
+            urlData: { id: orgId },
+        }).then(data => {
+            console.log(data)
+            setNewsData(data)
+        })
     }
     const [tab, changeTab] = useState('basic')
 
@@ -108,9 +112,9 @@ function header(props) {
                     <div>
                         <XForm buttonVisible={false} fields={fields}></XForm>
                         <div style={{ paddingLeft: '30%', marginTop: '30px' }}>
-                            <Button htmlType="submit" type="primary" style={{ marginRight: '10%' }}>
-                                <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(orgId)} accountId={newsData.accountId || ''} />
-                            </Button>
+                            {/* <Button htmlType="submit" type="primary" style={{ marginRight: '10%', padding: '0' }}> */}
+                                <Recharge type="primary" orgId={newsData.orgId || ''} onClick={() => getDetail(orgId)} accountId={newsData.accountId || ''} />
+                            {/* </Button> */}
                             <Button onClick={() => router.go(-1)}>返回</Button>
                         </div>
                     </div>

src/pages/fundManagement/ConsumeOrder.jsx

@@ -41,13 +41,13 @@ function header(props) {
                 let { LocalDate, ...submitValue } = values
                 if (null != LocalDate && LocalDate.length > 0) {
                     const [startDate, endDate] = LocalDate
-                    submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
-                    submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+                    submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+                    submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
                 } else {
                     submitValue.startDate = null
                     submitValue.endDate = null
                 }
-                getList({ pageNum: 1, pageSize: 10, orderType: 'redPacket', ...submitValue })
+                getList({ pageNum: 1, pageSize: 10, orderType: 'RedPacket', ...submitValue })
             }
         });
     }
@@ -56,13 +56,13 @@ function header(props) {
         let { LocalDate, ...submitValue } = props.form.getFieldsValue()
         if (null != LocalDate && LocalDate.length > 0) {
             const [startDate, endDate] = LocalDate
-            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
-            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+            submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+            submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
         } else {
             submitValue.startDate = null
             submitValue.endDate = null
         }
-        getList({ pageNum: pageNumber, pageSize: 10, orderType: 'redPacket', ...submitValue })
+        getList({ pageNum: pageNumber, pageSize: 10, orderType: 'RedPacket', ...submitValue })
     }
 
     /**
@@ -136,20 +136,20 @@ function header(props) {
 
     function handleReset() {
         props.form.resetFields();
-        getList({ pageNum: 1, pageSize: 10, orderType: 'redPacket' })
+        getList({ pageNum: 1, pageSize: 10, orderType: 'RedPacket' })
     }
     // 导出
     const exportList = () => {
         let { LocalDate, ...submitValue } = props.form.getFieldsValue()
         if (null != LocalDate && LocalDate.length > 0) {
             const [startDate, endDate] = LocalDate
-            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
-            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+            submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+            submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
         } else {
             submitValue.startDate = null
             submitValue.endDate = null
         }
-        request({ ...apis.fund.consumeOrderExport, params: { orderType: 'redPacket', orgId, ...submitValue } }).then(data => {
+        request({ ...apis.fund.consumeOrderExport, params: { orderType: 'RedPacket', orgId, ...submitValue } }).then(data => {
             if (!data) {
                 return
             }

src/pages/fundManagement/RechargeOrder.jsx

@@ -41,8 +41,8 @@ function header(props) {
                 let { LocalDate, ...submitValue } = values
                 if (null != LocalDate && LocalDate.length > 0) {
                     const [startDate, endDate] = LocalDate
-                    submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
-                    submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+                    submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+                    submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
                 } else {
                     submitValue.startDate = null
                     submitValue.endDate = null
@@ -52,12 +52,12 @@ function header(props) {
         });
     }
 
-    const changePageNum = (pageNumber) => {
-        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
-        if (null != LocalDate && LocalDate.length > 0) {
+    const changePageNum = pageNumber => {
+        const { LocalDate, ...submitValue } = props.form.getFieldsValue()
+        if (LocalDate != null && LocalDate.length > 0) {
             const [startDate, endDate] = LocalDate
-            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
-            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+            submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+            submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
         } else {
             submitValue.startDate = null
             submitValue.endDate = null
@@ -156,8 +156,8 @@ function header(props) {
         let { LocalDate, ...submitValue } = props.form.getFieldsValue()
         if (null != LocalDate && LocalDate.length > 0) {
             const [startDate, endDate] = LocalDate
-            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
-            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+            submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+            submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
         } else {
             submitValue.startDate = null
             submitValue.endDate = null

src/pages/fundManagement/RefundOrder.jsx

@@ -49,8 +49,8 @@ function header(props) {
                 let { LocalDate, ...submitValue } = values
                 if (null != LocalDate && LocalDate.length > 0) {
                     const [startDate, endDate] = LocalDate
-                    submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
-                    submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+                    submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+                    submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
                 } else {
                     submitValue.startDate = null
                     submitValue.endDate = null
@@ -64,8 +64,8 @@ function header(props) {
         let { LocalDate, ...submitValue } = props.form.getFieldsValue()
         if (null != LocalDate && LocalDate.length > 0) {
             const [startDate, endDate] = LocalDate
-            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
-            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+            submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+            submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
         } else {
             submitValue.startDate = null
             submitValue.endDate = null
@@ -244,8 +244,8 @@ function header(props) {
         const { LocalDate, ...submitValue } = props.form.getFieldsValue()
         if (null != LocalDate && LocalDate.length > 0) {
             const [startDate, endDate] = LocalDate
-            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
-            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+            submitValue.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00')}Z`;
+            submitValue.endDate = `${moment(endDate).format('YYYY-MM-DDT23:59:59')}Z`;
         } else {
             submitValue.startDate = null
             submitValue.endDate = null
@@ -290,7 +290,9 @@ function header(props) {
                 onOk={() => orderRefund()}
                 onCancel={() => handleCancel()}
                 footer={[
-                    <Button key="back" size="large"><Refund orgId={row.orgId} accountId={row.accountId} amount={row.amount || '0'} onClick={orderRefund} orderId={row.orderId} /></Button>,
+                    // <Button key="back" size="large">
+                    <Refund key="back" size="large" orgId={row.orgId} accountId={row.accountId} amount={row.amount || '0'} onClick={orderRefund} orderId={row.orderId} />,
+                    // {/* </Button>, */}
                     //     <span style={{ color: '#FF925C', cursor: 'pointer', display: 'inline-block' }} >
 
                     // </span>
@@ -338,7 +340,7 @@ function header(props) {
                 <Form.Item>
                     <span style={{ marginRight: '10px' }}>退款时间段：</span>
                     {getFieldDecorator('LocalDate')(
-                        <RangePicker placeholder={['开始时间', '结束时间']} />
+                        <RangePicker placeholder={['开始时间', '结束时间']} />,
                     )}
                 </Form.Item>
                 <Form.Item>

src/pages/fundManagement/components/Recharge.jsx

@@ -46,12 +46,15 @@ const SelectContact = props => {
 
 
     }
-
+// lineHeight: '32px'
     const { getFieldDecorator } = props.form;
     const regMoney = /^(\d+|\d+\.\d{1,2})$/;
     return (
-        <div>
-            <span onClick={() => setVisible(true)}>{group.groupName}</span>
+        <>
+            <Button onClick={() => setVisible(true)} type="primary" style={{ marginRight: '10%'}}>{group.groupName}
+                                {/* <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(orgId)} accountId={newsData.accountId || ''} /> */}
+                            </Button>
+            {/* <div onClick={() => setVisible(true)} style={{ padding: '0 15px', width: '100%', height: '100%' }}>{group.groupName}</div> */}
 
             <Modal
                 visible={visible}
@@ -95,7 +98,7 @@ const SelectContact = props => {
 
 
             </Modal>
-        </div>
+        </>
     )
 }
 

src/pages/fundManagement/components/Refund.jsx

@@ -58,8 +58,10 @@ const SelectContact = props => {
     const balance = regFenToYuan(props.realBalance)
     const regMoney = /^(\d+|\d+\.\d{1,2})$/;
     return (
-        <div>
-            <span onClick={() => setVisible(true)}>{group.groupName}</span>
+        <>
+
+            <Button key="back" size="large" onClick={() => setVisible(true)}>{group.groupName}</Button>
+            {/* <span onClick={() => setVisible(true)}>{group.groupName}</span> */}
 
             <Modal
                 visible={visible}
@@ -81,7 +83,7 @@ const SelectContact = props => {
                         </Form.Item>
                         <Form.Item label="退款凭证" help="可上传银行转账截图、微信退款订单等截图作为查账线索">
                             {getFieldDecorator('certificateList', {
-                                rules: [{ required: false }],
+                                rules: [{ required: true }],
                             })(
                                 <Upload />,
                             )}
@@ -90,7 +92,7 @@ const SelectContact = props => {
                 </div>
 
             </Modal>
-        </div>
+        </>
     )
 }
 

src/pages/fundManagement/components/SelectContact.jsx

@@ -3,6 +3,7 @@ import { Form, Modal, Button, Table, message, Input, Icon, Pagination } from 'an
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import router from 'umi/router';
+import styles from './style.less'
 
 const { Column, ColumnGroup } = Table;
 const SelectContact = props => {
@@ -126,7 +127,11 @@ const SelectContact = props => {
 
     return (
         <div >
-            <div style={{ color: '#fff', padding: '0 15px', height: '32px', lineHeight: '32px' }} onClick={() => setVisible(true)}>{group.groupName}</div>
+
+            <Button type="danger" onClick={() => setVisible(true)} className={styles.addBtn} >{group.groupName}
+                {/* <SelectContact type="danger" onClick={() => getList({ pageNum: 1, pageSize: 10 })} /> */}
+            </Button>
+            {/* <div style={{ color: '#fff', padding: '0 15px', height: '32px', lineHeight: '32px' }} onClick={() => setVisible(true)}>{group.groupName}</div> */}
 
             <Modal
                 title="选择联系人"

src/pages/fundManagement/components/Swiper.jsx

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

src/pages/fundManagement/components/style.less

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

src/pages/fundManagement/components/swiper.less

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