Merge branch 'dev' of http://git.ycjcjy.com/estateagents/pc-channel into dev

src/pages/fundManagement/AccountManagement.jsx

@@ -10,7 +10,7 @@ import { fetch, apis } from '../../utils/request';
 import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import Recharge from './components/Recharge'
-import Refund from './components/Refund'
+
 import { regFenToYuan } from '@/utils/money';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;

src/pages/fundManagement/Finance.jsx

@@ -183,7 +183,7 @@ function header(props) {
                 </Form.Item>
             </Form>
             <div style={{ margin: '10px 0 16px 0' }}>
-                <Button type="danger" className={styles.addBtn} ><SelectContact onClick={() => getList({ pageNum: 1, pageSize: 10 })} /></Button>
+                <Button type="danger" className={styles.addBtn} style={{ padding: '0' }} ><SelectContact onClick={() => getList({ pageNum: 1, pageSize: 10 })} /></Button>
                 <Button type="primary" className={styles.addBtn} onClick={() => toDel()} style={{ marginLeft: '30px' }} >删除</Button>
             </div>
             <Table rowSelection={rowSelection} rowKey={r => r.contactId} dataSource={data.records} columns={columns} pagination={false} />

src/pages/fundManagement/RechargeOrder.jsx

@@ -136,7 +136,7 @@ function header(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: '支付时间',
@@ -218,7 +218,7 @@ function header(props) {
                             <Select.Option value="">全部</Select.Option>
                             <Select.Option value="processing">待支付</Select.Option>
                             <Select.Option value="success">已支付</Select.Option>
-                            <Select.Option value="fail">已超时</Select.Option>
+                            <Select.Option value="fail">失败</Select.Option>
                         </Select>,
                     )}
                 </Form.Item>

src/pages/fundManagement/RefundOrder.jsx

@@ -11,6 +11,7 @@ import request from '../../utils/request';
 import AuthButton from '@/components/AuthButton';
 import Swiper from './components/Swiper';
 import { regFenToYuan } from '@/utils/money';
+import Refund from './components/Refund'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
@@ -203,6 +204,7 @@ function header(props) {
     }
     const refund = (row) => {
         setRefundVisible(true)
+        console.log(row,'row')
         setRow(row)
     }
 
@@ -220,22 +222,26 @@ function header(props) {
     }
 
     const orderRefund = () => {
-        request({
-            ...apis.fund.refund, urlData: { id: row.orderId }, data: {
-                orgId: row.orgId,
-                amount: row.amount,
-            }
-        }).then((data) => {
-            console.log(data)
-            getList({ pageNum: 1, pageSize: 10, orderType: 'refund' });
 
-        })
+        getList({ pageNum: 1, pageSize: 10, orderType: 'refund' });
 
         setRefundVisible(false)
+        // request({
+        //     ...apis.fund.refund, urlData: { id: row.orderId }, data: {
+        //         orgId: row.orgId,
+        //         amount: row.amount,
+        //     }
+        // }).then(data => {
+        //     console.log(data)
+        //     getList({ pageNum: 1, pageSize: 10, orderType: 'refund' });
+
+        // })
+
+        // setRefundVisible(false)
     }
     // 导出
     const exportList = () => {
-        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
+        const { LocalDate, ...submitValue } = props.form.getFieldsValue()
         if (null != LocalDate && LocalDate.length > 0) {
             const [startDate, endDate] = LocalDate
             submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
@@ -277,13 +283,17 @@ function header(props) {
                 <span style={{ color: 'red' }}>*</span><Input value={inputValue} onChange={e => setValue(e.target.value)} style={{ marginLeft: '10px', width: '80%' }} placeholder="请输入驳回原因" />
                 </div>
             </Modal>
+            {/* onClick={() => orderRefund()} */}
             <Modal
                 visible={refundVisible}
                 title="退款审核"
                 onOk={() => orderRefund()}
                 onCancel={() => handleCancel()}
                 footer={[
-                    <Button key="back" size="large" onClick={() => orderRefund()}>退款</Button>,
+                    <Button key="back" size="large"><Refund 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>
                     <Button key="submit" type="primary" size="large" onClick={() => bohui()}>驳回</Button>,
                 ]}
             ><div>

src/pages/fundManagement/components/Recharge.jsx

@@ -82,7 +82,7 @@ const SelectContact = props => {
 
                         <Form.Item label="充值凭证" help="可上传银行转账截图等作为查账线索">
                             {getFieldDecorator('certificateList', {
-                                rules: [{ required: false }],
+                                rules: [{ required: true }],
                             })(
                                 <Upload />,
                             )}

src/pages/fundManagement/components/Refund.jsx

@@ -30,14 +30,22 @@ const SelectContact = props => {
 
     }, [props.value])
 
-
-    const handleOk = (e) => {
+    const handleOk = () => {
         props.form.validateFieldsAndScroll((err, values) => {
             console.log(values, "valuesvaluesvaluesvaluesvaluesvaluesvalues")
             if (!err) {
-                request({ ...apis.fund.accoutRefund, urlData: { id: props.accountId || '' }, data: { ...values, orgId: props.orgId } }).then((data) => {
-                    message.info("操作成功")
+
+                request({
+                    ...apis.fund.refund, urlData: { id: props.orderId }, data: {
+                        orgId: props.orgId,
+                        // amount: props.amount,
+                        ...values,
+                    }
+                }).then(data => {
+                    console.log(data)
+                    message.success('操作成功')
                     setVisible(false)
+                    // getList({ pageNum: 1, pageSize: 10, orderType: 'refund' });
                     props.onClick()
                 })
             }
@@ -64,23 +72,13 @@ const SelectContact = props => {
                 ]}
             >
                 <div>
-                    <p style={{ color: 'red' }}>请先进行线下实际退款操作后再执行线上退款存档</p>
-                    <Form {...formItemLayout} >
 
-                        <Form.Item label="退款金额" >
-                            {getFieldDecorator('refundAmount', {
-                                rules: [{ required: true, message: '退款金额不能为空' },
-                                {
-                                    validator: (rule, value, callback) => {
+                    <Form {...formItemLayout} >
+                        <Form.Item label="退款凭证">
 
-                                        callback(!regMoney.test(value) ? '金额最多两位小数' : value > balance.toString() ? '退款金额不能大于余额' : value < 0.01 ? '金额不得小于0.01' : undefined)
+                            <span>{regFenToYuan(props.amount)}元</span>
 
-                                    }
-                                }
-                                ],
-                            })(<Input type='number' placeholder="支持2位小数" addonAfter="元" />)}
                         </Form.Item>
-                        <div style={{ marginBottom: '25px' }}><span style={{ width: '25%', display: 'inline-block', textAlign: 'right' }}>余额：</span>{balance}元</div>
                         <Form.Item label="退款凭证" help="可上传银行转账截图、微信退款订单等截图作为查账线索">
                             {getFieldDecorator('certificateList', {
                                 rules: [{ required: false }],

src/pages/fundManagement/components/SelectContact.jsx

@@ -126,7 +126,7 @@ const SelectContact = props => {
 
     return (
         <div>
-            <span style={{ color: '#fff' }} onClick={() => setVisible(true)}>{group.groupName}</span>
+            <span style={{ color: '#fff', padding: '0 15px' }} onClick={() => setVisible(true)}>{group.groupName}</span>
 
             <Modal
                 title="选择联系人"