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
7faf76a8
Commit
7faf76a8
authored
Oct 28, 2022
by
李腾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 更新发货物流报错问题
parent
b2f6300b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
env.config.js
config/env.config.js
+8
-8
index.jsx
src/pages/orderManage/pendingDeliveryOrder/index.jsx
+4
-4
No files found.
config/env.config.js
View file @
7faf76a8
...
...
@@ -2,21 +2,21 @@ const isProduction = process.env.NODE_ENV === 'production';
const
isPre
=
process
.
env
.
PRE_ENV
===
'
pre
'
;
const
envAPi
=
{
api
:
'
https://security-
sc
.liangkebang.net
'
,
//'https://security-xyqb.liangkebang.net',
kdspOpApi
:
'
https://sc-merchant-api-
sc
.liangkebang.net
'
,
kdspApi
:
'
https://sc-merchant-api-
sc
.liangkebang.net
'
,
goodsApi
:
'
https://sc-merchant-api-
sc
.liangkebang.net
'
,
api
:
'
https://security-
yxm
.liangkebang.net
'
,
//'https://security-xyqb.liangkebang.net',
kdspOpApi
:
'
https://sc-merchant-api-
yxm
.liangkebang.net
'
,
kdspApi
:
'
https://sc-merchant-api-
yxm
.liangkebang.net
'
,
goodsApi
:
'
https://sc-merchant-api-
yxm
.liangkebang.net
'
,
// kdspOpApi: 'https://kdsp-operation-xyqb.liangkebang.net',
// kdspApi: 'https://sc-op-api-xyqb.liangkebang.net',
// goodsApi: 'https://sc-op-api-xyqb.liangkebang.net',
querysApi
:
'
https://sc-merchant-api-
sc
.liangkebang.net
'
,
querysApi
:
'
https://sc-merchant-api-
yxm
.liangkebang.net
'
,
// goodsApi: '//192.168.188.111:7000',
prologueDomain
:
'
https://mall-
sc
.liangkebang.net
'
,
prologueDomain
:
'
https://mall-
yxm
.liangkebang.net
'
,
// qiniuHost: 'https://appsync.lkbang.net',
qiniuHost
:
'
https://kdspstatic.q-gp.com/
'
,
opapiHost
:
'
https://opapi-
sc
.liangkebang.net
'
,
opapiHost
:
'
https://opapi-
yxm
.liangkebang.net
'
,
wsApi
:
'
ws://ws-sc.liangkebang.net
'
,
msgApi
:
'
https://msgapi-
sc
.liangkebang.net
'
,
msgApi
:
'
https://msgapi-
yxm
.liangkebang.net
'
,
};
const
prodApi
=
{
...
...
src/pages/orderManage/pendingDeliveryOrder/index.jsx
View file @
7faf76a8
...
...
@@ -138,7 +138,7 @@ const TableList = props => {
};
const
PopoverNotice
=
noticeProps
=>
{
const
{
time
,
content
}
=
noticeProps
;
const
{
time
,
content
}
=
noticeProps
||
{}
;
return
(
<
div
className=
{
style
[
'
popover-notice
'
]
}
>
{
time
}
:
{
content
}
...
...
@@ -165,7 +165,7 @@ const TableList = props => {
const
{
urgeDeliverGoodsList
}
=
record
;
const
content
=
()
=>
urgeDeliverGoodsList
?.
map
(
item
=>
(
<
PopoverNotice
time=
{
item
.
time
}
content=
{
item
.
content
}
/>
<
PopoverNotice
time=
{
item
?.
time
}
content=
{
item
?
.
content
}
/>
));
return
(
<>
...
...
@@ -198,7 +198,7 @@ const TableList = props => {
<
Popover
placement=
"top"
title=
"收货地址变更"
content=
{
<
PopoverNotice
time=
{
addressData
.
time
}
content=
{
addressData
.
content
}
/>
}
content=
{
<
PopoverNotice
time=
{
addressData
?.
time
}
content=
{
addressData
?
.
content
}
/>
}
trigger=
"hover"
>
<
Button
block
type=
"primary"
>
...
...
@@ -213,7 +213,7 @@ const TableList = props => {
placement=
"top"
title=
"平台备注"
content=
{
<
PopoverNotice
time=
{
platformRemark
.
time
}
content=
{
platformRemark
.
content
}
/>
<
PopoverNotice
time=
{
platformRemark
?.
time
}
content=
{
platformRemark
?
.
content
}
/>
}
trigger=
"hover"
>
...
...
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