* 资金管理代码提交

config/routes.js

@@ -88,6 +88,12 @@ export default [
                 name: '消费订单',
                 component: './fundManagement/ConsumeOrder',
               },
+              {
+                path: '/fundManagement/ConsumeOrderDetail',
+                name: '订单详情',
+                hideInMenu: true,
+                component: './fundManagement/ConsumeOrderDetail',
+              },
               {
                 path: '/fundManagement/RefundOrder',
                 name: '退款订单',

src/pages/fundManagement/ConsumeOrder.jsx

@@ -78,13 +78,13 @@ function header(props) {
             align: 'center',
         },
         {
-            title: '消费组织',
+            title: '公司',
             dataIndex: 'miniAppName',
             key: 'miniAppName',
             align: 'center',
         },
         {
-            title: '消费金额',
+            title: '金额',
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
@@ -97,26 +97,26 @@ function header(props) {
             align: 'center',
             render: (x, row) => <><span>{row.consumeType == 'RedPacket' ? '红包' : ''}</span></>
         },
+        // {
+        //     title: '活动名称',
+        //     dataIndex: 'activityName',
+        //     key: 'activityName',
+        //     align: 'center',
+        // },
         {
-            title: '活动名称',
-            dataIndex: 'activityName',
-            key: 'activityName',
-            align: 'center',
-        },
-        {
-            title: '消费下单时间',
+            title: '下单时间',
             dataIndex: 'createDate',
             key: 'createDate',
             align: 'center',
             render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
         },
-        {
-            title: '接收人手机号',
-            dataIndex: 'phone',
-            key: 'phone',
-            align: 'center',
-            render: (x, row) => <><span className={styles.blue} onClick={() => Info(row)}>{row.phone || '13160056114'}</span></>
-        },
+        // {
+        //     title: '接收人手机号',
+        //     dataIndex: 'phone',
+        //     key: 'phone',
+        //     align: 'center',
+        //     render: (x, row) => <><span className={styles.blue} onClick={() => Info(row)}>{row.phone || '13160056114'}</span></>
+        // },
         {
             title: '消费状态',
             dataIndex: 'tradingStatus',
@@ -124,6 +124,19 @@ function header(props) {
             align: 'center',
             render: (x, row) => <><span>{row.tradingStatus == 'success' ? '成功' : '失败'}</span></>
         },
+        {
+            title: '操作',
+            dataIndex: 'handle',
+            key: 'handle',
+            align: 'center',
+            render: (x, row) => (
+                <>
+                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEdit(row.tradeNo, row.orgId, row.consumeType)}>
+                        查看详情
+                    </span>
+                </>
+            ),
+        },
 
     ];
     const Info = (row) => {
@@ -133,6 +146,17 @@ function header(props) {
         })
     }
 
+    const toEdit = (tradeNo, orgId, consumeType) => () => {
+        router.push({
+            pathname: '/fundManagement/ConsumeOrderDetail',
+            query: {
+                tradeNo,
+                orgId,
+                consumeType
+            },
+        });
+    }
+
     function handleReset() {
         props.form.resetFields();
         getList({ pageNum: 1, pageSize: 10, orderType: 'RedPacket' })
@@ -163,7 +187,7 @@ function header(props) {
     }
     const { getFieldDecorator } = props.form
 
-    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '消费组织') : columns
+    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '公司') : columns
     return (
 
         <>
@@ -196,13 +220,13 @@ function header(props) {
                         {getFieldDecorator('miniAppName')(
                             <Input
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                                placeholder="消费组织"
+                                placeholder="公司"
                             />,
                         )}
                     </Form.Item>
                 }
                 <Form.Item>
-                    <span style={{ marginRight: '10px' }}>消费时间段：</span>
+                    <span style={{ marginRight: '10px' }}>下单时间段：</span>
                     {getFieldDecorator('LocalDate')(
                         <RangePicker placeholder={['开始时间', '结束时间']} />
                     )}

src/pages/fundManagement/RechargeOrder.jsx

@@ -81,13 +81,13 @@ function header(props) {
             align: 'center',
         },
         {
-            title: '充值组织',
+            title: '公司',
             dataIndex: 'miniAppName',
             key: 'miniAppName',
             align: 'center',
         },
         {
-            title: '充值金额',
+            title: '金额',
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
@@ -172,7 +172,7 @@ function header(props) {
     }
     const { getFieldDecorator } = props.form
 
-    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '充值组织') : columns
+    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '公司') : columns
 
     return (
 
@@ -193,14 +193,14 @@ function header(props) {
                         {getFieldDecorator('miniAppName')(
                             <Input
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                                placeholder="充值组织"
+                                placeholder="公司"
                             />,
                         )}
                     </Form.Item>
                 }
 
                 <Form.Item>
-                    <span style={{ marginRight: '10px' }}>支付时间段：</span>
+                    <span style={{ marginRight: '10px' }}>下单时间段：</span>
                     {getFieldDecorator('LocalDate')(
                         <RangePicker placeholder={['开始时间', '结束时间']} />
                     )}

src/pages/fundManagement/RefundOrder.jsx

@@ -88,20 +88,20 @@ function header(props) {
             align: 'center',
         },
         {
-            title: '退款组织',
+            title: '公司',
             dataIndex: 'miniAppName',
             key: 'miniAppName',
             align: 'center',
         },
         {
-            title: '退款金额',
+            title: '金额',
             dataIndex: 'amount',
             key: 'amount',
             align: 'center',
             render: (x, row) => <span>{regFenToYuan(x)}</span>
         },
         {
-            title: '退款创建时间',
+            title: '下单时间',
             dataIndex: 'createDate',
             key: 'createDate',
             align: 'center',
@@ -251,7 +251,7 @@ function header(props) {
     }
 
     const { getFieldDecorator } = props.form
-    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '退款组织') : columns
+    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '公司') : columns
     return (
 
         <>
@@ -305,7 +305,7 @@ function header(props) {
                         {getFieldDecorator('miniAppName')(
                             <Input
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                                placeholder="退款组织"
+                                placeholder="公司"
                             />,
                         )}
                     </Form.Item>
@@ -322,7 +322,7 @@ function header(props) {
                     )}
                 </Form.Item>
                 <Form.Item>
-                    <span style={{ marginRight: '10px' }}>退款时间段：</span>
+                    <span style={{ marginRight: '10px' }}>下单时间段：</span>
                     {getFieldDecorator('LocalDate')(
                         <RangePicker placeholder={['开始时间', '结束时间']} />,
                     )}

src/services/apis.js

@@ -213,6 +213,11 @@ const apis = {
       method: 'GET',
       action: 'channel',
     },
+    getOrderDetail: {
+      url: `${prefix}/taOrgOrder/getOrderDetailByTradeNo`,
+      method: 'GET',
+      action: 'channel',
+    },
     refund: {
       url: `${prefix}/taOrgOrder/refund/:id`,
       method: 'PUT',