bug

src/pages/activity/drainage/DrainageList.jsx

@@ -339,7 +339,7 @@ const header = props => {
             { required: true, message: '请选择是否投放小程序' },
           ],
         })(
-          <Radio.Group onChange={changeMiniapp}>
+          <Radio.Group onChange={changeMiniapp} disabled={!!formsDate.activityId}>
             <Radio value={1}>是</Radio>
             <Radio value={0}>否</Radio>
           </Radio.Group>

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Slider, Row, Col, Checkbox, Input, Button, InputNumber } from 'antd';
+import { Form, Slider, Row, Col, Checkbox, Input, Button, InputNumber, message } from 'antd';
 import router from 'umi/router';
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
@@ -46,8 +46,13 @@ function Basic(props) {
     }
 
     const updateRedPacket = data => {
+        console.log('123123')
         request({ ...apis.redPacket.update, data: { ...data } }).then(data => {
             // setData(data)
+            console.log('123123')
+            message.success('操作成功')
+        }).catch((e) => {
+            message.error('操作失败')
         })
     }
 
@@ -96,16 +101,16 @@ function Basic(props) {
 
     };
 
-    const handleInputConfirm = () => {
-        setregistrationFormOption([
-            { label: '姓名', value: 'name' },
-            { label: '电话', value: 'tel' },
-            { label: registrationInputValue, value: 'abc' },
-        ])
+    // const handleInputConfirm = () => {
+    //     setregistrationFormOption([
+    //         { label: '姓名', value: 'name' },
+    //         { label: '电话', value: 'tel' },
+    //         { label: registrationInputValue, value: 'abc' },
+    //     ])
 
 
-        setInputVisible(!inputVisible)
-    }
+    //     setInputVisible(!inputVisible)
+    // }
 
     const { getFieldDecorator } = props.form
 

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

@@ -7,7 +7,7 @@ import request from '../../../../utils/request';
 
 const { RangePicker } = DatePicker;
 
-function validatorNum (rule, value, callback) {
+function validatorNum(rule, value, callback) {
     callback(value < 1 || value > 1000 ? '人数必须大于0 小于 1000' : undefined);
 }
 
@@ -37,7 +37,9 @@ function Help(props) {
         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 => {
-
+            message.info('操作成功')
+        }).catch(() => {
+            message.error('操作失败')
         })
     }
 

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

@@ -28,6 +28,7 @@ function Ranking(props) {
             if (!err) {
                 // eslint-disable-next-line no-console
                 console.log('提交数据: ', values)
+                getList({ pageNum: 1, pageSize: 10, ...values })
             }
         });
     }
