Commit 26bcf247 authored by guang.wu's avatar guang.wu

fix: 修改备注展示

parent 85a16594
import React from 'react';
import { Table } from 'antd';
import style from './style.less';
const GoodsRemark = props => {
const columns = [
{
title: '商品',
dataIndex: 'skuName',
width: 350,
render: (value, record) => {
const { skuName, imageUrl } = record;
return (
<div className={style.popoverGoods}>
<img src={imageUrl} alt="" className={style['popoverGoods-img']} />
<span>{skuName}</span>
</div>
);
},
},
{
title: '备注',
dataIndex: 'content',
width: 150,
},
{
title: '操作时间',
dataIndex: 'time',
width: 150,
},
];
return (
<div>
<Table columns={columns} dataSource={props.dataSource} pagination={false} />
</div>
);
};
export default GoodsRemark;
.popoverGoods {
display: flex;
align-items: center;
&-img {
width: 50px;
height: 50px;
margin-right: 10px;
}
}
...@@ -12,6 +12,7 @@ import LogisticsForm from './components/LogisticsForm'; ...@@ -12,6 +12,7 @@ import LogisticsForm from './components/LogisticsForm';
import PopoverDom from './components/PreviewImage'; import PopoverDom from './components/PreviewImage';
import LogisticsCom from './components/LogisticsCom'; import LogisticsCom from './components/LogisticsCom';
import DelayDeliverGoods from './components/DelayDeliverGoods'; import DelayDeliverGoods from './components/DelayDeliverGoods';
import GoodsRemark from '../components/GoodsRemark';
import MultiLogisticsModal from './components/MultiLogisticsModal'; import MultiLogisticsModal from './components/MultiLogisticsModal';
import { import {
...@@ -228,7 +229,7 @@ const TableList = props => { ...@@ -228,7 +229,7 @@ const TableList = props => {
key: 'orderNotice', key: 'orderNotice',
width: 150, width: 150,
render: (_, record) => { render: (_, record) => {
const { updateAddressList, platformRemark } = record; const { updateAddressList, platformRemark, platformRemarkList } = record;
// let addressData; // let addressData;
// if (updateAddressList) { // if (updateAddressList) {
// addressData = updateAddressList.pop(); // addressData = updateAddressList.pop();
...@@ -251,13 +252,11 @@ const TableList = props => { ...@@ -251,13 +252,11 @@ const TableList = props => {
) : ( ) : (
'' ''
)} )}
{platformRemark ? ( {platformRemarkList && platformRemarkList.length ? (
<Popover <Popover
placement="top" placement="top"
title="平台备注" title="平台备注"
content={ content={<GoodsRemark dataSource={platformRemarkList} />}
<PopoverNotice time={platformRemark?.time} content={platformRemark?.content} />
}
trigger="hover" trigger="hover"
> >
<Button block type="warning"> <Button block type="warning">
......
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