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

src/pages/fundManagement/AccountDetail.jsx

@@ -95,6 +95,15 @@ function header(props) {
         },
     ]
 
+    const getDetail = (row) => {
+        router.push({
+            pathname: '/fundManagement/AccountDetail',
+            query: {
+                id: row.orgId
+            },
+        });
+    }
+
 
     return (
 
@@ -113,7 +122,7 @@ function header(props) {
                         <XForm buttonVisible={false} fields={fields}></XForm>
                         <div style={{ paddingLeft: '30%', marginTop: '30px' }}>
                             {/* <Button htmlType="submit" type="primary" style={{ marginRight: '10%', padding: '0' }}> */}
-                                <Recharge type="primary" orgId={newsData.orgId || ''} onClick={() => getDetail(orgId)} accountId={newsData.accountId || ''} />
+                                <Recharge type="primary" orgId={newsData.orgId || ''} onClick={() => getDetail(newsData)} accountId={newsData.accountId || ''} />
                             {/* </Button> */}
                             <Button onClick={() => router.go(-1)}>返回</Button>
                         </div>

src/pages/fundManagement/ConsumeOrder.jsx

@@ -123,7 +123,7 @@ function header(props) {
             dataIndex: 'tradingStatus',
             key: 'tradingStatus',
             align: 'center',
-            render: (x, row) => <><span>{row.tradingStatus == '1' ? '成功' : '失败'}</span></>
+            render: (x, row) => <><span>{row.tradingStatus == 'success' ? '成功' : '失败'}</span></>
         },
 
     ];
@@ -175,7 +175,7 @@ function header(props) {
                 <div style={{ paddingLeft: '36%' }}>
                     <p>昵称：{personInfo.nickname || ''}</p>
                     <p>头像：<img src={personInfo.avatarurl || ''} className={styles.touxiang} /></p>
-                    <p>姓名：{personInfo.name || ''}</p>
+                    <p>姓名：{personInfo.name || personInfo.nickname}</p>
                     <p>手机号：{personInfo.phone || ''}</p>
                 </div>
 
@@ -207,7 +207,7 @@ function header(props) {
                     {getFieldDecorator('itemType')(
                         <Select style={{ width: '180px' }} placeholder="消费方式">
                             <Select.Option value="">全部</Select.Option>
-                            <Select.Option value="redPacket">红包</Select.Option>
+                            <Select.Option value="RedPacket">红包</Select.Option>
                         </Select>,
                     )}
                 </Form.Item>
@@ -215,8 +215,8 @@ function header(props) {
                     {getFieldDecorator('tradingStatus')(
                         <Select style={{ width: '180px' }} placeholder="消费状态">
                             <Select.Option value="">全部</Select.Option>
-                            <Select.Option value="1">成功</Select.Option>
-                            <Select.Option value="2">失败</Select.Option>
+                            <Select.Option value="success">成功</Select.Option>
+                            <Select.Option value="fail">失败</Select.Option>
                         </Select>,
                     )}
                 </Form.Item>

src/pages/fundManagement/RefundOrder.jsx

@@ -24,7 +24,6 @@ function header(props) {
     const [refundVisible, setRefundVisible] = useState(false)
     const [inputValue, setValue] = useState('')
     const [swiperList, setSwiperList] = useState([])
-    console.log(props, "propspropspropspropspropsprops")
 
     const orgId = props.orgId || ''