commit

src/pages/fundManagement/AccountDetail.jsx

@@ -15,7 +15,7 @@ import Recharge from './components/Recharge'
 import { regFenToYuan } from '@/utils/money';
 
 function header(props) {
-    const orgId = props.location.query.id || ''
+    const orgId = props.location.query.orgId || ''
     const [newsData, setNewsData] = useState({})
 
     useEffect(() => {
@@ -25,17 +25,16 @@ function header(props) {
     }, [])
 
     // 查询详情
+    const getDetail = (orgId) => {
+        request({
+            ...apis.fund.accountDetail,
+            urlData: { id: orgId }
+        }).then((data) => {
+            console.log(data)
+            setNewsData(data)
+        })
+    }
 
-
-    // const getDetail = orgId => {
-    //     request({
-    //         ...apis.fund.accountDetail,
-    //         urlData: { id: orgId },
-    //     }).then(data => {
-    //         console.log(data)
-    //         setNewsData(data)
-    //     })
-    // }
     const [tab, changeTab] = useState('basic')
 
     const fields = [
@@ -82,7 +81,7 @@ function header(props) {
             label: '退款冻结金额',
             name: 'consume',
             type: FieldTypes.Message,
-            value: regFenToYuan(newsData.refundBlockedAmount) || '0',
+            value: regFenToYuan(newsData.refundBlockedAmonut) || '0',
             help: '对账请在充值订单中查看充值状态为“已申请”的退款记录',
         },
         {
@@ -94,15 +93,6 @@ function header(props) {
         },
     ]
 
-    const getDetail = row => {
-        router.push({
-            pathname: '/fundManagement/AccountDetail',
-            query: {
-                id: row.orgId,
-            },
-        });
-    }
-
 
     return (
 
@@ -120,19 +110,17 @@ function header(props) {
                     <div>
                         <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(newsData)} accountId={newsData.accountId || ''} />
-                            {/* </Button> */}
+                            <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(newsData.orgId)} accountId={newsData.accountId || ''} />
                             <Button onClick={() => router.go(-1)}>返回</Button>
                         </div>
                     </div>
                 }
-                {tab === 'recharge' && <RechargeOrder orgId={orgId} />}
-                {tab === 'consume' && <ConsumeOrder orgId={orgId} />}
-                {tab === 'refund' && <RefundOrder orgId={orgId} />}
+                {tab === 'recharge' && <RechargeOrder organize="hidden" orgId={orgId} />}
+                {tab === 'consume' && <ConsumeOrder organize="hidden" orgId={orgId} />}
+                {tab === 'refund' && <RefundOrder organize="hidden" orgId={orgId} onToDetail={() => changeTab('basic')} />}
             </div>
         </>
     )
 }
 
-export default header
+export default header

src/pages/fundManagement/AccountManagement.jsx

@@ -143,7 +143,7 @@ function header(props) {
         router.push({
             pathname: '/fundManagement/AccountDetail',
             query: {
-                id: row.orgId
+                orgId: row.orgId
             },
         });
     }

src/pages/fundManagement/ConsumeOrder.jsx

@@ -89,7 +89,6 @@ function header(props) {
             key: 'amount',
             align: 'center',
             render: (x, row) => <span>{regFenToYuan(x)}</span>
-
         },
         {
             title: '消费方式',
@@ -163,6 +162,8 @@ function header(props) {
         }).catch()
     }
     const { getFieldDecorator } = props.form
+
+    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '消费组织') : columns
     return (
 
         <>
@@ -189,14 +190,17 @@ function header(props) {
                         />,
                     )}
                 </Form.Item>
