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
fda1df68
Commit
fda1df68
authored
Oct 26, 2020
by
郝聪敏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 解决jira bug
parent
b848e5d4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
22 deletions
+23
-22
config.js
config/config.js
+1
-1
Admin.jsx
src/pages/Admin.jsx
+1
-2
LogisticsForm.jsx
...rManage/pendingDeliveryOrder/components/LogisticsForm.jsx
+1
-1
OrderDetail.jsx
...derManage/pendingDeliveryOrder/components/OrderDetail.jsx
+4
-2
index.jsx
src/pages/orderManage/pendingDeliveryOrder/index.jsx
+16
-16
No files found.
config/config.js
View file @
fda1df68
...
@@ -84,7 +84,7 @@ export default {
...
@@ -84,7 +84,7 @@ export default {
routes
:
[
routes
:
[
{
{
path
:
'
/
'
,
path
:
'
/
'
,
redirect
:
'
/orderManage/pendingDeliveryOrder
'
,
component
:
'
./Admin
'
,
},
},
{
{
path
:
'
/orderManage/pendingDeliveryOrder
'
,
path
:
'
/orderManage/pendingDeliveryOrder
'
,
...
...
src/pages/Admin.jsx
View file @
fda1df68
...
@@ -3,6 +3,5 @@ import { Card, Typography, Alert, Icon } from 'antd';
...
@@ -3,6 +3,5 @@ import { Card, Typography, Alert, Icon } from 'antd';
import
{
PageHeaderWrapper
}
from
'
@ant-design/pro-layout
'
;
import
{
PageHeaderWrapper
}
from
'
@ant-design/pro-layout
'
;
export
default
()
=>
(
export
default
()
=>
(
<
PageHeaderWrapper
>
<
h2
>
欢迎使用商户管理后台系统
</
h2
>
</
PageHeaderWrapper
>
);
);
src/pages/orderManage/pendingDeliveryOrder/components/LogisticsForm.jsx
View file @
fda1df68
...
@@ -103,7 +103,7 @@ const LogisticsForm = props => {
...
@@ -103,7 +103,7 @@ const LogisticsForm = props => {
>
>
{
skuList
.
map
(
item
=>
(
{
skuList
.
map
(
item
=>
(
<
Option
value=
{
item
.
orderSkuId
}
key=
{
item
.
orderSkuId
}
>
<
Option
value=
{
item
.
orderSkuId
}
key=
{
item
.
orderSkuId
}
>
{
item
.
skuName
+
item
.
skuAttr
}
{
item
.
skuName
+
(
item
.
skuAttr
||
''
)
}
</
Option
>
</
Option
>
))
}
))
}
</
Select
>,
</
Select
>,
...
...
src/pages/orderManage/pendingDeliveryOrder/components/OrderDetail.jsx
View file @
fda1df68
...
@@ -12,11 +12,13 @@ const LogisticsForm = props => {
...
@@ -12,11 +12,13 @@ const LogisticsForm = props => {
title
:
'
商品名称
'
,
title
:
'
商品名称
'
,
dataIndex
:
'
skuName
'
,
dataIndex
:
'
skuName
'
,
key
:
'
skuName
'
,
key
:
'
skuName
'
,
width
:
300
,
},
},
{
{
title
:
'
商品属性
'
,
title
:
'
商品属性
'
,
dataIndex
:
'
skuAttr
'
,
dataIndex
:
'
skuAttr
'
,
key
:
'
skuAttr
'
,
key
:
'
skuAttr
'
,
width
:
200
,
},
},
{
{
title
:
'
商品件数(件)
'
,
title
:
'
商品件数(件)
'
,
...
@@ -35,7 +37,7 @@ const LogisticsForm = props => {
...
@@ -35,7 +37,7 @@ const LogisticsForm = props => {
}
}
];
];
const
style
=
{
const
style
=
{
width
:
'
7
00px
'
width
:
'
9
00px
'
};
};
return
(
return
(
<
Modal
<
Modal
...
@@ -44,7 +46,7 @@ const LogisticsForm = props => {
...
@@ -44,7 +46,7 @@ const LogisticsForm = props => {
onCancel=
{
()
=>
onCancel
()
}
onCancel=
{
()
=>
onCancel
()
}
onOk=
{
()
=>
onCancel
()
}
onOk=
{
()
=>
onCancel
()
}
bodyStyle=
{
style
}
bodyStyle=
{
style
}
width=
{
7
00
}
width=
{
9
00
}
>
>
<
Table
columns=
{
columns
}
dataSource=
{
value
}
/>
<
Table
columns=
{
columns
}
dataSource=
{
value
}
/>
</
Modal
>
</
Modal
>
...
...
src/pages/orderManage/pendingDeliveryOrder/index.jsx
View file @
fda1df68
...
@@ -87,8 +87,13 @@ const TableList = () => {
...
@@ -87,8 +87,13 @@ const TableList = () => {
<
React
.
Fragment
>
<
React
.
Fragment
>
{
{
record
.
skuSource
.
value
!==
2
&&
record
.
logisticsStatus
===
'
_1
'
?
(
record
.
skuSource
.
value
!==
2
&&
record
.
logisticsStatus
===
'
_1
'
?
(
<
React
.
Fragment
>
<
Button
<
a
type=
"primary"
style=
{
{
marginBottom
:
'
10px
'
,
}
}
onClick=
{
async
()
=>
{
onClick=
{
async
()
=>
{
const
skuList
=
await
getGoods
(
record
.
orderId
);
const
skuList
=
await
getGoods
(
record
.
orderId
);
setSkuList
(
skuList
);
setSkuList
(
skuList
);
...
@@ -96,22 +101,17 @@ const TableList = () => {
...
@@ -96,22 +101,17 @@ const TableList = () => {
}
}
}
}
>
>
更新物流信息
更新物流信息
</
a
>
</
Button
>
<
Divider
type=
"vertical"
/>
</
React
.
Fragment
>
)
:
null
}
{
record
.
logisticsStatus
===
'
_1
'
?
(
<
a
onClick=
{
async
()
=>
{
const
skuList
=
await
getGoods
(
record
.
orderId
);
console
.
log
(
'
skuList
'
,
skuList
);
setSkuList
(
skuList
);
handleDetailModalVisible
(
true
);
}
}
>
查看订单详情
</
a
>
)
:
null
)
:
null
}
}
<
Button
type=
"primary"
onClick=
{
async
()
=>
{
const
skuList
=
await
getGoods
(
record
.
orderId
);
console
.
log
(
'
skuList
'
,
skuList
);
setSkuList
(
skuList
);
handleDetailModalVisible
(
true
);
}
}
>
查看订单详情
</
Button
>
</
React
.
Fragment
>
</
React
.
Fragment
>
),
),
},
},
...
...
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