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
黄庭坚
jinfa-platform
Commits
fc11325f
Commit
fc11325f
authored
Dec 03, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复券有效截止时间与领券截止时间比较错误的问题
parent
55175793
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
useBusinessEffects.ts
...itted/components/CouponForm/effects/useBusinessEffects.ts
+9
-9
No files found.
src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponUnsubmitted/components/CouponForm/effects/useBusinessEffects.ts
View file @
fc11325f
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Author: XieZhiXiong
* @Date: 2021-06-24 14:04:16
* @Date: 2021-06-24 14:04:16
* @LastEditors: XieZhiXiong
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-1
1-30 20:07:59
* @LastEditTime: 2021-1
2-03 15:07:15
* @Description:
* @Description:
*/
*/
import
{
FormEffectHooks
,
FormPath
,
IFormActions
}
from
'@formily/antd'
;
import
{
FormEffectHooks
,
FormPath
,
IFormActions
}
from
'@formily/antd'
;
...
@@ -300,15 +300,15 @@ export const useBusinessEffects = (context, actions: IFormActions) => {
...
@@ -300,15 +300,15 @@ export const useBusinessEffects = (context, actions: IFormActions) => {
const
{
value
}
=
state
;
const
{
value
}
=
state
;
const
releaseTimeEndValue
=
value
?.[
1
];
const
releaseTimeEndValue
=
value
?.[
1
];
const
effectiveTime
=
getFieldValue
(
'[effectiveTimeStart, effectiveTimeEnd]'
);
// 券有效期
const
effectiveTime
=
getFieldValue
(
'[effectiveTimeStart, effectiveTimeEnd]'
);
// 券有效期
const
effectiveTime
StartValue
=
effectiveTime
?.[
0
];
const
effectiveTime
EndValue
=
effectiveTime
?.[
1
];
if
(
if
(
releaseTimeEndValue
releaseTimeEndValue
&&
effectiveTime
Start
Value
&&
effectiveTime
End
Value
&&
moment
(
releaseTimeEndValue
)
>
moment
(
effectiveTimeStart
Value
)
&&
moment
(
releaseTimeEndValue
)
>
=
moment
(
effectiveTimeEnd
Value
)
)
{
)
{
setFieldState
(
'[releaseTimeStart, releaseTimeEnd]'
,
fieldState
=>
{
setFieldState
(
'[releaseTimeStart, releaseTimeEnd]'
,
fieldState
=>
{
FormPath
.
setIn
(
fieldState
,
'errors'
,
'领(发)券截止时间应该小于券有效期
起始
时间'
);
FormPath
.
setIn
(
fieldState
,
'errors'
,
'领(发)券截止时间应该小于券有效期
截止
时间'
);
});
});
}
else
{
}
else
{
actions
.
clearErrors
(
'[releaseTimeStart, releaseTimeEnd]'
);
actions
.
clearErrors
(
'[releaseTimeStart, releaseTimeEnd]'
);
...
@@ -318,17 +318,17 @@ export const useBusinessEffects = (context, actions: IFormActions) => {
...
@@ -318,17 +318,17 @@ export const useBusinessEffects = (context, actions: IFormActions) => {
// 券有效期始时间
// 券有效期始时间
onFieldValueChange$
(
'[effectiveTimeStart, effectiveTimeEnd]'
).
subscribe
(
state
=>
{
onFieldValueChange$
(
'[effectiveTimeStart, effectiveTimeEnd]'
).
subscribe
(
state
=>
{
const
{
value
}
=
state
;
const
{
value
}
=
state
;
const
effectiveTime
StartValue
=
value
?.[
0
];
const
effectiveTime
EndValue
=
value
?.[
1
];
const
releaseTime
=
getFieldValue
(
'[releaseTimeStart, releaseTimeEnd]'
);
// 券有效期
const
releaseTime
=
getFieldValue
(
'[releaseTimeStart, releaseTimeEnd]'
);
// 券有效期
const
releaseTimeEndValue
=
releaseTime
?.[
1
];
const
releaseTimeEndValue
=
releaseTime
?.[
1
];
if
(
if
(
effectiveTime
Start
Value
effectiveTime
End
Value
&&
releaseTimeEndValue
&&
releaseTimeEndValue
&&
moment
(
effectiveTime
StartValue
)
<
moment
(
releaseTimeEndValue
)
&&
moment
(
effectiveTime
EndValue
)
<=
moment
(
releaseTimeEndValue
)
)
{
)
{
setFieldState
(
'[effectiveTimeStart, effectiveTimeEnd]'
,
fieldState
=>
{
setFieldState
(
'[effectiveTimeStart, effectiveTimeEnd]'
,
fieldState
=>
{
FormPath
.
setIn
(
fieldState
,
'errors'
,
'券有效期
起始时间应该大于等
于领(发)券截止时间'
);
FormPath
.
setIn
(
fieldState
,
'errors'
,
'券有效期
截止时间应该大
于领(发)券截止时间'
);
});
});
}
else
{
}
else
{
actions
.
clearErrors
(
'[effectiveTimeStart, effectiveTimeEnd]'
);
actions
.
clearErrors
(
'[effectiveTimeStart, effectiveTimeEnd]'
);
...
...
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