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
935d8070
Commit
935d8070
authored
Feb 03, 2021
by
薛智杰
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'logistics_bug' into 'master'
Logistics bug See merge request
!4
parents
24e3ad17
76cc4503
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
10 deletions
+5
-10
env.config.js
config/env.config.js
+2
-2
index.jsx
src/pages/orderManage/pendingDeliveryOrder/index.jsx
+3
-8
No files found.
config/env.config.js
View file @
935d8070
...
...
@@ -3,8 +3,8 @@ const isProduction = process.env.NODE_ENV === 'production';
let
envAPi
=
{
api
:
'
//backstms-vcc2.liangkebang.net
'
,
// kdspApi: '//yapi.quantgroups.com/mock/351',
kdspApi
:
'
http://192.168.28.172:8042
'
,
//
kdspApi: 'https://kdsp-op-vcc2.liangkebang.net',
//
kdspApi: 'http://192.168.28.172:8042',
kdspApi
:
'
https://kdsp-op-vcc2.liangkebang.net
'
,
};
let
prodApi
=
{
...
...
src/pages/orderManage/pendingDeliveryOrder/index.jsx
View file @
935d8070
import
{
Button
}
from
'
antd
'
;
import
{
Button
,
notification
}
from
'
antd
'
;
import
React
,
{
useState
,
useEffect
,
useRef
}
from
'
react
'
;
import
{
PageHeaderWrapper
}
from
'
@ant-design/pro-layout
'
;
import
ProTable
from
'
@ant-design/pro-table
'
;
...
...
@@ -13,7 +13,6 @@ import {
getGoods
,
getLogistics
,
downOrder
,
getLogisticsInfo
,
getJDLogisticsInfo
,
}
from
'
./service
'
;
...
...
@@ -36,13 +35,9 @@ const TableList = props => {
detailList
:
[],
key
:
Date
.
now
(),
};
const
skuSource
=
record
.
skuSource
?.
value
??
null
;
const
sourceItem
=
[
2
,
5
];
// 2:京东企业购;5:京东开普勒;
const
isJD
=
sourceItem
.
includes
(
skuSource
);
const
data
=
isJD
?
await
getJDLogisticsInfo
(
skuItem
.
orderSkuId
)
:
await
getLogisticsInfo
(
skuItem
?.
expressCompanyCode
,
skuItem
?.
deliveryNo
);
const
data
=
await
getJDLogisticsInfo
(
skuItem
.
orderSkuId
);
if
(
!
data
)
{
notification
.
info
({
message
:
'
暂无物流信息
'
});
return
;
}
tempObj
.
expressCompanyName
=
data
?.
logisticsName
||
tempObj
.
expressCompanyName
;
...
...
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