Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
marketing
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
marketing-web
marketing
Commits
df486de2
Commit
df486de2
authored
Jan 20, 2022
by
crushh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update: temp
parent
379937ae
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
2 deletions
+24
-2
form.vue
src/views/ecm/form.vue
+5
-1
index.vue
src/views/ecm/marketing-event/index.vue
+19
-1
No files found.
src/views/ecm/form.vue
View file @
df486de2
...
...
@@ -406,11 +406,15 @@
<br
/>
若订单部分退款:系统判断剩余订单是否满足触发条件,若不满足,未使用卡券/积分全部退回;若仍满足,卡券/固定积分不退回,按订单金额倍数赠送的积分,会扣除退货商品所赠送的积分。
</div>
<div
v-if=
"form.consum_type == 2"
>
<span
class=
"dm-status--primary pl10"
style=
"vertical-align:top"
></span>
按照当天累计实付金额触发时,营销事件选择卡券时,订单退款会重新计算当天累计金额,会销毁不再符合赠送的未使用卡券。
</div>
</div>
</div>
</h3>
<!-- 只有实时才是单图文 -->
<marketing-event
:effectType=
"form.effectType"
:readOnly=
"isInfo || onlineStatus == 2"
:show-delete-tooltip=
"isEdit && analyseConfig.open_flag == 1"
show-out-coupon-icon
ref=
"marketingEvent"
@
has-card=
"hasCard"
v-if=
"ecmPlanId"
:singleFlag=
"form.effectType === 0"
:integralMultiple=
"form.effectAction === 'consume'"
:ecmPlanId=
"ecmPlanId"
:isSupportVar=
"form.effectType === 0"
:code=
"code"
:enabledMessageState=
"enabledMessageState"
:cardLimitType=
"-1"
:use-stored=
"useStoredFlag && ['consume', 'stored'].includes(form.effectAction) && form.effectType == 0
"
:use-qfxx=
"form.effectType !== 0"
>
</marketing-event>
<marketing-event
:effectType=
"form.effectType"
:readOnly=
"isInfo || onlineStatus == 2"
:show-delete-tooltip=
"isEdit && analyseConfig.open_flag == 1"
show-out-coupon-icon
ref=
"marketingEvent"
@
has-card=
"hasCard"
v-if=
"ecmPlanId"
:singleFlag=
"form.effectType === 0"
:integralMultiple=
"form.effectAction === 'consume'"
:ecmPlanId=
"ecmPlanId"
:isSupportVar=
"form.effectType === 0"
:code=
"code"
:enabledMessageState=
"enabledMessageState"
:cardLimitType=
"-1"
:use-stored=
"useStoredFlag && ['consume', 'stored'].includes(form.effectAction) && form.effectType == 0
&& form.consum_type == 1"
:use-qfxx=
"form.effectType !== 0"
:totalConsume=
"form.effectType == 0 && form.consum_type == 2"
>
</marketing-event>
<!-- 只有非实时&&选择卡券了展示提示 -->
<div
v-if=
"currentCard.comName && form.effectType != 0 && couponAutoGetFlag"
class=
"fz13 regular-font-color line-height2"
style=
"margin-left:120px;margin-top:30px;"
>
* 用户在领取卡券后需要
<b
class=
"bold"
>
同步至ERP
</b>
,如果关闭用户
<b
class=
"bold"
>
手动领取
</b>
,卡券在
<b
class=
"bold"
>
批量投放
</b>
时会需要将卡券信息批量同步至ERP。
<br
/>
...
...
src/views/ecm/marketing-event/index.vue
View file @
df486de2
...
...
@@ -158,7 +158,8 @@ export default {
default
:
0
},
useQfxx
:
Boolean
,
showDeleteTooltip
:
Boolean
showDeleteTooltip
:
Boolean
,
totalConsume
:
Boolean
// 是否是累计消费触发
},
data
()
{
return
{
...
...
@@ -183,6 +184,20 @@ export default {
},
computed
:
{
showOptionList
()
{
if
(
this
.
totalConsume
)
{
const
arr
=
[
'card'
,
'integral'
];
this
.
options
.
forEach
(
item
=>
{
if
(
arr
.
includes
(
item
.
value
))
{
item
.
show
=
true
;
}
else
{
item
.
show
=
false
;
}
});
}
else
{
this
.
options
.
forEach
(
item
=>
{
item
.
show
=
true
;
});
}
if
(
this
.
useStored
)
{
this
.
options
.
forEach
(
item
=>
{
if
(
item
.
value
==
'grade'
)
{
...
...
@@ -222,6 +237,9 @@ export default {
}
});
}
console
.
log
(
this
.
totalConsume
);
console
.
log
(
this
.
options
.
filter
(
item
=>
item
.
show
==
true
));
return
this
.
options
.
filter
(
item
=>
item
.
show
==
true
);
}
},
...
...
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