Commit fda1df68 authored by 郝聪敏's avatar 郝聪敏

fix: 解决jira bug

parent b848e5d4
...@@ -84,7 +84,7 @@ export default { ...@@ -84,7 +84,7 @@ export default {
routes: [ routes: [
{ {
path: '/', path: '/',
redirect: '/orderManage/pendingDeliveryOrder', component: './Admin',
}, },
{ {
path: '/orderManage/pendingDeliveryOrder', path: '/orderManage/pendingDeliveryOrder',
......
...@@ -3,6 +3,5 @@ import { Card, Typography, Alert, Icon } from 'antd'; ...@@ -3,6 +3,5 @@ import { Card, Typography, Alert, Icon } from 'antd';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
export default () => ( export default () => (
<PageHeaderWrapper> <h2>欢迎使用商户管理后台系统</h2>
</PageHeaderWrapper>
); );
...@@ -103,7 +103,7 @@ const LogisticsForm = props => { ...@@ -103,7 +103,7 @@ const LogisticsForm = props => {
> >
{skuList.map(item => ( {skuList.map(item => (
<Option value={item.orderSkuId} key={item.orderSkuId}> <Option value={item.orderSkuId} key={item.orderSkuId}>
{item.skuName + item.skuAttr} {item.skuName + (item.skuAttr || '')}
</Option> </Option>
))} ))}
</Select>, </Select>,
......
...@@ -12,11 +12,13 @@ const LogisticsForm = props => { ...@@ -12,11 +12,13 @@ const LogisticsForm = props => {
title: '商品名称', title: '商品名称',
dataIndex: 'skuName', dataIndex: 'skuName',
key: 'skuName', key: 'skuName',
width: 300,
}, },
{ {
title: '商品属性', title: '商品属性',
dataIndex: 'skuAttr', dataIndex: 'skuAttr',
key: 'skuAttr', key: 'skuAttr',
width: 200,
}, },
{ {
title: '商品件数(件)', title: '商品件数(件)',
...@@ -35,7 +37,7 @@ const LogisticsForm = props => { ...@@ -35,7 +37,7 @@ const LogisticsForm = props => {
} }
]; ];
const style = { const style = {
width: '700px' width: '900px'
}; };
return ( return (
<Modal <Modal
...@@ -44,7 +46,7 @@ const LogisticsForm = props => { ...@@ -44,7 +46,7 @@ const LogisticsForm = props => {
onCancel={() => onCancel()} onCancel={() => onCancel()}
onOk={() => onCancel()} onOk={() => onCancel()}
bodyStyle={style} bodyStyle={style}
width={700} width={900}
> >
<Table columns={columns} dataSource={value} /> <Table columns={columns} dataSource={value} />
</Modal> </Modal>
......
...@@ -87,8 +87,13 @@ const TableList = () => { ...@@ -87,8 +87,13 @@ const TableList = () => {
<React.Fragment> <React.Fragment>
{ {
record.skuSource.value !== 2 && record.logisticsStatus === '_1' ? ( record.skuSource.value !== 2 && record.logisticsStatus === '_1' ? (
<React.Fragment> <Button
<a type="primary"
style={
{
marginBottom: '10px',
}
}
onClick={async () => { onClick={async () => {
const skuList = await getGoods(record.orderId); const skuList = await getGoods(record.orderId);
setSkuList(skuList); setSkuList(skuList);
...@@ -96,22 +101,17 @@ const TableList = () => { ...@@ -96,22 +101,17 @@ const TableList = () => {
}} }}
> >
更新物流信息 更新物流信息
</a> </Button>
<Divider type="vertical" />
</React.Fragment>
) : null
}
{
record.logisticsStatus === '_1' ? (
<a
onClick={async () => {
const skuList = await getGoods(record.orderId);
console.log('skuList', skuList);
setSkuList(skuList);
handleDetailModalVisible(true);
}}>查看订单详情</a>
) : null ) : null
} }
<Button
type="primary"
onClick={async () => {
const skuList = await getGoods(record.orderId);
console.log('skuList', skuList);
setSkuList(skuList);
handleDetailModalVisible(true);
}}>查看订单详情</Button>
</React.Fragment> </React.Fragment>
), ),
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment