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
3c4579a3
Commit
3c4579a3
authored
Aug 03, 2021
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: 完善展示
parent
8709a0e6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
10 deletions
+22
-10
index.tsx
...lity/components/FormilyFieldItem/TofuCheckGroup/index.tsx
+2
-2
index.tsx
...n/marketingAbility/components/TofuCheckboxGroup/index.tsx
+8
-3
index.tsx
...lity/merchantCoupon/components/ApplicableMember/index.tsx
+8
-1
index.tsx
...tingAbility/merchantCoupon/components/BacisInfo/index.tsx
+1
-1
index.tsx
...ngAbility/merchantCoupon/components/CouponRules/index.tsx
+3
-3
No files found.
src/pages/transaction/marketingAbility/components/FormilyFieldItem/TofuCheckGroup/index.tsx
View file @
3c4579a3
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-06-25 09:40:03
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-0
2 18:40:16
* @LastEditTime: 2021-08-0
3 11:07:44
* @Description: formily 豆腐多选框
*/
import
React
from
'react'
;
...
...
@@ -16,7 +16,7 @@ const FormilyTofuCheckboxGroup = connect()((props) => {
onChange
,
...
rest
}
=
props
;
return
<
TofuCheckboxGroup
options=
{
dataSource
}
value=
{
value
}
onChange=
{
onChange
}
{
...
rest
}
/>
return
<
TofuCheckboxGroup
options=
{
dataSource
}
value=
{
value
}
onChange=
{
onChange
}
{
...
rest
}
editable=
{
rest
.
ediabled
}
/>
});
export
default
FormilyTofuCheckboxGroup
;
src/pages/transaction/marketingAbility/components/TofuCheckboxGroup/index.tsx
View file @
3c4579a3
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-06-23 10:14:05
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-0
2 18:39:18
* @LastEditTime: 2021-08-0
3 11:01:39
* @Description: 豆腐方块复选框
*/
import
React
,
{
useState
,
useEffect
}
from
'react'
;
...
...
@@ -48,6 +48,10 @@ export type TofuCheckboxGroupProps = {
* 是否禁用
*/
disabled
?:
boolean
,
/**
* 是否可编辑的
*/
editable
?:
boolean
,
};
const
TofuCheckboxGroup
:
React
.
FC
<
TofuCheckboxGroupProps
>
=
(
props
)
=>
{
...
...
@@ -56,7 +60,8 @@ const TofuCheckboxGroup: React.FC<TofuCheckboxGroupProps> = (props) => {
value
:
outerValue
,
defaultValue
=
[],
onChange
,
disabled
,
disabled
=
false
,
editable
=
true
,
}
=
props
;
const
initValue
=
'value'
in
props
?
outerValue
:
defaultValue
;
const
[
value
,
setValue
]
=
useState
<
ValueType
>
(
initValue
);
...
...
@@ -87,7 +92,7 @@ const TofuCheckboxGroup: React.FC<TofuCheckboxGroupProps> = (props) => {
{
options
.
map
((
item
)
=>
{
const
itemCls
=
classNames
(
styles
[
'tofuCheckbox-list-item'
],
{
[
styles
[
'tofuCheckbox-list-item-checked'
]]:
Array
.
isArray
(
value
)
&&
value
.
includes
(
item
.
value
),
[
styles
[
'tofuCheckbox-list-item-disabled'
]]:
item
.
disabled
||
disabled
,
[
styles
[
'tofuCheckbox-list-item-disabled'
]]:
(
item
.
disabled
||
disabled
)
&&
editable
,
});
return
(
<
div
key=
{
item
.
value
}
className=
{
itemCls
}
>
...
...
src/pages/transaction/marketingAbility/merchantCoupon/components/ApplicableMember/index.tsx
View file @
3c4579a3
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-08-02 16:56:32
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-0
2 18:35:22
* @LastEditTime: 2021-08-0
3 09:48:34
* @Description: 适用用户
*/
import
React
,
{
useMemo
}
from
'react'
;
...
...
@@ -65,6 +65,7 @@ const ApplicableMember: React.FC<IProps> = (props) => {
wrapperCol=
{
21
}
fields=
{
useFields
()
}
editable=
{
false
}
colon=
{
false
}
>
<
Field
type=
"string"
...
...
@@ -72,6 +73,9 @@ const ApplicableMember: React.FC<IProps> = (props) => {
title=
"适用用户"
name=
"suitableMemberTypes"
x
-
component=
"TofuCheckGroup"
x
-
component
-
props=
{
{
ediabled
:
false
,
}
}
/>
{
showApplicationMemberLevel
&&
(
<>
...
...
@@ -81,6 +85,9 @@ const ApplicableMember: React.FC<IProps> = (props) => {
title=
"适用用户角色"
name=
"applicationUserRole"
x
-
component=
"TofuCheckGroup"
x
-
component
-
props=
{
{
ediabled
:
false
,
}
}
/>
<
Field
type=
"string"
...
...
src/pages/transaction/marketingAbility/merchantCoupon/components/BacisInfo/index.tsx
View file @
3c4579a3
...
...
@@ -95,7 +95,7 @@ const CouponBacisInfo: React.FC<PropsType> = (props: PropsType) => {
},
{
title
:
'券面额'
,
value
:
`¥
${
dataSource
.
denomination
}
`
,
value
:
`¥
${
dataSource
.
denomination
||
''
}
`
,
},
{
title
:
'领(发)券结束时间'
,
...
...
src/pages/transaction/marketingAbility/merchantCoupon/components/CouponRules/index.tsx
View file @
3c4579a3
...
...
@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-06-22 16:45:58
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-0
2 10:55:51
* @LastEditTime: 2021-08-0
3 09:55:37
* @Description: 优惠券规则
*/
import
React
from
'react'
;
...
...
@@ -76,7 +76,7 @@ const CouponRules: React.FC<PropsType> = (props: PropsType) => {
},
{
title
:
'使用条件'
,
value
:
`订单满 ¥
${
dataSource
.
useConditionMoney
}
使用`
,
value
:
`订单满 ¥
${
dataSource
.
useConditionMoney
||
''
}
使用`
,
},
{
title
:
'领取条件'
,
...
...
@@ -84,7 +84,7 @@ const CouponRules: React.FC<PropsType> = (props: PropsType) => {
},
{
title
:
'有效期结束时间'
,
value
:
dataSource
.
effectiveTimeEnd
?
moment
(
dataSource
.
effectiveTimeEnd
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
`领取
${
dataSource
.
invalidDay
}
天后失效`
,
value
:
dataSource
.
effectiveTimeEnd
?
moment
(
dataSource
.
effectiveTimeEnd
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
:
`领取
${
dataSource
.
invalidDay
||
''
}
天后失效`
,
},
{
title
:
'使用说明'
,
...
...
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