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

src/pages/fundManagement/RechargeOrder.jsx

@@ -115,7 +115,7 @@ function header(props) {
             dataIndex: 'tradingStatus',
             key: 'tradingStatus',
             align: 'center',
-            render: (x, row) => <><span>{row.tradingStatus == '0' ? '待支付' : row.tradingStatus == '1' ? '已支付' : '已超时'}</span></>
+            render: (x, row) => <><span>{row.tradingStatus == 'processing' ? '待支付' : row.tradingStatus == 'success' ? '已支付' : '已超时'}</span></>
         },
         {
             title: '支付时间',
@@ -194,9 +194,9 @@ function header(props) {
                     {getFieldDecorator('tradingStatus')(
                         <Select style={{ width: '180px' }} placeholder="充值状态">
                             <Select.Option value="">全部</Select.Option>
-                            <Select.Option value="0">待支付</Select.Option>
-                            <Select.Option value="1">已支付</Select.Option>
-                            <Select.Option value="2">已超时</Select.Option>
+                            <Select.Option value="processing">待支付</Select.Option>
+                            <Select.Option value="success">已支付</Select.Option>
+                            <Select.Option value="fail">已超时</Select.Option>
                         </Select>,
                     )}
                 </Form.Item>

src/pages/fundManagement/RefundOrder.jsx

@@ -114,10 +114,10 @@ function header(props) {
         },
         {
             title: '退款状态',
-            dataIndex: 'tradingStatus',
-            key: 'tradingStatus',
+            dataIndex: 'auditStatus',
+            key: 'auditStatus',
             align: 'center',
-            render: (x, row) => <><span>{row.tradingStatus == 'processing' ? '已申请' : row.tradingStatus == 'success' ? '已退款' : row.tradingStatus == 'fail' ? '已驳回' : ''}</span></>
+            render: (x, row) => <><span>{row.auditStatus == 'checking' ? '已申请' : row.auditStatus == 'agree' ? '已退款' : '已驳回'}</span></>
         },
         {
             title: '驳回原因',
@@ -153,7 +153,7 @@ function header(props) {
             render: (x, row) => (
                 <>
                     {
-                        row.tradingStatus == '0' &&
+                        row.auditStatus == 'checking' &&
                         <>
                             <span style={{ color: '#FF925C', cursor: 'pointer', marginRight: '16px' }} onClick={() => refund(row)}>
                                 退款