bug

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

@@ -101,10 +101,10 @@ function CustomerData(props) {
         },
         {
             title: '访问时间',
-            dataIndex: 'createDate',
-            key: 'createDate',
+            dataIndex: 'visitTime',
+            key: 'visitTime',
             align: 'center',
-            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+            render: (x, row) => <><span>{`${moment(row.visitTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
         },
         {
             title: '分享人昵称',

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

@@ -39,7 +39,7 @@ function Basic(props) {
         }
         if (e) {
 
-            request({ ...apis.funds.saveOrder, data: { amount: e * 100 } }).then(data => {
+            request({ ...apis.funds.saveOrder, data: { amount: Math.round(e * 100) } }).then(data => {
                 setAmount(data)
                 showModal('pay')
             }).catch(err => {
@@ -52,10 +52,10 @@ function Basic(props) {
     };
     // data: { amount: e }
     const handleOkRefund = e => {
-        console.log(e, '123123')
+        console.log(e, e * 100, '123123')
 
         if (e) {
-            request({ ...apis.funds.saveRefundOrder, data: { amount: e } }).then(data => {
+            request({ ...apis.funds.saveRefundOrder, data: { amount: Math.round(e * 100) } }).then(data => {
                 message.info('申请退款成功')
                 setvisiblea(false)
             }).catch(err => {

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

@@ -112,7 +112,7 @@ function RechargeOrder(props) {
             dataIndex: 'createDate',
             key: 'createDate',
             align: 'center',
-            render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+            render: (x, row) => <><span>{`${moment(row.visitTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
         },
         {
             title: '接收人手机号',
@@ -263,7 +263,7 @@ function RechargeOrder(props) {
                     </Form.Item>
                     <Form.Item label="姓名">
 
-                        <span>{modalData.name}</span>
+                        <span>{modalData.name || modalData.nickname}</span>
 
                     </Form.Item>
                     <Form.Item label="手机号">

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

@@ -44,6 +44,13 @@ const Recharge = props => {
         })
     }, 1000)
 
+    useEffect(() => {
+        console.log(props.visible, 'props.visible')
+
+        return () => clearInterval(getByInfo);
+        // setTimeout(() => { getByInfo() }, 1000)
+    }, [props.visible])
+
     return (
         <>
             <div style={{ fontSize: '18px', fontWeight: '400', color: '#333333' }}>

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

@@ -20,7 +20,7 @@ const Recharge = props => {
         if (e.target.value <= 0) return
         if (!(/^[0-9]{1,5}([.][0-9]{1,2})?$/.test(e.target.value))) return
         if (e.target.value > balance) { setValue(balance); return }
-        // console.log('changed', e.target.value);
+        console.log('changed', e.target.value);
         setValue(e.target.value)
 
     }
@@ -35,7 +35,7 @@ const Recharge = props => {
                 </Col>
             </Row>
             <div style={{ textAlign: 'center', marginTop: '40px' }}>
-                <Button className={Styles.btn} type="primary" htmlType="submit" onClick={() => props.value(value * 100)}>确认申请</Button>
+                <Button className={Styles.btn} type="primary" htmlType="submit" onClick={() => props.value(value)}>确认申请</Button>
 
             </div>
         </>

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

@@ -1,8 +1,5 @@
 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/close2.png';
 import classNames from 'classnames';
@@ -83,3 +80,49 @@ class ShowVoucher extends React.Component {
 
 
 export default ShowVoucher
+
+
+
+
+
+// import React, { useState, useEffect } from 'react';
+// import Carousel, { Modal, ModalGateway } from 'react-images';
+
+// const ShowVoucher = props => {
+//     const { bannerList = [], open, onClose } = props;
+//     const [modalIsOpen, setModalIsOpen] = useState(open)
+//     useEffect(() => {
+//         setModalIsOpen(open)
+//     }, [bannerList, open])
+
+//     const toggleModal = () => {
+//         setModalIsOpen(!modalIsOpen)
+//         if (typeof onClose === 'function') {
+//             onClose()
+//         }
+
+//     }
+//     const styleInit = {
+//         header: (base, state) => ({ //头部样式
+//             position: 'absolute',
+//             top: 90,
+//             right: 90,
+//             zIndex: 9999,
+//         }),
+//         view: (base, state) => ({
+//             textAlign: 'center',
+//             height: state.isFullscreen ? '100%' : 600  //当点击全屏的时候图片样式
+//         })
+//     }
+//     return (
+//         <ModalGateway >
+//             {modalIsOpen ? (
+//                 <Modal onClose={toggleModal} >
+//                     <Carousel views={bannerList} styles={styleInit} />
+//                 </Modal>
+//             ) : null}
+//         </ModalGateway>
+//     );
+
+// }
+

src/pages/h5SampleManager/h5Sample/addH5.jsx

@@ -75,7 +75,7 @@ const header = props => {
         // Can not select days before today and today 
         console.log(current, 'current')
         // return current && current < moment().startOf('day');
-        return current < moment().add(-1, 'd');
+        return current < moment().add(0, 'd');
     }
 
     function disabledDateTime(current) {
@@ -171,6 +171,7 @@ const header = props => {
                             showTime={{ format: 'HH:mm:ss' }}
                             disabledDate={disabledDate}
                             disabledTime={disabledTime}
+                            showToday={false}
                         />,
                     )}
                 </Form.Item>

src/pages/h5SampleManager/h5Sample/detail.jsx

@@ -135,13 +135,13 @@ const header = props => {
           </div>
         </Form.Item>
         <div style={{ position: 'fixed', right: '0.4rem', bottom: '6%' }}>
-          {!!demandData.h5TemplateId && <div style={{ display: 'flex', alignItems: 'center', minWidth: '1.1rem', justifyContent: 'space-between', marginBottom: '20px' }}>样例可直接使用 <span style={{ color: '#EF273A', margin: '0 0.1rem' }}>>></span>
-            <AuthButton name="admin.h5Sample.activity.add" noRight={null}>
+          {!!demandData.h5TemplateId && <AuthButton name="admin.h5Sample.activity.add" noRight={null}>
+            <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>
-            </AuthButton>
-          </div>}
+            </div>
+          </AuthButton>}
           <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)} >
               提交需求