Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
shenshaokai
jinfa-platform
Commits
1c4fee6d
Commit
1c4fee6d
authored
Apr 13, 2022
by
leimo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '20418order' into 'v2-220418'
详情显示地址的时候 添加判断未空的时候不显示 null See merge request linkseeks-design/pro-platform!260
parents
e0692cf6
bbeba92f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
details.tsx
src/pages/order/deliveryNotice/manageB2B/details.tsx
+5
-5
details.tsx
src/pages/order/deliveryNotice/manageSRM/details.tsx
+5
-5
No files found.
src/pages/order/deliveryNotice/manageB2B/details.tsx
View file @
1c4fee6d
...
...
@@ -106,11 +106,11 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<
ContentBoxItem
label=
{
info
?.
deliveryType
===
0
?
DeliveryAddrLabel
:
DeliverySlefAddrLabel
}
>
<
div
>
{
info
?.
deliverVO
?.
provinceName
}
{
info
?.
deliverVO
?.
cityName
}
{
info
?.
deliverVO
?.
districtName
}
{
info
?.
deliverVO
?.
streetName
}
{
info
?.
deliverVO
?.
address
}
{
info
?.
deliverVO
?.
provinceName
??
''
}
{
info
?.
deliverVO
?.
cityName
??
''
}
{
info
?.
deliverVO
?.
districtName
??
''
}
{
info
?.
deliverVO
?.
streetName
??
''
}
{
info
?.
deliverVO
?.
address
??
''
}
</
div
>
<
div
>
{
info
?.
deliverVO
.
phone
}
...
...
src/pages/order/deliveryNotice/manageSRM/details.tsx
View file @
1c4fee6d
...
...
@@ -107,11 +107,11 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<
ContentBoxItem
label=
{
info
?.
deliveryType
===
0
?
DeliveryAddrLabel
:
DeliverySlefAddrLabel
}
>
<
div
>
{
info
?.
deliverVO
?.
provinceName
}
{
info
?.
deliverVO
?.
cityName
}
{
info
?.
deliverVO
?.
districtName
}
{
info
?.
deliverVO
?.
streetName
}
{
info
?.
deliverVO
?.
address
}
{
info
?.
deliverVO
?.
provinceName
??
''
}
{
info
?.
deliverVO
?.
cityName
??
''
}
{
info
?.
deliverVO
?.
districtName
??
''
}
{
info
?.
deliverVO
?.
streetName
??
''
}
{
info
?.
deliverVO
?.
address
??
''
}
</
div
>
<
div
>
{
info
?.
deliverVO
.
phone
}
...
...
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