@@ -52,7 +53,7 @@ function Ranking(props) {
             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="50px"></img >,
         },
         {
             title: '昵称',
@@ -74,8 +75,8 @@ function Ranking(props) {
         },
         {
             title: '发起时间',
-            dataIndex: 'targetName',
-            key: 'targetName',
+            dataIndex: 'createDate',
+            key: 'createDate',
             align: 'center',
             render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
         },

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

@@ -31,6 +31,7 @@ function RedPacket(props) {
     const updateRedPacket = data => {
         request({ ...apis.redPacket.updateMoney, urlData: { id }, data: { ...data } }).then(data => {
             // setData(data)
+            message.info('操作成功')
         })
     }
 
@@ -73,7 +74,7 @@ function RedPacket(props) {
                 <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 || 0}</span></div>
+                        <div className={Styles.redHeaderTop}><span className={Styles.redHeaderTopText}>已发送红包总数量/个</span><span className={Styles.redHeaderTopNum}>{data.sendNum || 0}</span></div>
                         <div className={Styles.redHeaderBottom}><Navigate onClick={() => props.toDetail()}>查看详情</Navigate></div>
                     </div>
                 </Col>

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

@@ -6,7 +6,7 @@ import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
 
 const TradingStatus = {
-    processing: '进行中',
+    // processing: '进行中',
     success: '成功',
     fail: '失败',
 }
@@ -77,7 +77,7 @@ function RedPacketRecord(props) {
             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="50px"></img >,
         },
         {
             title: '手机号',
@@ -93,16 +93,17 @@ function RedPacketRecord(props) {
         },
         {
             title: '金额（元）',
-            dataIndex: 'packetAmount',
-            key: 'packetAmount',
+            dataIndex: 'amount',
+            key: 'amount',
             align: 'center',
+            render: x => <span>{x / 100}</span >,
         },
         {
             title: '发送状态',
             dataIndex: 'tradingStatus',
             key: 'tradingStatus',
             align: 'center',
-            render: x => <span>{ TradingStatus[x] || ''}</span>,
+            render: x => <span>{TradingStatus[x] || ''}</span>,
         },
     ]
 

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -35,7 +35,7 @@ const Basic = props => {
     {
       label: '选择项目',
       name: 'buildingId',
-      render: <BuildSelect disabled={disable}/>,
+      render: <BuildSelect disabled={disable} />,
       value: dynamicData.buildingId,
       rules: [
         { required: true, message: '请选择项目' },
@@ -126,7 +126,7 @@ const Basic = props => {
       label: '权重',
       name: 'heavy',
       type: FieldTypes.Number,
-      render: <Input type="number" style={{ width: 80}} />,
+      render: <Input type="number" style={{ width: 80 }} />,
       value: dynamicData.heavy,
       rules: [
         { required: true, message: '请输入权重' },
@@ -268,7 +268,7 @@ const Poster = props => {
             WebkitBoxOrient: 'vertical',
             overflow: 'hidden',
             textOverflow: 'ellipsis',
-          }}>{ textAreaValue || '海报描述'}</p>
+          }}>{textAreaValue || '海报描述'}</p>
           <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
             <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
             <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入活动查看详情</p>
@@ -283,7 +283,7 @@ const Poster = props => {
           <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>拼团海报图</p>
           <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
         </div>
-        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600，比例5:4,格式：jpg，用于拼团活动海报</p>
+        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：750*600，比例5:4,格式：jpg，用于拼团活动海报</p>
         <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
           <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
           <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
@@ -302,13 +302,14 @@ const Poster = props => {
 
 
 const Share = props => {
+  console.log(props, 'props')
   const { groupActivityId } = props
   const [inputValue, changeInput] = useState('')
   const [imgValue, changeImg] = useState('')
   const [shareContentId, setShareContentId] = useState('')
 
   useEffect(() => {
-      if (groupActivityId) {
+    if (groupActivityId) {
       request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then(data => {
         if (data.length > 0) {
           setShareContentId(data[0].shareContentId)
@@ -322,6 +323,7 @@ const Share = props => {
   }, [])
 
   const submitShare = () => {
+    console.log(groupActivityId)
     if (groupActivityId) {
       if (shareContentId) {
         request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue } }).then(data => {
@@ -359,7 +361,7 @@ const Share = props => {
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>拼团分享图</p>
       <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
     </div>
-    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动分享好友</p>
+    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动分享好友</p>
     <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
     <Button onClick={() => cancelPage()}>取消</Button>
   </div>
@@ -417,8 +419,8 @@ const Edit = props => {
       </div>
       <div>
         {tab === 'basic' && <Basic dynamicData={dynamicData} disable={disable} activityStatus={activityStatus} scoreData={scoreData} groupActivityId={groupActivityId} />}
-        {tab === 'poster' && <Poster groupActivityId={groupActivityId}/>}
-        {tab === 'share' && <Share />}
+        {tab === 'poster' && <Poster groupActivityId={groupActivityId} />}
+        {tab === 'share' && <Share groupActivityId={groupActivityId} />}
       </div>
       <Prompt message={location =>
         (location.pathname.startsWith('/activity/groupActivity')

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

@@ -78,6 +78,7 @@ function RechargeOrder(props) {
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
+            render: x => <><span>{x / 100 || ''}</span></>,
         },
         {
             title: '消费方式',

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

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

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

@@ -11,6 +11,12 @@ const Recharge = props => {
     console.log(amount, 'amount')
     const { orderInfo } = amount
     console.log(orderInfo, 'orderInfo')
+    useEffect(() => {
+        console.log(props.visible, 'props.visible')
+
+        return () => clearInterval(getByInfo);
+        // setTimeout(() => { getByInfo() }, 1000)
+    }, [props.visible])
     const getByInfo = setInterval(() => {
 
 
@@ -22,15 +28,13 @@ const Recharge = props => {
                 // props.value()
                 // if (!visible) { clearInterval(getByInfo) }
             } else if (data.tradingStatus === 'success') {
-                mmessage.info('充值成功')
-
-                props.value('success')
+                message.info('充值成功')
                 clearInterval(getByInfo)
+                props.value('success')
             } else {
-                mmessage.info('充值失败')
-
-                props.value('fail')
+                message.info('充值失败')
                 clearInterval(getByInfo)
+                props.value('fail')
             }
             // tradingStatus
             // setTimeout(() => { getByInfo() }, 1000)
@@ -40,44 +44,6 @@ 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') {
-    //             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' }}>

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

@@ -25,7 +25,7 @@ const Recharge = props => {
                     <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>
+                    <p style={{ fontSize: '18px', color: '#333', marginBottom: '8px' }}>4.您也可使用银行卡转账/支付宝支付/对公账户打款/现金支付等方式充值，具体方式<ContactText /></p>
                 </Col>
             </Row>
             <div style={{ textAlign: 'center', marginTop: '40px' }}>

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

@@ -89,6 +89,7 @@ function RechargeOrder(props) {
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
+            render: x => <><span>{x / 100 || ''}</span></>,
         },
         {
             title: '充值方式',
@@ -116,7 +117,7 @@ function RechargeOrder(props) {
             dataIndex: 'tradingStatus',
             key: 'tradingStatus',
             align: 'center',
-            render: (x, row) => <><span>{row.tradingStatus == 'processing' ? '待支付' : (row.tradingStatus == 'success' ? '已支付' : '已超时')}</span></>,
+            render: (x, row) => <><span>{row.tradingStatus == 'processing' ? '待支付' : (row.tradingStatus == 'success' ? '已支付' : '失败')}</span></>,
         },
         {
             title: '支付时间',
@@ -192,7 +193,7 @@ function RechargeOrder(props) {
                             <Option value="">全部</Option>
                             <Option value="processing">待支付</Option>
                             <Option value="success">已支付</Option>
-                            <Option value="fail">已超时</Option>
+                            <Option value="fail">失败</Option>
                         </Select>,
                     )}
                 </Form.Item>

src/pages/funds/financialContact/index.jsx

@@ -50,13 +50,14 @@ function financialContact(props) {
             dataIndex: 'sex',
             key: 'sex',
             align: 'center',
+            render: x => <span>{x == 1 ? '男' : x === 2 ? '女' : '未知'}</span >,
         },
         {
             title: '头像',
             dataIndex: 'avatar',
             key: 'avatar',
             align: 'center',
-            render: (x, row) => <img src={row.qrCodeUrl} alt="" width="100px"></img >,
+            render: (x, row) => <img src={row.avatar} alt="" width="50px"></img >,
         },
         {
             title: '固话',

src/pages/h5SampleManager/h5Sample/addH5.jsx

@@ -7,10 +7,13 @@ import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import ImageUploader from '../../../components/XForm/ImageUpload';
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
 
 const header = props => {
     const sampleId = props.location.query.id;
 
+    const [data, setData] = useState({})
+
     const [visible, setVisible] = useState(false)
     // const sampleName = props.location.query.sampleName;
     // const [sampleData, setSampleData] = useState({})
@@ -50,8 +53,8 @@ const header = props => {
                 values.fromH5Sample = true
                 request({ ...apis.activity.addtaDrainage, data: { ...values } }).then(data => {
                     message.info('操作成功')
-
-
+                    setData(data)
+                    setVisible(true)
 
                 }).catch(err => {
                     message.error(err.msg || err.message)
@@ -117,6 +120,26 @@ const header = props => {
         }
     };
 
+    const toH5Edit = () => {
+        router.push({
+            pathname: '/activity/drainage/h5edit',
+            query: {
+                id: data.activityId,
+                name: data.name,
+                drainageId: data.drainageId,
+            },
+        });
+    }
+
+    const toDrainageDetail = () => {
+        router.push({
+            pathname: '/activity/drainage/DetailDrainage',
+            query: {
+                drainageId: data.drainageId,
+            },
+        });
+    }
+
     const { getFieldDecorator } = props.form;
 
     return (
@@ -132,6 +155,11 @@ const header = props => {
                         ],
                     })(<Input placeholder="H5活动名称" />)}
                 </Form.Item>
+                <Form.Item label="选择项目">
+                    {getFieldDecorator('buildingId')(
+                        <BuildSelect />,
+                    )}
+                </Form.Item>
                 <Form.Item label="下架时间">
                     {getFieldDecorator('endDate', {
                         // initialValue: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm:ss') : null,
@@ -181,7 +209,6 @@ const header = props => {
             <Button onClick={() => router.go(-1)}>取消</Button>
                 </Form.Item>
             </Form>
-            {/* <Button onClick={() => setVisible(true)}>234</Button> */}
             <Modal
                 title="新增成功"
                 visible={visible}
@@ -193,6 +220,11 @@ const header = props => {
             // maskClosable={false}
             >
                 建议修改内容以适合您的项目，若有红包等需要消费的内容，请到资金管理中查看余额是否充足
+                <div style={{ width: '300px', margin: '30px auto', display: 'flex', justifyContent: 'space-between' }}>
+                    <Button type="primary" style={{ width: '140px' }} onClick={toH5Edit}>修改配置</Button>
+
+                    <Button style={{ width: '140px' }} onClick={toDrainageDetail}>查看H5活动详情</Button>
+                </div>
             </Modal>
         </>
     )