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
28e65772
Commit
28e65772
authored
Jan 25, 2022
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2
parents
e3e317e3
178e18a9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
index.tsx
src/pages/member/components/MemberDocCategory/index.tsx
+1
-1
index.tsx
...merchantCouponUnsubmitted/components/CouponForm/index.tsx
+2
-2
No files found.
src/pages/member/components/MemberDocCategory/index.tsx
View file @
28e65772
...
...
@@ -146,7 +146,7 @@ const MemberDocCategory: React.FC<DocCategoryProps> = (props: DocCategoryProps)
month
:
month
?
`
${
month
}
`
:
''
,
monthDay
:
monthDay
?
`
${
monthDay
}
`
:
''
,
days
:
days
?
`
${
days
}
`
:
''
,
taxPoint
:
+
taxPoint
,
taxPoint
:
+
taxPoint
*
100
,
...
rest
})),
});
...
...
src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponUnsubmitted/components/CouponForm/index.tsx
View file @
28e65772
...
...
@@ -328,9 +328,9 @@ const CouponForm: React.FC<IProps> = (props) => {
invalidDay
:
+
invalidDay
,
denomination
:
+
denomination
,
releaseTimeStart
:
releaseTimeStart
.
valueOf
(),
releaseTimeEnd
:
releaseTime
Start
.
valueOf
(),
releaseTimeEnd
:
releaseTime
End
.
valueOf
(),
effectiveTimeStart
:
effectiveTimeStart
?
effectiveTimeStart
.
valueOf
()
:
undefined
,
effectiveTimeEnd
:
effectiveTimeEnd
?
effectiveTime
Start
.
valueOf
()
:
undefined
,
effectiveTimeEnd
:
effectiveTimeEnd
?
effectiveTime
End
.
valueOf
()
:
undefined
,
suitableMemberLevelTypes
:
applicationMemberLevel
,
suitableCommoditySkuList
,
suitableCategoryList
,
...
...
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