Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
clique-web
Overview
Overview
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
clique
clique-web
Commits
88fe229f
Commit
88fe229f
authored
Jul 05, 2022
by
huaying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 输入框为空展示2
parent
050bf5c9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
2 deletions
+8
-2
point-form.vue
src/components/memberShip/point-form.vue
+1
-1
addPointSystem.vue
src/view/companyGroup/membershipSystem/addPointSystem.vue
+1
-1
editIntegralSytem.vue
src/view/companyGroup/membershipSystem/editIntegralSytem.vue
+3
-0
editPointSystem.vue
src/view/companyGroup/membershipSystem/editPointSystem.vue
+3
-0
No files found.
src/components/memberShip/point-form.vue
View file @
88fe229f
...
@@ -168,7 +168,7 @@ export default {
...
@@ -168,7 +168,7 @@ export default {
integralUseDiscountControlUpper
:
undefined
,
integralUseDiscountControlUpper
:
undefined
,
integralUseDiscountControlLower
:
undefined
,
integralUseDiscountControlLower
:
undefined
,
useProportionalRestriction
:
'90'
,
//抵现比例限制
useProportionalRestriction
:
'90'
,
//抵现比例限制
integralCost
:
{
fee
:
'1'
,
integral
:
'1'
}
//积分成本
integralCost
:
{
fee
:
undefined
,
integral
:
undefined
}
//积分成本
},
},
rules
:
{
rules
:
{
integralGetStatus
:
[
integralGetStatus
:
[
...
...
src/view/companyGroup/membershipSystem/addPointSystem.vue
View file @
88fe229f
...
@@ -480,7 +480,7 @@ export default {
...
@@ -480,7 +480,7 @@ export default {
useCrowd
:
'1'
,
// 策略类型 1所有 2人群筛选
useCrowd
:
'1'
,
// 策略类型 1所有 2人群筛选
crowdJson
:
''
,
//人群筛选器内容
crowdJson
:
''
,
//人群筛选器内容
integralGetStatus
:
'1'
,
// 积分获取开启 1是0否
integralGetStatus
:
'1'
,
// 积分获取开启 1是0否
integralGet
:
{
fee
:
undefined
,
integral
:
undefined
},
integralGet
:
{
fee
:
'1'
,
integral
:
'1'
},
integralGetStrategy
:
'1'
,
// 取整策略 1四舍五入 2抹零 3向上取整
integralGetStrategy
:
'1'
,
// 取整策略 1四舍五入 2抹零 3向上取整
integralGetFreezeDays
:
1
,
// 获取积分冻结天数
integralGetFreezeDays
:
1
,
// 获取积分冻结天数
integralGetEffectiveDays
:
1
,
// 获取积分有效天
integralGetEffectiveDays
:
1
,
// 获取积分有效天
...
...
src/view/companyGroup/membershipSystem/editIntegralSytem.vue
View file @
88fe229f
...
@@ -797,6 +797,9 @@ export default {
...
@@ -797,6 +797,9 @@ export default {
if
(
item
.
channelList
)
{
if
(
item
.
channelList
)
{
item
.
channelList
.
forEach
(
item
=>
{
item
.
channelList
.
forEach
(
item
=>
{
if
(
item
.
openStatus
==
false
)
{
item
.
integralUseDiscountControl
==
1
}
if
(
item
.
integralUseDiscountControl
==
1
){
if
(
item
.
integralUseDiscountControl
==
1
){
item
.
integralUseDiscountControlUpper
=
undefined
;
item
.
integralUseDiscountControlUpper
=
undefined
;
item
.
integralUseDiscountControlLower
=
undefined
;
item
.
integralUseDiscountControlLower
=
undefined
;
...
...
src/view/companyGroup/membershipSystem/editPointSystem.vue
View file @
88fe229f
...
@@ -1226,6 +1226,9 @@ export default {
...
@@ -1226,6 +1226,9 @@ export default {
channelList
=
channelList
.
concat
(
item
.
channelList
.
filter
(
el
=>
!
channelListSort
.
some
(
item
=>
el
.
channelType
==
item
)));
channelList
=
channelList
.
concat
(
item
.
channelList
.
filter
(
el
=>
!
channelListSort
.
some
(
item
=>
el
.
channelType
==
item
)));
item
.
channelList
=
channelList
;
item
.
channelList
=
channelList
;
item
.
channelList
.
forEach
(
item
=>
{
item
.
channelList
.
forEach
(
item
=>
{
if
(
item
.
openStatus
==
false
)
{
item
.
integralUseDiscountControl
==
1
}
if
(
item
.
integralUseDiscountControl
==
1
){
if
(
item
.
integralUseDiscountControl
==
1
){
item
.
integralUseDiscountControlUpper
=
undefined
;
item
.
integralUseDiscountControlUpper
=
undefined
;
item
.
integralUseDiscountControlLower
=
undefined
;
item
.
integralUseDiscountControlLower
=
undefined
;
...
...
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