diff --git a/admin-web/config/router.config.js b/admin-web/config/router.config.js index 76aeafbd1..de37a709c 100644 --- a/admin-web/config/router.config.js +++ b/admin-web/config/router.config.js @@ -69,11 +69,11 @@ export default [ name: 'order-list', component: './Order/OrderList', }, - // { - // path: '/order/order-refunds', - // name: 'order-refunds', - // component: './OrderRefunds/OrderRefundsList', - // }, + { + path: '/order/order-refunds', + name: 'order-refunds', + component: './OrderRefunds/OrderRefundsList', + }, ], }, // product diff --git a/admin-web/src/pages/OrderRefunds/OrderRefundsList.js b/admin-web/src/pages/OrderRefunds/OrderRefundsList.js index f63557669..fa57223b2 100644 --- a/admin-web/src/pages/OrderRefunds/OrderRefundsList.js +++ b/admin-web/src/pages/OrderRefunds/OrderRefundsList.js @@ -1,39 +1,39 @@ -// import React, { PureComponent } from 'react'; -// import { connect } from 'dva'; -// import { Card, Tabs } from 'antd'; -// import PageHeaderWrapper from '../../components/PageHeaderWrapper'; -// import TableSearch from './TableSearch'; -// import styles from '../List/TableList.less'; -// -// /** -// * 订单售后列表 -// */ -// @connect(({ loading }) => ({ -// loading: loading.models.orderList, -// })) -// class OrderRefundsList extends PureComponent { -// handleTabsChange = value => { -// console.log(value); -// }; -// -// render() { -// return ( -// -// -//
-// -//
-// -// -// -// -// -// -// -//
-//
-// ); -// } -// } -// -// export default OrderRefundsList; +import React, { PureComponent } from 'react'; +import { connect } from 'dva'; +import { Card, Tabs } from 'antd'; +import PageHeaderWrapper from '../../components/PageHeaderWrapper'; +import TableSearch from './TableSearch'; +import styles from '../List/TableList.less'; + +/** + * 订单售后列表 + */ +@connect(({ loading }) => ({ + loading: loading.models.orderList, +})) +class OrderRefundsList extends PureComponent { + handleTabsChange = value => { + console.log(value); + }; + + render() { + return ( + + +
+ +
+ + + + + + + +
+
+ ); + } +} + +export default OrderRefundsList; diff --git a/admin-web/src/pages/OrderRefunds/OrderRefundsList.less b/admin-web/src/pages/OrderRefunds/OrderRefundsList.less index 3dc3b9a62..bc5601c1a 100644 --- a/admin-web/src/pages/OrderRefunds/OrderRefundsList.less +++ b/admin-web/src/pages/OrderRefunds/OrderRefundsList.less @@ -1,49 +1,49 @@ -//@import '../../../node_modules/antd/lib/style/themes/default.less'; -//@import '~@/utils/utils.less'; -// -//.tableList { -// .tableListOperator { -// margin-bottom: 16px; -// button { -// margin-right: 8px; -// } -// } -//} -// -//.tableListForm { -// :global { -// .ant-form-item { -// display: flex; -// margin-right: 0; -// margin-bottom: 24px; -// > .ant-form-item-label { -// width: auto; -// padding-right: 8px; -// line-height: 32px; -// } -// .ant-form-item-control { -// line-height: 32px; -// } -// } -// .ant-form-item-control-wrapper { -// flex: 1; -// } -// } -// .submitButtons { -// display: block; -// margin-bottom: 24px; -// white-space: nowrap; -// } -//} -// -//@media screen and (max-width: @screen-lg) { -// .tableListForm :global(.ant-form-item) { -// margin-right: 24px; -// } -//} -// -//@media screen and (max-width: @screen-md) { -// .tableListForm :global(.ant-form-item) { -// margin-right: 8px; -// } -//} +@import '~antd/lib/style/themes/default.less'; +@import '~@/utils/utils.less'; + +.tableList { + .tableListOperator { + margin-bottom: 16px; + button { + margin-right: 8px; + } + } +} + +.tableListForm { + :global { + .ant-form-item { + display: flex; + margin-right: 0; + margin-bottom: 24px; + > .ant-form-item-label { + width: auto; + padding-right: 8px; + line-height: 32px; + } + .ant-form-item-control { + line-height: 32px; + } + } + .ant-form-item-control-wrapper { + flex: 1; + } + } + .submitButtons { + display: block; + margin-bottom: 24px; + white-space: nowrap; + } +} + +@media screen and (max-width: @screen-lg) { + .tableListForm :global(.ant-form-item) { + margin-right: 24px; + } +} + +@media screen and (max-width: @screen-md) { + .tableListForm :global(.ant-form-item) { + margin-right: 8px; + } +} diff --git a/admin-web/src/pages/OrderRefunds/TableSearch.js b/admin-web/src/pages/OrderRefunds/TableSearch.js index 6fde5b51c..e1d8be01a 100644 --- a/admin-web/src/pages/OrderRefunds/TableSearch.js +++ b/admin-web/src/pages/OrderRefunds/TableSearch.js @@ -1,55 +1,55 @@ -// import React from 'react'; -// import { Button, Col, Form, Input, Row, DatePicker } from 'antd'; -// -// const FormItem = Form.Item; -// -// /** -// * table 查询 -// * -// * @type {React.ComponentClass>} -// */ -// const TableSearch = Form.create()(props => { -// const { getFieldDecorator } = props.form; -// console.log('props.form', props.form); -// -// function onSubmit() {} -// -// function handleFormReset() {} -// -// return ( -//
-// -// -// -// {getFieldDecorator('id')()} -// -// -// -// -// {getFieldDecorator('orderNo')()} -// -// -// -// -// -// -// -// {getFieldDecorator('createTime')()} -// -// -// -// -// -// -// -// -// -//
-// ); -// }); -// -// export default TableSearch; +import React from 'react'; +import { Button, Col, Form, Input, Row, DatePicker } from 'antd'; + +const FormItem = Form.Item; + +/** + * table 查询 + * + * @type {React.ComponentClass>} + */ +const TableSearch = Form.create()(props => { + const { getFieldDecorator } = props.form; + console.log('props.form', props.form); + + function onSubmit() {} + + function handleFormReset() {} + + return ( +
+ + + + {getFieldDecorator('id')()} + + + + + {getFieldDecorator('orderNo')()} + + + + + + + + {getFieldDecorator('createTime')()} + + + + + + + + + +
+ ); +}); + +export default TableSearch;