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

src/pages/fundManagement/AccountManagement.jsx

@@ -108,7 +108,9 @@ function header(props) {
             render: (x, row) => (
                 <>
                     <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px', display: 'inline-block' }}><Recharge onClick={handleReset} orgId={row.orgId} accountId={row.accountId} /></span>
-                   
+                    {/* <span style={{ color: '#FF925C', cursor: 'pointer', display: 'inline-block' }} >
+                        <Refund orgId={row.orgId} accountId={row.accountId} onClick={handleReset} realBalance={row.realBalance || '0'} />
+                    </span> */}
                 </>
             ),
         },

src/pages/fundManagement/ConsumeOrder.jsx

@@ -21,7 +21,7 @@ function header(props) {
     const [personInfo, setPersonInfo] = useState({})
     const orgId = props.orgId || ''
     useEffect(() => {
-        getList({ pageNum: 1, pageSize: 10, orderType: 'redPacket' });
+        getList({ pageNum: 1, pageSize: 10, orderType: 'RedPacket' });
     }, [])
 
     // 查询列表

src/pages/fundManagement/RechargeOrder.jsx

@@ -104,7 +104,7 @@ function header(props) {
             dataIndex: 'isOffline',
             key: 'isOffline',
             align: 'center',
-            render: (x, row) => <><span>{row.isOffline ? '运营手动充值' : '业务线上充值'}</span></>
+            render: (x, row) => <><span>{row.isOffline ? '运营手工充值' : '业务线上充值'}</span></>
         },
         {
             title: '下单时间',

src/pages/fundManagement/RefundOrder.jsx

@@ -321,6 +321,16 @@ function header(props) {
                         />,
                     )}
                 </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('auditStatus')(
+                        <Select style={{ width: '180px' }} placeholder="退款状态">
+                            <Select.Option value="">全部</Select.Option>
+                            <Select.Option value="checking">已申请</Select.Option>
+                            <Select.Option value="agree">已退款</Select.Option>
+                            <Select.Option value="unAgree">已驳回</Select.Option>
+                        </Select>,
+                    )}
+                </Form.Item>
                 <Form.Item>
                     <span style={{ marginRight: '10px' }}>退款时间段：</span>
                     {getFieldDecorator('LocalDate')(