bug

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

@@ -38,7 +38,11 @@ function RedPacket(props) {
         e.preventDefault();
         props.form.validateFields((err, values) => {
             if (!err) {
+                values.budget *= 100
+                values.minPacket *= 100
+                values.maxPacket *= 100
                 console.log(values, '------222-------')
+                // values
                 updateRedPacket(values)
             }
         },
@@ -62,20 +66,20 @@ function RedPacket(props) {
             <Row style={{ marginBottom: '40px' }}>
                 <Col span={8} style={{ paddingRight: '30px' }}>
                     <div className={Styles.redHeader}>
-                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>账户余额/元</span><span className={Styles.redHeaderTopNum}>{data.availableBalance/100}</span></div>
+                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>账户余额/元</span><span className={Styles.redHeaderTopNum}>{data.availableBalance / 100 || 0}</span></div>
                         <div className={Styles.redHeaderBottom}> <Navigate onClick={() => toRecharge()}>去充值</Navigate></div>
                     </div>
                 </Col>
                 <Col span={8} style={{ padding: '0 10px' }}>
                     <div className={Styles.redHeader}>
                         {/* packetSendedNum */}
-                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包总数量/个</span><span className={Styles.redHeaderTopNum}>{data.sendNum/100}</span></div>
+                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包总数量/个</span><span className={Styles.redHeaderTopNum}>{data.sendNum / 100 || 0}</span></div>
                         <div className={Styles.redHeaderBottom}><Navigate onClick={() => props.toDetail()}>查看详情</Navigate></div>
                     </div>
                 </Col>
                 <Col span={8} style={{ paddingLeft: '30px' }}>
                     <div className={Styles.redHeader}>
-                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包金额/元</span><span className={Styles.redHeaderTopNum}>{data.sendTotalAmount/100}</span></div>
+                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包金额/元</span><span className={Styles.redHeaderTopNum}>{data.sendTotalAmount / 100 || 0}</span></div>
                         <div className={Styles.redHeaderBottom}><Navigate onClick={() => props.toDetail(1)}>查看详情</Navigate></div>
                     </div>
                 </Col>
@@ -83,7 +87,7 @@ function RedPacket(props) {
             <Form labelCol={{ span: 8 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
                 <Form.Item label="本次红包预算/元">
                     {getFieldDecorator('budget', {
-                        initialValue: data.budget,
+                        initialValue: data.budget / 100,
                         // rules: [
                         //     {
                         //         type: 'number', message: '123'
@@ -96,14 +100,14 @@ function RedPacket(props) {
                 </Form.Item>
                 <Form.Item label="单个红包金额范围/元">
                     {getFieldDecorator('minPacket', {
-                        initialValue: data.minPacket || 3,
+                        initialValue: data.minPacket / 100 || 3,
                     })(
-                        <InputNumber min={1} max={1000} />,
+                        <InputNumber min={1} max={199} />,
                     )}~
                      {getFieldDecorator('maxPacket', {
-                        initialValue: data.maxPacket || 3,
+                        initialValue: data.maxPacket / 100 || 3,
                     })(
-                        <InputNumber min={1} max={1000} />,
+                        <InputNumber min={1} max={199} />,
                     )}
                 </Form.Item>
                 <Form.Item label="发放红包个数上限">

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

@@ -34,7 +34,7 @@ function Basic(props) {
         console.log(e, '123123')
         if (e) {
 
-            request({ ...apis.funds.saveOrder, data: { amount: e } }).then(data => {
+            request({ ...apis.funds.saveOrder, data: { amount: e * 100 } }).then(data => {
                 setAmount(data)
                 showModal('pay')
             }).catch(err => {
@@ -93,7 +93,7 @@ function Basic(props) {
             //   buildingId: rowData.buildingId,
             //   salesBatchId: rowData.salesBatchId,
         })
-        
+
     }
 
 
@@ -162,7 +162,7 @@ function Basic(props) {
             >
                 {title === '线上充值' && <Recharge value={e => handleOkRecharge(e)}></Recharge>}
                 {title === '申请退款' && <Refund balance={data.availableBalance / 100 || 0} value={e => handleOkRefund(e)}></Refund>}
-                {title === '扫码支付' && visible && <Pay amount={amount} visible={visible} value={e => handleOkRepay(e)}></Pay>}
+                {title === '扫码支付' && <Pay amount={amount} visible={visible} value={e => handleOkRepay(e)}></Pay>}
                 {title === '联系我们' && <Contact></Contact>}
 
             </Modal>

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
 import { Button, Input, Row, Col, message } from 'antd';
 import QRCode from 'qrcode.react';
 import Styles from './styles.less';
@@ -7,16 +7,10 @@ import request from '../../../../utils/request';
 
 const Recharge = props => {
 
-    const { amount, visible } = props
-    console.log(amount, visible, 'amount')
+    const { amount } = props
+    console.log(amount, 'amount')
     const { orderInfo } = amount
     console.log(orderInfo, 'orderInfo')
-    useEffect(() => {
-        getByInfo
-        // setTimeout(() => { getByInfo() }, 1000)
-    }, [])
-
-
     const getByInfo = setInterval(() => {
 
 
@@ -26,15 +20,15 @@ const Recharge = props => {
 
                 // clearInterval(getByInfo)
                 // props.value()
-                if (!visible) { clearInterval(getByInfo) }
+                // if (!visible) { clearInterval(getByInfo) }
             } else if (data.tradingStatus === 'success') {
                 mmessage.info('充值成功')
-                
+
                 props.value('success')
                 clearInterval(getByInfo)
             } else {
                 mmessage.info('充值失败')
-                
+
                 props.value('fail')
                 clearInterval(getByInfo)
             }
@@ -47,6 +41,15 @@ const Recharge = props => {
     }, 1000)
 
 
+    useEffect(() => {
+        console.log(props.visible, 'props.visible')
+
+        return () => clearInterval(getByInfo);
+        // setTimeout(() => { getByInfo() }, 1000)
+    }, [props.visible])
+
+
+
     // {
     //     request({ ...apis.funds.getByInfo, params: { orderId: orderInfo.orderId } }).then(data => {
     //         if (data.tradingStatus === 'processing') {
@@ -78,7 +81,7 @@ const Recharge = props => {
     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>
+                <span onClick={props.value}>充值金额{amount.amount / 100 || 0}元</span><span style={{ marginLeft: '80px' }}>微信商户手续费率{amount.mchPayRate}</span><span style={{ marginLeft: '80px' }}>手续费{amount.serviceFee / 100 || 0}元</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' }}>
@@ -92,7 +95,7 @@ const Recharge = props => {
                 </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 style={{ lineHeight: '43px', height: '43px', marginBottom: '5px' }}><span style={{ fontSize: '32px', fontWeight: '600', color: '#EF273A' }}>￥{amount.realAmount / 100 || 0}</span><span style={{ marginLeft: '5px' }}>应付金额</span></p>
                         <p>仅支持微信支付</p>
                     </div>
 

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

@@ -109,7 +109,7 @@ function RechargeOrder(props) {
             dataIndex: 'certificateUrlList',
             key: 'certificateUrlList',
             align: 'center',
-            render: (x, row) => <>{`${row.certificateUrlList == null ? '' :<Navigate onClick={() => openImg(x)}>查看</Navigate> }`}</>,
+            render: (x, row) => <>{row.certificateUrlList == null ? '' : <Navigate onClick={() => openImg(x)}>查看</Navigate>}</>,
         },
         {
             title: '充值状态',

src/pages/h5SampleManager/h5Sample/addH5.jsx

@@ -8,12 +8,10 @@ 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 [visible, setVisible] = useState(false)
     // const sampleName = props.location.query.sampleName;
     // const [sampleData, setSampleData] = useState({})
 
@@ -53,6 +51,8 @@ const header = props => {
                 request({ ...apis.activity.addtaDrainage, data: { ...values } }).then(data => {
                     message.info('操作成功')
 
+
+
                 }).catch(err => {
                     message.error(err.msg || err.message)
                 })
@@ -68,6 +68,55 @@ const header = props => {
         });
     }
 
+    function disabledDate(current) {
+        // Can not select days before today and today 
+        console.log(current, 'current')
+        // return current && current < moment().startOf('day');
+        return current < moment().add(-1, 'd');
+    }
+
+    function disabledDateTime(current) {
+        // Can not select days before today and today 
+        console.log(current, 'disabledDateTime')
+        return current && current < moment();
+    }
+
+    const disabledHours = () => {
+        const hours = [];
+        for (let i = 0; i < moment().hour(); i++) {
+            hours.push(i);
+        }
+        return hours;
+    };
+
+    const disabledMinutes = currentDate => {
+        const currentMinute = moment().minute();
+        const currentHour = moment(currentDate).hour();
+        const minutes = [];
+        if (currentHour === moment().hour()) {
+            for (let i = 0; i < currentMinute; i++) {
+                minutes.push(i);
+            }
+        }
+        return minutes;
+    };
+
+    const disabledTime = dateTime => {
+        if (moment(dateTime).isBefore(moment(), 'day')) {
+            return {
+                disabledHours: () => [],
+                disabledMinutes: () => [],
+            };
+        }
+
+        if (moment(dateTime).isSame(moment(), 'day')) {
+            return {
+                disabledHours: () => disabledHours(dateTime),
+                disabledMinutes: () => disabledMinutes(dateTime),
+            };
+        }
+    };
+
     const { getFieldDecorator } = props.form;
 
     return (
@@ -92,6 +141,8 @@ const header = props => {
                     })(
                         <DatePicker
                             showTime={{ format: 'HH:mm:ss' }}
+                            disabledDate={disabledDate}
+                            disabledTime={disabledTime}
                         />,
                     )}
                 </Form.Item>
@@ -130,6 +181,19 @@ const header = props => {
             <Button onClick={() => router.go(-1)}>取消</Button>
                 </Form.Item>
             </Form>
+            {/* <Button onClick={() => setVisible(true)}>234</Button> */}
+            <Modal
+                title="新增成功"
+                visible={visible}
+                // onOk={handleOk}
+                // confirmLoading={confirmLoading}
+                onCancel={() => setVisible(false)}
+                footer={null}
+            // width="1000px"
+            // maskClosable={false}
+            >
+                建议修改内容以适合您的项目，若有红包等需要消费的内容，请到资金管理中查看余额是否充足
+            </Modal>
         </>
     )
 }

src/pages/h5SampleManager/h5Sample/detail.jsx

@@ -121,11 +121,11 @@ const header = props => {
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
           <div style={{ margin: '0.16rem 0 0.06rem' }}>
-            <AuthButton name="admin.h5Sample.activity.add" noRight={null}>
+            {!!demandData.h5TemplateId && <AuthButton name="admin.h5Sample.activity.add" noRight={null}>
               <Button type="primary" onClick={toAddH5(sampleId)} style={{ marginRight: '20px' }}>
                 创建H5活动
               </Button>
-            </AuthButton>
+            </AuthButton>}
             <Button type="primary" onClick={toDetail(sampleId)} style={{ marginRight: '20px' }}>
               提交需求
           </Button>
@@ -135,13 +135,13 @@ 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>
+          {!!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}>
               <Button type="primary" onClick={toAddH5(sampleId)} >
                 创建H5活动
               </Button>
             </AuthButton>
-          </div>
+          </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)} >
               提交需求