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
20273a0c
Commit
20273a0c
authored
Apr 19, 2022
by
leimo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '220418-fix' into 'v2-220418'
fix: 添加确认通知单的loading See merge request linkseeks-design/pro-platform!402
parents
54bea867
2e4acd49
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
index.tsx
src/pages/order/components/customizedModal/index.tsx
+5
-0
details.tsx
...liveryNoticeCollaboration/deliveryNoticeAwait/details.tsx
+5
-1
No files found.
src/pages/order/components/customizedModal/index.tsx
View file @
20273a0c
...
...
@@ -66,6 +66,10 @@ interface CustomizedModalProps {
* (非必填) 取消按钮文字自定义
*/
cancelText
?:
string
,
/**
* 确定loading
*/
loading
:
boolean
}
const
CustomizedModal
:
React
.
FC
<
CustomizedModalProps
>
=
(
props
)
=>
{
...
...
@@ -105,6 +109,7 @@ const CustomizedModal: React.FC<CustomizedModalProps> = (props) => {
cancelText=
{
props
?.
okText
||
ModalCancelText
}
onOk=
{
onOk
}
onCancel=
{
onCancel
}
confirmLoading=
{
props
.
loading
}
>
<
Form
form=
{
form
}
>
<
Form
.
Item
...
...
src/pages/order/deliveryNoticeCollaboration/deliveryNoticeAwait/details.tsx
View file @
20273a0c
...
...
@@ -68,10 +68,13 @@ const DeliveryNoticeAwaitDetails: React.FC = () => {
isPass
:
values
.
isPass
===
1
,
remark
:
values
.
reason
}
setLoading
(
true
)
postOrderDeliveryNoticeOrderConfirm
(
params
).
then
(({
code
})
=>
{
if
(
code
===
1000
)
{
history
.
goBack
()
}
}).
finally
(()
=>
{
setLoading
(
false
)
})
}
...
...
@@ -91,7 +94,7 @@ const DeliveryNoticeAwaitDetails: React.FC = () => {
<
AuthButton
btnCode=
'deliveryNoticeAwait.confirm'
>
{
(
type
===
PAGE_TYPE
.
CONFIRM
&&
details
.
status
===
STATUS
.
WAIT_CONFIRM
)
&&
(
<
Button
loading=
{
loading
}
onClick=
{
()
=>
setModalVisible
(
true
)
}
type=
'primary'
>
提交
</
Button
>
<
Button
onClick=
{
()
=>
setModalVisible
(
true
)
}
type=
'primary'
>
提交
</
Button
>
)
}
</
AuthButton
>
...
...
@@ -153,6 +156,7 @@ const DeliveryNoticeAwaitDetails: React.FC = () => {
radioGroup=
{
[{
label
:
'确认'
,
value
:
1
,
isReason
:
false
},
{
label
:
'不确认'
,
value
:
2
,
isReason
:
true
}]
}
onSubmit=
{
(
values
)
=>
modalSubmit
(
values
)
}
onCancel=
{
(
visible
:
boolean
)
=>
setModalVisible
(
visible
)
}
loading=
{
loading
}
/>
</
AnchorPage
>
)
...
...
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