bug

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

@@ -5,11 +5,15 @@ import moment from 'moment';
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 
+const { RangePicker } = DatePicker
+
 const formateValue = v => {
+    const { date, ...values } = v
+    console.log(date)
     return {
-        ...v,
-        startTime: v.startTime ? `${v.startTime.format('YYYY-MM-DDT00:00:00')}Z` : undefined,
-        endTime: v.endTime ? `${v.endTime.format('YYYY-MM-DDT23:59:59')}Z` : undefined,
+        ...values,
+        startTime: date[0] ? `${date[0].format('YYYY-MM-DDT00:00:00')}Z` : undefined,
+        endTime: date[1] ? `${date[1].format('YYYY-MM-DDT23:59:59')}Z` : undefined,
     }
 }
 
@@ -25,6 +29,16 @@ function CustomerData(props) {
     // 查询列表
 
     const getList = params => {
+        // const { LocalDate, ...values } = params
+        // if (LocalDate != null && LocalDate.length > 0) {
+        //     const [refundStartTime, refundEndTime] = LocalDate
+        //     values.refundStartTime = `${moment(refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        //     values.refundEndTime = `${moment(refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // } else {
+        //     values.refundStartTime = null
+        //     values.refundEndTime = null
+        // }
+        console.log(params, 'params')
         request({ ...apis.redPacket.getRecordByConditionList, params: { ...params, activityId: id, drainageId } }).then(data => {
             setData(data)
         })
@@ -94,9 +108,10 @@ function CustomerData(props) {
         },
         {
             title: '分享人昵称',
-            dataIndex: 'sharePersonName',
-            key: 'sharePersonName',
+            dataIndex: 'sharePersonNickname',
+            key: 'sharePersonNickname',
             align: 'center',
+            render: (x, row) => <><span>{row.sharePersonNickname || row.sharePersonName}</span></>,
         },
         {
             title: '分享人手机号',
@@ -121,8 +136,8 @@ function CustomerData(props) {
     }
 
     const exportReport = () => {
-
-        request({ ...apis.redPacket.exportVisitRecordByCondition, responseType: 'blob', params: { ...props.form.getFieldsValue(), activityId: id, drainageId } }).then(data => {
+        const params = props.form.getFieldsValue()
+        request({ ...apis.redPacket.exportVisitRecordByCondition, responseType: 'blob', params: { ...formateValue(params), activityId: id, drainageId } }).then(data => {
             download(data)
         }).catch()
     }
@@ -140,7 +155,14 @@ function CustomerData(props) {
                         />,
                     )}
                 </Form.Item>
+
                 <Form.Item>
+                    {getFieldDecorator('date')(
+                        <RangePicker placeholder={['访问开始时间', '访问结束时间']} />,
+                    )}
+                </Form.Item>
+
+                {/* <Form.Item>
                     {getFieldDecorator('startTime')(
                         <DatePicker placeholder="访问开始时间" />,
                     )}
@@ -149,7 +171,7 @@ function CustomerData(props) {
                     {getFieldDecorator('endTime')(
                         <DatePicker placeholder="访问结束时间" />,
                     )}
-                </Form.Item>
+                </Form.Item> */}
                 <Form.Item>
                     {getFieldDecorator('sharePersonPhone')(
                         <Input

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

@@ -8,6 +8,8 @@ import Navigate from '@/components/Navigate';
 import AuthButton from '@/components/AuthButton'
 
 const { Option } = Select
+const { RangePicker } = DatePicker
+
 
 function RechargeOrder(props) {
 
@@ -22,14 +24,24 @@ function RechargeOrder(props) {
     // 查询列表
 
     const getList = params => {
-        if (params.startTime) {
-            params.startTime = `${moment(params.startTime).format('YYYY-MM-DDT00:00:00')}Z`;
-        }
-        if (params.endTime) {
-            params.endTime = `${moment(params.endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+
+        const { LocalDate, ...values } = params
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [startTime, endTime] = LocalDate
+            values.startTime = `${moment(startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.endTime = `${moment(endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.startTime = null
+            values.endTime = null
         }
-        console.log("请求数据", params)
-        request({ ...apis.funds.consumeOrderByConditionlist, params: { ...params, consumeType: 'RedPacket' } }).then(data => {
+        // if (params.startTime) {
+        //     params.startTime = `${moment(params.startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (params.endTime) {
+        //     params.endTime = `${moment(params.endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        // console.log("请求数据", params)
+        request({ ...apis.funds.consumeOrderByConditionlist, params: { ...values, consumeType: 'RedPacket' } }).then(data => {
             setData(data)
         })
     }
@@ -134,13 +146,23 @@ function RechargeOrder(props) {
 
     const exportReport = () => {
         const requestParams = props.form.getFieldsValue();
-        if (requestParams.startTime) {
-            requestParams.startTime = `${moment(requestParams.startTime).format('YYYY-MM-DDT00:00:00')}Z`;
-        }
-        if (requestParams.endTime) {
-            requestParams.endTime = `${moment(requestParams.endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+
+        const { LocalDate, ...values } = requestParams
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [startTime, endTime] = LocalDate
+            values.startTime = `${moment(startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.endTime = `${moment(endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.startTime = null
+            values.endTime = null
         }
-        request({ ...apis.funds.exportConsumeOrderByCondition, responseType: 'blob', params: { ...requestParams, consumeType: 'RedPacket' } }).then(data => {
+        // if (requestParams.startTime) {
+        //     requestParams.startTime = `${moment(requestParams.startTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (requestParams.endTime) {
+        //     requestParams.endTime = `${moment(requestParams.endTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        request({ ...apis.funds.exportConsumeOrderByCondition, responseType: 'blob', params: { ...values, consumeType: 'RedPacket' } }).then(data => {
             download(data)
         }).catch()
     }
@@ -158,6 +180,15 @@ function RechargeOrder(props) {
                         />,
                     )}
                 </Form.Item>
+
+
+                <Form.Item>
+                    {getFieldDecorator('LocalDate')(
+                        <RangePicker placeholder={['消费开始时间', '消费结束时间']} />,
+                    )}
+                </Form.Item>
+                {/* 
+
                 <Form.Item>
                     {getFieldDecorator('startTime')(
                         <DatePicker placeholder="消费开始时间" />,
@@ -167,7 +198,7 @@ function RechargeOrder(props) {
                     {getFieldDecorator('endTime')(
                         <DatePicker placeholder="消费结束时间" />,
                     )}
-                </Form.Item>
+                </Form.Item> */}
                 <Form.Item>
                     {getFieldDecorator('tradingStatus')(
                         <Select style={{ width: '180px' }} placeholder="消费状态">
@@ -222,12 +253,12 @@ function RechargeOrder(props) {
                 <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }}>
                     <Form.Item label="昵称">
 
-                        <span>{modalData.nickName}</span>
+                        <span>{modalData.nickname}</span>
 
                     </Form.Item>
                     <Form.Item label="头像">
 
-                        <img src={modalData.avatarurl} alt="" />
+                        <img src={modalData.avatarurl} alt="" width="100px" height="100px" />
 
                     </Form.Item>
                     <Form.Item label="姓名">

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

@@ -8,6 +8,8 @@ import request from '../../../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import ShowVoucher from './ShowVoucher';
 
+const { RangePicker } = DatePicker
+
 
 const { Option } = Select
 
@@ -29,14 +31,25 @@ function RechargeOrder(props) {
     // 查询列表
 
     const getList = params => {
-        if (params.payStartTime) {
-            params.payStartTime = `${moment(params.payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
-        }
-        if (params.payEndTime) {
-            params.payEndTime = `${moment(params.payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+
+
+        const { LocalDate, ...values } = params
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [payStartTime, payEndTime] = LocalDate
+            values.payStartTime = `${moment(payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.payEndTime = `${moment(payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.payStartTime = null
+            values.payEndTime = null
         }
+        // if (params.payStartTime) {
+        //     params.payStartTime = `${moment(params.payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (params.payEndTime) {
+        //     params.payEndTime = `${moment(params.payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
 
-        request({ ...apis.funds.czlist, params: { ...params } }).then(data => {
+        request({ ...apis.funds.czlist, params: { ...values } }).then(data => {
             setData(data)
         })
     }
@@ -147,13 +160,24 @@ function RechargeOrder(props) {
 
     const exportReport = () => {
         const requestParams = props.form.getFieldsValue();
-        if (requestParams.payStartTime) {
-            requestParams.payStartTime = `${moment(requestParams.payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
-        }
-        if (requestParams.payEndTime) {
-            requestParams.payEndTime = `${moment(requestParams.payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+
+        
+        const { LocalDate, ...values } = requestParams
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [payStartTime, payEndTime] = LocalDate
+            values.payStartTime = `${moment(payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.payEndTime = `${moment(payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.payStartTime = null
+            values.payEndTime = null
         }
-        request({ ...apis.funds.czexportList, responseType: 'blob', params: { ...requestParams } }).then(data => {
+        // if (requestParams.payStartTime) {
+        //     requestParams.payStartTime = `${moment(requestParams.payStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (requestParams.payEndTime) {
+        //     requestParams.payEndTime = `${moment(requestParams.payEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        request({ ...apis.funds.czexportList, responseType: 'blob', params: { ...values } }).then(data => {
             download(data)
         }).catch()
     }
@@ -169,7 +193,15 @@ function RechargeOrder(props) {
                         />,
                     )}
                 </Form.Item>
+
                 <Form.Item>
+                    {getFieldDecorator('LocalDate')(
+                        <RangePicker placeholder={['支付开始时间', '支付结束时间']} />,
+                    )}
+                </Form.Item>
+
+
+                {/* <Form.Item>
                     {getFieldDecorator('payStartTime')(
                         <DatePicker placeholder="支付开始时间" />,
                     )}
@@ -178,7 +210,7 @@ function RechargeOrder(props) {
                     {getFieldDecorator('payEndTime')(
                         <DatePicker placeholder="支付结束时间" />,
                     )}
-                </Form.Item>
+                </Form.Item> */}
                 <Form.Item>
                     {getFieldDecorator('isOffline')(
                         <Select style={{ width: '180px' }} placeholder="充值方式">

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

@@ -12,6 +12,8 @@ import ShowVoucher from './ShowVoucher';
 
 const { Option } = Select
 
+const { RangePicker } = DatePicker
+
 function RechargeOrder(props) {
 
     // const [taNoticeList, setTaNoticeList] = useState([])
@@ -25,13 +27,23 @@ function RechargeOrder(props) {
     // 查询列表
 
     const getList = params => {
-        if (params.refundStartTime) {
-            params.refundStartTime = `${moment(params.refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
-        }
-        if (params.refundEndTime) {
-            params.refundEndTime = `${moment(params.refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+
+        const { LocalDate, ...values } = params
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [refundStartTime, refundEndTime] = LocalDate
+            values.refundStartTime = `${moment(refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.refundEndTime = `${moment(refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.refundStartTime = null
+            values.refundEndTime = null
         }
-        request({ ...apis.funds.refundlist, params: { ...params } }).then(data => {
+        // if (params.refundStartTime) {
+        //     params.refundStartTime = `${moment(params.refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (params.refundEndTime) {
+        //     params.refundEndTime = `${moment(params.refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        request({ ...apis.funds.refundlist, params: { ...values } }).then(data => {
             setData(data)
         })
     }
@@ -149,13 +161,22 @@ function RechargeOrder(props) {
 
     const exportReport = () => {
         const requestParams = props.form.getFieldsValue();
-        if (requestParams.refundStartTime) {
-            requestParams.refundStartTime = `${moment(requestParams.refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
-        }
-        if (requestParams.refundEndTime) {
-            requestParams.refundEndTime = `${moment(requestParams.refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        const { LocalDate, ...values } = requestParams
+        if (LocalDate != null && LocalDate.length > 0) {
+            const [refundStartTime, refundEndTime] = LocalDate
+            values.refundStartTime = `${moment(refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+            values.refundEndTime = `${moment(refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        } else {
+            values.refundStartTime = null
+            values.refundEndTime = null
         }
-        request({ ...apis.funds.refundexportList, responseType: 'blob', params: { ...requestParams } }).then(data => {
+        // if (requestParams.refundStartTime) {
+        //     requestParams.refundStartTime = `${moment(requestParams.refundStartTime).format('YYYY-MM-DDT00:00:00')}Z`;
+        // }
+        // if (requestParams.refundEndTime) {
+        //     requestParams.refundEndTime = `${moment(requestParams.refundEndTime).format('YYYY-MM-DDT23:59:59')}Z`;
+        // }
+        request({ ...apis.funds.refundexportList, responseType: 'blob', params: { ...values } }).then(data => {
             download(data)
         }).catch()
     }
@@ -173,7 +194,13 @@ function RechargeOrder(props) {
                         />,
                     )}
                 </Form.Item>
+
                 <Form.Item>
+                    {getFieldDecorator('LocalDate')(
+                        <RangePicker placeholder={['退款开始时间', '退款结束时间']} />,
+                    )}
+                </Form.Item>
+                {/* <Form.Item>
                     {getFieldDecorator('refundStartTime')(
                         <DatePicker placeholder="退款开始时间" />,
                     )}
@@ -182,7 +209,7 @@ function RechargeOrder(props) {
                     {getFieldDecorator('refundEndTime')(
                         <DatePicker placeholder="退款结束时间" />,
                     )}
-                </Form.Item>
+                </Form.Item> */}
                 <Form.Item>
                     {getFieldDecorator('auditStatus')(
                         <Select style={{ width: '180px' }} placeholder="退款状态">

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

@@ -1,40 +1,13 @@
-import React, { useState, useRef, useEffect } from "react";
+import React 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 closeImg from '../../../../assets/close2.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);
@@ -93,8 +66,9 @@ class ShowVoucher extends React.Component {
                         <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 key={'swiper' + index} className={classNames(['swiper-slide', styles.carouselItem])} >
+                                        {/* <img style={{ width: '100%', borderRadius: '10px' }} src={item} alt="" /> */}
+                                        <img style={{ maxHeight: '504px', borderRadius: '10px' }} src={item} alt="" />
                                     </div>,
                                 )}
                             </div>

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

@@ -33,6 +33,17 @@ line-height: 97px;
     }
   }
 
+  .mask{
+    width: 100vw;
+    height: 100vh;
+    // max-height: 600px;
+    background-color: rgba(0,0,0,0.32);
+    position: fixed;
+    z-index: 999;
+    top: 0;
+    left: 0;
+}
+
   .btn {
     width: 140px;
     height: 45px;
@@ -97,4 +108,23 @@ float: left;
         right: -22px;
         z-index: 9;
     }
+}
+
+.carousel {
+  width: 32vw;
+  min-width: 757px;
+  height: 21.3vw;
+  min-height: 504px;
+  border-radius: 10px;
+  text-align: center;
+  
+  .carouselItem{
+      width: 32vw;
+      min-width: 757px;
+      height: 21.3vw;
+      min-height: 504px;
+      position: relative;
+      display: inline-block;
+     
+  }
 }

src/pages/funds/financialContact/index.jsx

@@ -57,7 +57,7 @@ function financialContact(props) {
             dataIndex: 'avatar',
             key: 'avatar',
             align: 'center',
-            render: (x, row) => <img src={row.avatar} alt="" width="50px"></img >,
+            render: (x, row) => <img src={row.avatar} alt="" width="93px" height="93px"></img >,
         },
         {
             title: '固话',