-                <Form.Item>
-                    {getFieldDecorator('miniAppName')(
-                        <Input
-                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                            placeholder="消费组织"
-                        />,
-                    )}
-                </Form.Item>
+                {
+                    props.organize != 'hidden' &&
+                    <Form.Item>
+                        {getFieldDecorator('miniAppName')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="消费组织"
+                            />,
+                        )}
+                    </Form.Item>
+                }
                 <Form.Item>
                     <span style={{ marginRight: '10px' }}>消费时间段：</span>
                     {getFieldDecorator('LocalDate')(
@@ -240,7 +244,7 @@ function header(props) {
             <div>
                 <Button type="danger" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={() => exportList()} >导出</Button>
             </div>
-            <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={columns} pagination={false} />
+            <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={lastColumns} pagination={false} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
             </div>

src/pages/fundManagement/RechargeOrder.jsx

@@ -65,11 +65,6 @@ function header(props) {
         getList({ pageNum: pageNumber, pageSize: 10, orderType: 'recharge', ...submitValue })
     }
     const look = (list) => {
-        // setSwiperList([
-        //     'https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1591688474&di=85bb9a6a9736e51c63a7bac09601f1e7&src=http://a3.att.hudong.com/14/75/01300000164186121366756803686.jpg',
-        //     'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591698586868&di=f528c96c3004268843a070c342b905fa&imgtype=0&src=http%3A%2F%2Fa2.att.hudong.com%2F36%2F48%2F19300001357258133412489354717.jpg',
-        //     'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591698586867&di=7865b3f07e4b6b050642a042fa30f07e&imgtype=0&src=http%3A%2F%2Fa0.att.hudong.com%2F64%2F76%2F20300001349415131407760417677.jpg'
-        // ])
         setSwiperList(list)
     }
     /**
@@ -176,6 +171,9 @@ function header(props) {
         }).catch()
     }
     const { getFieldDecorator } = props.form
+
+    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '充值组织') : columns
+
     return (
 
         <>
@@ -189,14 +187,18 @@ function header(props) {
                         />,
                     )}
                 </Form.Item>
-                <Form.Item>
-                    {getFieldDecorator('miniAppName')(
-                        <Input
-                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                            placeholder="充值组织"
-                        />,
-                    )}
-                </Form.Item>
+                {
+                    props.organize != 'hidden' &&
+                    <Form.Item>
+                        {getFieldDecorator('miniAppName')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="充值组织"
+                            />,
+                        )}
+                    </Form.Item>
+                }
+
                 <Form.Item>
                     <span style={{ marginRight: '10px' }}>支付时间段：</span>
                     {getFieldDecorator('LocalDate')(
@@ -234,7 +236,7 @@ function header(props) {
             <div>
                 <Button type="danger" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={() => exportList()} >导出</Button>
             </div>
-            <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={columns} pagination={false} />
+            <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={lastColumns} pagination={false} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
             </div>

src/pages/fundManagement/RefundOrder.jsx

@@ -72,11 +72,6 @@ function header(props) {
         getList({ pageNum: pageNumber, pageSize: 10, orderType: 'refund', ...submitValue })
     }
     const look = (list) => {
-        // setSwiperList([
-        //     'https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1591688474&di=85bb9a6a9736e51c63a7bac09601f1e7&src=http://a3.att.hudong.com/14/75/01300000164186121366756803686.jpg',
-        //     'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591698586868&di=f528c96c3004268843a070c342b905fa&imgtype=0&src=http%3A%2F%2Fa2.att.hudong.com%2F36%2F48%2F19300001357258133412489354717.jpg',
-        //     'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591698586867&di=7865b3f07e4b6b050642a042fa30f07e&imgtype=0&src=http%3A%2F%2Fa0.att.hudong.com%2F64%2F76%2F20300001349415131407760417677.jpg'
-        // ])
         setSwiperList(list)
     }
     /**
@@ -208,12 +203,16 @@ function header(props) {
     }
 
     const toDeatil = () => {
-        router.push({
-            pathname: '/fundManagement/AccountDetail',
-            query: {
-                id: row.orgId,
-            },
-        });
+        if (orgId) {
+            props.onToDetail()
+        } else {
+            router.push({
+                pathname: '/fundManagement/AccountDetail',
+                query: {
+                    orgId: row.orgId,
+                },
+            });
+        }
     }
     const bohui = () => {
         setRefundVisible(false)
@@ -225,18 +224,6 @@ function header(props) {
         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 = () => {
@@ -264,7 +251,7 @@ function header(props) {
     }
 
     const { getFieldDecorator } = props.form
-    const list = []
+    const lastColumns = props.organize == 'hidden' ? columns.filter(x => x.title != '退款组织') : columns
     return (
 
         <>
@@ -282,19 +269,13 @@ 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">
-                    <Refund key="back" size="large" 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>
+                    <Refund key="back" size="large" orgId={row.orgId} accountId={row.accountId} amount={row.amount || '0'} onClick={() => orderRefund()} orderId={row.orderId} />,
                     <Button key="submit" type="primary" size="large" onClick={() => bohui()}>驳回</Button>,
                 ]}
             ><div>
@@ -318,14 +299,18 @@ function header(props) {
                         />,
                     )}
                 </Form.Item>
-                <Form.Item>
-                    {getFieldDecorator('miniAppName')(
-                        <Input
-                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                            placeholder="退款组织"
-                        />,
-                    )}
-                </Form.Item>
+                {
+                    props.organize != 'hidden' &&
+                    <Form.Item>
+                        {getFieldDecorator('miniAppName')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="退款组织"
+                            />,
+                        )}
+                    </Form.Item>
+                }
+
                 <Form.Item>
                     {getFieldDecorator('auditStatus')(
                         <Select style={{ width: '180px' }} placeholder="退款状态">
@@ -354,7 +339,7 @@ function header(props) {
             <div>
                 <Button type="danger" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={() => exportList()} >导出</Button>
             </div>
-            <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={columns} pagination={false} />
+            <Table rowKey={r => r.tradeNo} dataSource={data.records} columns={lastColumns} pagination={false} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
             </div>

src/pages/sample/h5/edit.jsx

@@ -98,7 +98,7 @@ const header = props => {
               rules: [{ max: 300, message: '样例体验链接不超过300个字符' }],
             })(<Input placeholder="若样例暂未发布到小程序，可直接粘贴网页链接"/>)}
           </Form.Item>
-          <Form.Item label="H5模板" >
+          <Form.Item label="H5模板" help="未配置模板的样例，客户无法直接新增H5" >
             {getFieldDecorator('taH5Template',{
               trigger: 'onChoosed'
             })(<H5Sample />)}