Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ui
merchant-manage-ui
Commits
26bcf247
Commit
26bcf247
authored
Aug 10, 2023
by
guang.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改备注展示
parent
85a16594
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
5 deletions
+53
-5
GoodsRemark.jsx
src/pages/orderManage/components/GoodsRemark.jsx
+40
-0
style.less
src/pages/orderManage/components/style.less
+9
-0
index.jsx
src/pages/orderManage/pendingDeliveryOrder/index.jsx
+4
-5
No files found.
src/pages/orderManage/components/GoodsRemark.jsx
0 → 100644
View file @
26bcf247
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
;
src/pages/orderManage/components/style.less
0 → 100644
View file @
26bcf247
.popoverGoods {
display: flex;
align-items: center;
&-img {
width: 50px;
height: 50px;
margin-right: 10px;
}
}
src/pages/orderManage/pendingDeliveryOrder/index.jsx
View file @
26bcf247
...
@@ -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
?
(
{
platformRemark
List
&&
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"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment